998 files changed, 30890 insertions, 25915 deletions

diff --git a/.gitignore b/.gitignore
index 3b0e21bde3..e5e74f9a3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@ JAVADOC-GENERATED
 
 /release
 
+/make/output.mk
 /make/emd2exml
 
 # Created by "out_build update_primary"
@@ -242,6 +243,8 @@ JAVADOC-GENERATED
 
 # hipe
 
+/lib/hipe/boot_ebin/hipe.app
+/lib/hipe/boot_ebin/hipe.appup
 /lib/hipe/main/hipe.hrl
 /lib/hipe/rtl/hipe_literals.hrl
 
diff --git a/HOWTO/DTRACE.md b/HOWTO/DTRACE.md
index b719c68c59..8fa2fd9d50 100644
--- a/HOWTO/DTRACE.md
+++ b/HOWTO/DTRACE.md
@@ -69,7 +69,8 @@ following may be executed in a different Pthread:
 Example output from `lib/runtime_tools/examples/efile_drv.d` while executing
 `file:rename("old-name", "new-name")`:
 
-    efile_drv enter tag={3,84} user tag some-user-tag | RENAME (12) | args: old-name new-name , 0 0 (port #Port<0.59>)
+    efile_drv enter tag={3,84} user tag some-user-tag | RENAME (12) | args: old-name new-name ,\
+          0 0 (port #Port<0.59>)
     async I/O worker tag={3,83} | RENAME (12) | efile_drv-int_entry
     async I/O worker tag={3,83} | RENAME (12) | efile_drv-int_return
     efile_drv return tag={3,83} user tag  | RENAME (12) | errno 2
diff --git a/Makefile.in b/Makefile.in
index 544233f097..e5909aa7f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,9 @@ OTP = OTP-@OTP_REL@
 # erts (Erlang RunTime System) version
 ERTS = erts-@ERTS_VSN@
 
+# Include verbose output variables
+include $(ERL_TOP)/make/output.mk
+
 # ----------------------------------------------------------------------
 
 #
@@ -426,57 +429,58 @@ BOOTSTRAP_COMPILER  =  $(BOOTSTRAP_TOP)/primary_compiler
 .PHONY: emulator libs kernel stdlib compiler hipe typer syntax_tools preloaded
 
 emulator:
-	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) NO_START_SCRIPTS=true $(TYPE) FLAVOR=$(FLAVOR)
+	$(make_verbose)cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) NO_START_SCRIPTS=true $(TYPE) FLAVOR=$(FLAVOR)
 
 libs:
 ifeq ($(OTP_SMALL_BUILD),true)
-	cd lib && \
+	$(make_verbose)cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt
 else
-	cd lib && \
+	$(make_verbose)cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true
 endif
 kernel:
-	cd lib/kernel && \
+	$(make_verbose)cd lib/kernel && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true
 
 stdlib:
-	cd lib/stdlib && \
+	$(make_verbose)cd lib/stdlib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true
 
 compiler:
-	cd lib/compiler && \
+	$(make_verbose)cd lib/compiler && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true
 
 hipe:
-	cd lib/hipe && \
+	$(make_verbose)cd lib/hipe && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true
 
 typer:
-	cd lib/typer && \
+	$(make_verbose)cd lib/typer && \
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 	    $(MAKE) opt BUILD_ALL=true
 
 syntax_tools:
-	cd lib/syntax_tools && \
+	$(make_verbose)cd lib/syntax_tools && \
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 	    $(MAKE) opt BUILD_ALL=true
 
 preloaded:
-	cd erts/preloaded/src && \
+	$(make_verbose)cd erts/preloaded/src && \
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true	
 
 dep depend:
-	test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate)
-	test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
-	test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/lib_src && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
+	$(make_verbose)
+	$(V_at)test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate)
+	$(V_at)test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
+	$(V_at)test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/lib_src && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
 
 # Creates "erl" and "erlc" in bootstrap/bin which uses the precompiled 
 # libraries in the bootstrap directory
@@ -530,14 +534,15 @@ bootstrap_setup_target:
 	 echo $(TARGET) > $(BOOTSTRAP_ROOT)/bootstrap/target
 
 secondary_bootstrap_build:
-	cd lib && \
+	$(make_verbose)cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt SECONDARY_BOOTSTRAP=true
 
 secondary_bootstrap_copy:
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; fi
-	for x in lib/hipe/$(HIPE_BOOTSTRAP_EBIN)/*.beam; do \
+	$(make_verbose)
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; fi
+	$(V_at)for x in lib/hipe/$(HIPE_BOOTSTRAP_EBIN)/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin/$$BN; \
 		test -f  $$TF && \
@@ -547,12 +552,12 @@ secondary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/orber ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/orber ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include ; fi
-	for x in lib/parsetools/ebin/*.beam; do \
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/orber ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/orber ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include ; fi
+	$(V_at)for x in lib/parsetools/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin/$$BN; \
 		test -f  $$TF && \
@@ -562,8 +567,8 @@ secondary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp lib/parsetools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin
-	for x in lib/parsetools/include/*.hrl; do \
+#	$(V_at)cp lib/parsetools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin
+	$(V_at)for x in lib/parsetools/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include/$$BN; \
 		test -f  $$TF && \
@@ -573,11 +578,11 @@ secondary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp -f lib/parsetools/include/*.hrl $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1 ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1 ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src ; fi
-	for x in lib/asn1/ebin/*.beam; do \
+#	$(V_at)cp -f lib/parsetools/include/*.hrl $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1 ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1 ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src ; fi
+	$(V_at)for x in lib/asn1/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin/$$BN; \
 		test -f  $$TF && \
@@ -587,8 +592,8 @@ secondary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp lib/asn1/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin
-	for x in lib/asn1/src/*.[eh]rl; do \
+#	$(V_at)cp lib/asn1/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/ebin
+	$(V_at)for x in lib/asn1/src/*.[eh]rl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src/$$BN; \
 		test -f  $$TF && \
@@ -598,8 +603,8 @@ secondary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp -f lib/asn1/src/*.erl lib/asn1/src/*.hrl $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src
-	for x in lib/orber/include/*.hrl; do \
+#	$(V_at)cp -f lib/asn1/src/*.erl lib/asn1/src/*.hrl $(BOOTSTRAP_ROOT)/bootstrap/lib/asn1/src
+	$(V_at)for x in lib/orber/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/orber/include/$$BN; \
 		test -f  $$TF && \
@@ -609,9 +614,9 @@ secondary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl/include ; fi
-	for x in lib/xmerl/include/*.hrl; do \
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl/include ; fi
+	$(V_at)for x in lib/xmerl/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/xmerl/include/$$BN; \
 		test -f  $$TF && \
@@ -623,15 +628,16 @@ secondary_bootstrap_copy:
 	done
 
 tertiary_bootstrap_build:
-	cd lib && \
+	$(make_verbose)cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt TERTIARY_BOOTSTRAP=true
 
 tertiary_bootstrap_copy:
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/include ; fi
-	for x in lib/snmp/ebin/*.beam; do \
+	$(make_verbose)
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/include ; fi
+	$(V_at)for x in lib/snmp/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin/$$BN; \
 		test -f  $$TF && \
@@ -641,21 +647,21 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp lib/snmp/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/ic ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/ic ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; fi
-	for x in lib/ic/ebin/*.beam; do \
+#	$(V_at)cp lib/snmp/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/ic ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/ic ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; fi
+	$(V_at)for x in lib/ic/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin/$$BN; \
 		test -f  $$TF && \
@@ -665,8 +671,8 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp lib/ic/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin
-	for x in lib/ic/include/*.idl; do \
+#	$(V_at)cp lib/ic/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/ebin
+	$(V_at)for x in lib/ic/include/*.idl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include/$$BN; \
 		test -f  $$TF && \
@@ -676,7 +682,7 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-	for x in lib/ic/include/*.h; do \
+	$(V_at)for x in lib/ic/include/*.h; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include/$$BN; \
 		test -f  $$TF && \
@@ -686,8 +692,8 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp -f lib/ic/include/*.idl lib/ic/include/*.h $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include
-	for x in lib/sasl/ebin/*.beam; do \
+#	$(V_at)cp -f lib/ic/include/*.idl lib/ic/include/*.h $(BOOTSTRAP_ROOT)/bootstrap/lib/ic/include
+	$(V_at)for x in lib/sasl/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin/$$BN; \
 		test -f  $$TF && \
@@ -697,10 +703,10 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp lib/sasl/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools ; fi
-	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin ; fi
-	for x in lib/syntax_tools/ebin/*.beam; do \
+#	$(V_at)cp lib/sasl/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools ; fi
+	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin ; fi
+	$(V_at)for x in lib/syntax_tools/ebin/*.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin/$$BN; \
 		test -f  $$TF && \
@@ -710,7 +716,7 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-	for x in lib/wx/include/*.hrl; do \
+	$(V_at)for x in lib/wx/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include/$$BN; \
 		test -f  $$TF && \
@@ -721,7 +727,7 @@ tertiary_bootstrap_copy:
 		true; \
 	done
 #       copy wx_object to remove undef behaviour warnings
-	for x in lib/wx/ebin/wx_object.beam; do \
+	$(V_at)for x in lib/wx/ebin/wx_object.beam; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin/$$BN; \
 		test -f  $$TF && \
@@ -733,7 +739,7 @@ tertiary_bootstrap_copy:
 	done
 
 #	copy test includes to be able to compile tests with bootstrap compiler
-	for x in lib/test_server/include/*.hrl; do \
+	$(V_at)for x in lib/test_server/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include/$$BN; \
 		test -f  $$TF && \
@@ -744,7 +750,7 @@ tertiary_bootstrap_copy:
 		true; \
 	done
 
-	for x in lib/common_test/include/*.hrl; do \
+	$(V_at)for x in lib/common_test/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include/$$BN; \
 		test -f  $$TF && \
@@ -754,7 +760,7 @@ tertiary_bootstrap_copy:
 			cp $$x $$TF; \
 		true; \
 	done
-#	cp lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin
+#	$(V_at)cp lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin
 
 .PHONY: check_recreate_primary_bootstrap recreate_primary_bootstrap
 
@@ -783,7 +789,7 @@ check_recreate_primary_bootstrap:
 # directories of all applications part of the primary bootstrap.
 #
 recreate_primary_bootstrap:
-	$(ERL_TOP)/otp_build save_bootstrap
+	$(V_at)$(ERL_TOP)/otp_build save_bootstrap
 
 # The first bootstrap build is rarely (never) used in open source, it's
 # used to build the shipped bootstrap directory. The Open source bootstrap 
@@ -802,21 +808,21 @@ recreate_primary_bootstrap:
 
 primary_bootstrap:
 	@echo "=== Building a bootstrap compiler in $(BOOTSTRAP_ROOT)/bootstrap"
-	$(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) \
+	$(V_at)$(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) \
 		ERL_TOP=$(ERL_TOP) \
 		bootstrap_clean
-	cd $(ERL_TOP) && \
+	$(V_at)cd $(ERL_TOP) && \
 		$(MAKE) TESTROOT=$(BOOTSTRAP_TOP) \
 		BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) \
 		primary_bootstrap_build
-	cd $(ERL_TOP) && \
+	$(V_at)cd $(ERL_TOP) && \
 		$(MAKE) TESTROOT=$(BOOTSTRAP_TOP) \
 		BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) \
 		primary_bootstrap_copy
-	cd $(ERL_TOP)/erts/start_scripts && \
+	$(V_at)cd $(ERL_TOP)/erts/start_scripts && \
 		$(MAKE) TESTROOT=$(BOOTSTRAP_TOP) \
 		BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) bootstrap_scripts
-	test $(BOOTSTRAP_ROOT) = $(ERL_TOP) \
+	$(V_at)test $(BOOTSTRAP_ROOT) = $(ERL_TOP) \
 		|| $(ERL_TOP)/otp_build \
 			copy_primary_bootstrap \
 			$(BOOTSTRAP_TOP) \
@@ -824,50 +830,52 @@ primary_bootstrap:
 
 primary_bootstrap_build: primary_bootstrap_mkdirs primary_bootstrap_compiler \
   primary_bootstrap_stdlib
-	cd lib && $(MAKE) ERLC_FLAGS='-pa $(BOOTSTRAP_COMPILER)/ebin' \
+	$(make_verbose)cd lib && $(MAKE) ERLC_FLAGS='-pa $(BOOTSTRAP_COMPILER)/ebin' \
 		BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) \
 		BOOTSTRAP=1 opt
 
 primary_bootstrap_compiler: 
-	cd lib/compiler && $(MAKE) \
+	$(make_verbose)cd lib/compiler && $(MAKE) \
 		BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) \
 		BOOTSTRAP_COMPILER=$(BOOTSTRAP_COMPILER) \
 		BOOTSTRAP=1 \
 		opt
 
 primary_bootstrap_stdlib: 
-	cd lib/stdlib/src && $(MAKE) \
+	$(make_verbose)cd lib/stdlib/src && $(MAKE) \
 		BOOTSTRAP_COMPILER=$(BOOTSTRAP_COMPILER) \
 		primary_bootstrap_compiler
 
 primary_bootstrap_mkdirs:
-	test -d $(BOOTSTRAP_COMPILER)/egen \
+	$(make_verbose)
+	$(V_at)test -d $(BOOTSTRAP_COMPILER)/egen \
 		|| mkdir -p $(BOOTSTRAP_COMPILER)/egen
-	test -d $(BOOTSTRAP_COMPILER)/ebin \
+	$(V_at)test -d $(BOOTSTRAP_COMPILER)/ebin \
 		|| mkdir -p $(BOOTSTRAP_COMPILER)/ebin
-	test -d $(BOOTSTRAP_TOP)/lib/kernel/egen \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/kernel/egen \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/kernel/egen 
-	test -d $(BOOTSTRAP_TOP)/lib/kernel/ebin \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/kernel/ebin \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/kernel/ebin 
-	test -d $(BOOTSTRAP_TOP)/lib/kernel/include \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/kernel/include \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/kernel/include 
-	test -d $(BOOTSTRAP_TOP)/lib/stdlib/egen \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/stdlib/egen \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/stdlib/egen 
-	test -d $(BOOTSTRAP_TOP)/lib/stdlib/ebin \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/stdlib/ebin \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/stdlib/ebin 
-	test -d $(BOOTSTRAP_TOP)/lib/stdlib/include \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/stdlib/include \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/stdlib/include 
-	test -d $(BOOTSTRAP_TOP)/lib/compiler/egen \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/compiler/egen \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/compiler/egen 
-	test -d $(BOOTSTRAP_TOP)/lib/compiler/ebin \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/compiler/ebin \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/compiler/ebin 
-	test -d $(BOOTSTRAP_TOP)/lib/orber/include \
+	$(V_at)test -d $(BOOTSTRAP_TOP)/lib/orber/include \
 		|| mkdir -p $(BOOTSTRAP_TOP)/lib/orber/include
 
 primary_bootstrap_copy:
-	cp -f lib/kernel/include/*.hrl $(BOOTSTRAP_TOP)/lib/kernel/include
-	cp -f lib/stdlib/include/*.hrl $(BOOTSTRAP_TOP)/lib/stdlib/include
-	cp -f lib/orber/include/* $(BOOTSTRAP_TOP)/lib/orber/include
+	$(make_verbose)
+	$(V_at)cp -f lib/kernel/include/*.hrl $(BOOTSTRAP_TOP)/lib/kernel/include
+	$(V_at)cp -f lib/stdlib/include/*.hrl $(BOOTSTRAP_TOP)/lib/stdlib/include
+	$(V_at)cp -f lib/orber/include/* $(BOOTSTRAP_TOP)/lib/orber/include
 
 # To remove modules left by the bootstrap building, but leave (restore)
 # the modules in kernel which are needed for an emulator build
@@ -1000,9 +1008,10 @@ eclean:
 #
 
 bootstrap_root_clean:
-	rm -f $(BOOTSTRAP_ROOT)/bootstrap/lib/*/ebin/*.beam
-	rm -f $(BOOTSTRAP_ROOT)/bootstrap/lib/*/include/*.hrl
-	rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/*.*
+	$(make_verbose)
+	$(V_at)rm -f $(BOOTSTRAP_ROOT)/bootstrap/lib/*/ebin/*.beam
+	$(V_at)rm -f $(BOOTSTRAP_ROOT)/bootstrap/lib/*/include/*.hrl
+	$(V_at)rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/*.*
 
 # $(ERL_TOP)/bootstrap *should* equal $(BOOTSTRAP_TOP)
 #
@@ -1010,15 +1019,16 @@ bootstrap_root_clean:
 # extra safety precaution (we would really make a mess if
 # $(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/*
-	rm -f $(ERL_TOP)/bootstrap/primary_compiler/egen/*
-	rm -f $(ERL_TOP)/bootstrap/bin/*.*
-	rm -f $(KERNEL_PRELOAD:%=$(ERL_TOP)/lib/kernel/ebin/%.beam)
-	test $(BOOTSTRAP_ROOT) = $(ERL_TOP) \
+	$(make_verbose)
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/lib/*/ebin/*.beam
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/lib/*/ebin/*.app
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/lib/*/egen/*
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/lib/*/include/*.hrl
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/primary_compiler/ebin/*
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/primary_compiler/egen/*
+	$(V_at)rm -f $(ERL_TOP)/bootstrap/bin/*.*
+	$(V_at)rm -f $(KERNEL_PRELOAD:%=$(ERL_TOP)/lib/kernel/ebin/%.beam)
+	$(V_at)test $(BOOTSTRAP_ROOT) = $(ERL_TOP) \
 		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
 
 # ----------------------------------------------------------------------
diff --git a/aclocal.m4 b/aclocal.m4
index 9578cd35c4..918e30a886 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1849,6 +1849,31 @@ case $erl_gethrvtime in
 esac
 ])dnl
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $$2";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $$2")
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
 dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
 dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot
index c6ebc852a2..a98b0eda7d 100644
--- a/bootstrap/bin/start.boot
+++ b/bootstrap/bin/start.boot
diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot
index c6ebc852a2..a98b0eda7d 100644
--- a/bootstrap/bin/start_clean.boot
+++ b/bootstrap/bin/start_clean.boot
diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam
index e09584fdeb..fd36250580 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 0b93439386..7c287dc773 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_bool.beam b/bootstrap/lib/compiler/ebin/beam_bool.beam
index 18eb174687..0324c7743f 100644
--- a/bootstrap/lib/compiler/ebin/beam_bool.beam
+++ b/bootstrap/lib/compiler/ebin/beam_bool.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_bsm.beam b/bootstrap/lib/compiler/ebin/beam_bsm.beam
index e0ec059999..e0d595bea0 100644
--- a/bootstrap/lib/compiler/ebin/beam_bsm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_bsm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_dead.beam b/bootstrap/lib/compiler/ebin/beam_dead.beam
index b664286f0f..e80f8913a4 100644
--- a/bootstrap/lib/compiler/ebin/beam_dead.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dead.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_dict.beam b/bootstrap/lib/compiler/ebin/beam_dict.beam
index 50771f4e90..30777e45b8 100644
--- a/bootstrap/lib/compiler/ebin/beam_dict.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dict.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_disasm.beam b/bootstrap/lib/compiler/ebin/beam_disasm.beam
index b80b543679..2ecba86d56 100644
--- a/bootstrap/lib/compiler/ebin/beam_disasm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_disasm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_jump.beam b/bootstrap/lib/compiler/ebin/beam_jump.beam
index 07963ae01e..d15e27f507 100644
--- a/bootstrap/lib/compiler/ebin/beam_jump.beam
+++ b/bootstrap/lib/compiler/ebin/beam_jump.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam
index 0c3ce5b710..abd69e31fe 100644
--- a/bootstrap/lib/compiler/ebin/beam_utils.beam
+++ b/bootstrap/lib/compiler/ebin/beam_utils.beam
diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam
index ae8f3ee903..9767c2b2cf 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 a4a7dec7c3..733120aa9e 100644
--- a/bootstrap/lib/compiler/ebin/compiler.app
+++ b/bootstrap/lib/compiler/ebin/compiler.app
@@ -57,7 +57,6 @@
 	     sys_core_dsetel,
 	     sys_core_fold,
 	     sys_core_inline,
-	     sys_expand_pmod,
 	     sys_pre_attributes,
 	     sys_pre_expand,
 	     v3_codegen,
diff --git a/bootstrap/lib/compiler/ebin/core_lib.beam b/bootstrap/lib/compiler/ebin/core_lib.beam
index d03dfe646c..bbf9d34115 100644
--- a/bootstrap/lib/compiler/ebin/core_lib.beam
+++ b/bootstrap/lib/compiler/ebin/core_lib.beam
diff --git a/bootstrap/lib/compiler/ebin/core_lint.beam b/bootstrap/lib/compiler/ebin/core_lint.beam
index 4dcf3868aa..bc18af0f7c 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 0993838799..ac2a161ced 100644
--- a/bootstrap/lib/compiler/ebin/core_parse.beam
+++ b/bootstrap/lib/compiler/ebin/core_parse.beam
diff --git a/bootstrap/lib/compiler/ebin/core_pp.beam b/bootstrap/lib/compiler/ebin/core_pp.beam
index e96e4bc654..934d718214 100644
--- a/bootstrap/lib/compiler/ebin/core_pp.beam
+++ b/bootstrap/lib/compiler/ebin/core_pp.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
index 7637853aea..2d812b9922 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_inline.beam b/bootstrap/lib/compiler/ebin/sys_core_inline.beam
index b2762781e7..fa5ed774cd 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_inline.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_inline.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_expand_pmod.beam b/bootstrap/lib/compiler/ebin/sys_expand_pmod.beam
deleted file mode 100644
index 17a208a769..0000000000
--- a/bootstrap/lib/compiler/ebin/sys_expand_pmod.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
index c08dd86a80..60933730c3 100644
--- a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
+++ b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_codegen.beam b/bootstrap/lib/compiler/ebin/v3_codegen.beam
index 8782fb01a8..8071b9b616 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 a51af4dd43..5e29ac196e 100644
--- a/bootstrap/lib/compiler/ebin/v3_core.beam
+++ b/bootstrap/lib/compiler/ebin/v3_core.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_kernel.beam b/bootstrap/lib/compiler/ebin/v3_kernel.beam
index 3801b77852..ce71dd37bb 100644
--- a/bootstrap/lib/compiler/ebin/v3_kernel.beam
+++ b/bootstrap/lib/compiler/ebin/v3_kernel.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam b/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
index 8f18f5ff25..d263343393 100644
--- a/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
+++ b/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
diff --git a/bootstrap/lib/kernel/ebin/application.beam b/bootstrap/lib/kernel/ebin/application.beam
index ef1cb50098..3287c3f132 100644
--- a/bootstrap/lib/kernel/ebin/application.beam
+++ b/bootstrap/lib/kernel/ebin/application.beam
diff --git a/bootstrap/lib/kernel/ebin/application_controller.beam b/bootstrap/lib/kernel/ebin/application_controller.beam
index 7dc72beba6..28512de9f1 100644
--- a/bootstrap/lib/kernel/ebin/application_controller.beam
+++ b/bootstrap/lib/kernel/ebin/application_controller.beam
diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam
index f1fd519f50..04150eee56 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 258a7b9181..f142832816 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_1.beam b/bootstrap/lib/kernel/ebin/disk_log_1.beam
index aa2e21382b..d851460d38 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_util.beam b/bootstrap/lib/kernel/ebin/dist_util.beam
index 98d73eef55..8e07296a49 100644
--- a/bootstrap/lib/kernel/ebin/dist_util.beam
+++ b/bootstrap/lib/kernel/ebin/dist_util.beam
diff --git a/bootstrap/lib/kernel/ebin/error_handler.beam b/bootstrap/lib/kernel/ebin/error_handler.beam
index 45dfcee12b..740ba28f72 100644
--- a/bootstrap/lib/kernel/ebin/error_handler.beam
+++ b/bootstrap/lib/kernel/ebin/error_handler.beam
diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam
index 45efb31e93..b66197b778 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 9ab1228354..2c617ae7e4 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/global.beam b/bootstrap/lib/kernel/ebin/global.beam
index e9f463867e..4a90e37aac 100644
--- a/bootstrap/lib/kernel/ebin/global.beam
+++ b/bootstrap/lib/kernel/ebin/global.beam
diff --git a/bootstrap/lib/kernel/ebin/group.beam b/bootstrap/lib/kernel/ebin/group.beam
index bc2ef712aa..2a7e46faf5 100644
--- a/bootstrap/lib/kernel/ebin/group.beam
+++ b/bootstrap/lib/kernel/ebin/group.beam
diff --git a/bootstrap/lib/kernel/ebin/heart.beam b/bootstrap/lib/kernel/ebin/heart.beam
index 80f0a60c9f..7e81d1610a 100644
--- a/bootstrap/lib/kernel/ebin/heart.beam
+++ b/bootstrap/lib/kernel/ebin/heart.beam
diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
index f8d3e5847a..5b41832dec 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 b2eccbb475..88a97e0ec2 100644
--- a/bootstrap/lib/kernel/ebin/inet.beam
+++ b/bootstrap/lib/kernel/ebin/inet.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam
index dd2d62b8a0..148a74fe49 100644
--- a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_db.beam b/bootstrap/lib/kernel/ebin/inet_db.beam
index 4fd0b25503..a3081261a2 100644
--- a/bootstrap/lib/kernel/ebin/inet_db.beam
+++ b/bootstrap/lib/kernel/ebin/inet_db.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_dns.beam b/bootstrap/lib/kernel/ebin/inet_dns.beam
index 4b82d77ccc..07b4356f7b 100644
--- a/bootstrap/lib/kernel/ebin/inet_dns.beam
+++ b/bootstrap/lib/kernel/ebin/inet_dns.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_parse.beam b/bootstrap/lib/kernel/ebin/inet_parse.beam
index ee4f541641..c5a2398824 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_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
index 39389454f9..e794a5e94c 100644
--- a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
+++ b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app
index 48f6250828..ca2dc4f7c5 100644
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ b/bootstrap/lib/kernel/ebin/kernel.app
@@ -28,7 +28,6 @@
 	     application_starter,
 	     auth,
 	     code,
-	     packages,
 	     code_server,
 	     dist_util,
 	     erl_boot_server,
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
index ebb9ed19d5..f27b82d841 100644
--- a/bootstrap/lib/kernel/ebin/net_kernel.beam
+++ b/bootstrap/lib/kernel/ebin/net_kernel.beam
diff --git a/bootstrap/lib/kernel/ebin/packages.beam b/bootstrap/lib/kernel/ebin/packages.beam
deleted file mode 100644
index 86fb5b6094..0000000000
--- a/bootstrap/lib/kernel/ebin/packages.beam
+++ /dev/null
diff --git a/bootstrap/lib/kernel/ebin/ram_file.beam b/bootstrap/lib/kernel/ebin/ram_file.beam
index 87af871756..74fcc898c3 100644
--- a/bootstrap/lib/kernel/ebin/ram_file.beam
+++ b/bootstrap/lib/kernel/ebin/ram_file.beam
diff --git a/bootstrap/lib/kernel/ebin/user.beam b/bootstrap/lib/kernel/ebin/user.beam
index d678631703..7b761283a0 100644
--- a/bootstrap/lib/kernel/ebin/user.beam
+++ b/bootstrap/lib/kernel/ebin/user.beam
diff --git a/bootstrap/lib/stdlib/ebin/base64.beam b/bootstrap/lib/stdlib/ebin/base64.beam
index 1e9589e945..2ca9a4d0b8 100644
--- a/bootstrap/lib/stdlib/ebin/base64.beam
+++ b/bootstrap/lib/stdlib/ebin/base64.beam
diff --git a/bootstrap/lib/stdlib/ebin/beam_lib.beam b/bootstrap/lib/stdlib/ebin/beam_lib.beam
index 250be4dcb1..c7ebc3b440 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 d627009e03..d919fa0a2d 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 48ed694380..19f589980f 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 882228c5d8..f9b99f574c 100644
--- a/bootstrap/lib/stdlib/ebin/dets_utils.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_utils.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_v9.beam b/bootstrap/lib/stdlib/ebin/dets_v9.beam
index f504c8e9d4..4d383902cd 100644
--- a/bootstrap/lib/stdlib/ebin/dets_v9.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_v9.beam
diff --git a/bootstrap/lib/stdlib/ebin/digraph_utils.beam b/bootstrap/lib/stdlib/ebin/digraph_utils.beam
index 9bab801654..a5957fc9ce 100644
--- a/bootstrap/lib/stdlib/ebin/digraph_utils.beam
+++ b/bootstrap/lib/stdlib/ebin/digraph_utils.beam
diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam
index e48ebd1d89..a3a86afce9 100644
--- a/bootstrap/lib/stdlib/ebin/epp.beam
+++ b/bootstrap/lib/stdlib/ebin/epp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_eval.beam b/bootstrap/lib/stdlib/ebin/erl_eval.beam
index d097eaf1f1..1445449c6e 100644
--- a/bootstrap/lib/stdlib/ebin/erl_eval.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_eval.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
index 093bd0f501..764f624cab 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_lint.beam b/bootstrap/lib/stdlib/ebin/erl_lint.beam
index 9dc80f67b9..20b6d9cd44 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 d7a5103030..0b274c9630 100644
--- a/bootstrap/lib/stdlib/ebin/erl_parse.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_parse.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_pp.beam b/bootstrap/lib/stdlib/ebin/erl_pp.beam
index 32e33ad130..9c5c72af30 100644
--- a/bootstrap/lib/stdlib/ebin/erl_pp.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_pp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_scan.beam b/bootstrap/lib/stdlib/ebin/erl_scan.beam
index 3abab91ce1..ef47d3a06c 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 90ed044a66..4cb833bb30 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 2a29ae551f..f8f3145066 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 7d0554106e..e255819b70 100644
--- a/bootstrap/lib/stdlib/ebin/ets.beam
+++ b/bootstrap/lib/stdlib/ebin/ets.beam
diff --git a/bootstrap/lib/stdlib/ebin/eval_bits.beam b/bootstrap/lib/stdlib/ebin/eval_bits.beam
index dc2ea0f521..379fc3655f 100644
--- a/bootstrap/lib/stdlib/ebin/eval_bits.beam
+++ b/bootstrap/lib/stdlib/ebin/eval_bits.beam
diff --git a/bootstrap/lib/stdlib/ebin/file_sorter.beam b/bootstrap/lib/stdlib/ebin/file_sorter.beam
index e118a6ec85..180054c091 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 82dfeb7ca8..65f45632ac 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 f8a42129c1..de676f2bed 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 37b6753300..be35e0124e 100644
--- a/bootstrap/lib/stdlib/ebin/gen_event.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_event.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_fsm.beam b/bootstrap/lib/stdlib/ebin/gen_fsm.beam
index 1fcabac0d7..06782fbf91 100644
--- a/bootstrap/lib/stdlib/ebin/gen_fsm.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_fsm.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_server.beam b/bootstrap/lib/stdlib/ebin/gen_server.beam
index f0fa4f03a9..0ccd003b0b 100644
--- a/bootstrap/lib/stdlib/ebin/gen_server.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_server.beam
diff --git a/bootstrap/lib/stdlib/ebin/io.beam b/bootstrap/lib/stdlib/ebin/io.beam
index cade9d5ac6..ddfcca41e8 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 151fcd9d99..9420ea0f53 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_format.beam b/bootstrap/lib/stdlib/ebin/io_lib_format.beam
index 226f8216be..1a7c3393f8 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_format.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_format.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
index 16fad6af64..b14eb23e7c 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
diff --git a/bootstrap/lib/stdlib/ebin/lib.beam b/bootstrap/lib/stdlib/ebin/lib.beam
index 3865cfb227..668ea7eb29 100644
--- a/bootstrap/lib/stdlib/ebin/lib.beam
+++ b/bootstrap/lib/stdlib/ebin/lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/lists.beam b/bootstrap/lib/stdlib/ebin/lists.beam
index 948af8d1be..68b6d0da56 100644
--- a/bootstrap/lib/stdlib/ebin/lists.beam
+++ b/bootstrap/lib/stdlib/ebin/lists.beam
diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam
index 270d35ef33..84feea2c66 100644
--- a/bootstrap/lib/stdlib/ebin/otp_internal.beam
+++ b/bootstrap/lib/stdlib/ebin/otp_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/pool.beam b/bootstrap/lib/stdlib/ebin/pool.beam
index 8ad59de20d..9a9bfa4e2f 100644
--- a/bootstrap/lib/stdlib/ebin/pool.beam
+++ b/bootstrap/lib/stdlib/ebin/pool.beam
diff --git a/bootstrap/lib/stdlib/ebin/proc_lib.beam b/bootstrap/lib/stdlib/ebin/proc_lib.beam
index 25843dfe45..e22b3ad758 100644
--- a/bootstrap/lib/stdlib/ebin/proc_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/proc_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/qlc.beam b/bootstrap/lib/stdlib/ebin/qlc.beam
index eef4cef042..302dda040f 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 e76d49052d..eb098b31ae 100644
--- a/bootstrap/lib/stdlib/ebin/qlc_pt.beam
+++ b/bootstrap/lib/stdlib/ebin/qlc_pt.beam
diff --git a/bootstrap/lib/stdlib/ebin/re.beam b/bootstrap/lib/stdlib/ebin/re.beam
index f0508c73b3..8001c49672 100644
--- a/bootstrap/lib/stdlib/ebin/re.beam
+++ b/bootstrap/lib/stdlib/ebin/re.beam
diff --git a/bootstrap/lib/stdlib/ebin/shell.beam b/bootstrap/lib/stdlib/ebin/shell.beam
index 8705c85853..5614d31ac8 100644
--- a/bootstrap/lib/stdlib/ebin/shell.beam
+++ b/bootstrap/lib/stdlib/ebin/shell.beam
diff --git a/bootstrap/lib/stdlib/ebin/sofs.beam b/bootstrap/lib/stdlib/ebin/sofs.beam
index d8d65c5521..5a7ddd5f56 100644
--- a/bootstrap/lib/stdlib/ebin/sofs.beam
+++ b/bootstrap/lib/stdlib/ebin/sofs.beam
diff --git a/bootstrap/lib/stdlib/ebin/supervisor.beam b/bootstrap/lib/stdlib/ebin/supervisor.beam
index 0e16688bc4..aae89985c8 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor.beam
diff --git a/bootstrap/lib/stdlib/ebin/sys.beam b/bootstrap/lib/stdlib/ebin/sys.beam
index 841874f1f5..e06badfec4 100644
--- a/bootstrap/lib/stdlib/ebin/sys.beam
+++ b/bootstrap/lib/stdlib/ebin/sys.beam
diff --git a/bootstrap/lib/stdlib/ebin/unicode.beam b/bootstrap/lib/stdlib/ebin/unicode.beam
index 4e91cf2466..9869d4862b 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 e8492c52bc..41386df3f0 100644
--- a/bootstrap/lib/stdlib/ebin/zip.beam
+++ b/bootstrap/lib/stdlib/ebin/zip.beam
diff --git a/configure.in b/configure.in
index e906c17ecc..c0994245e8 100644
--- a/configure.in
+++ b/configure.in
@@ -354,6 +354,21 @@ elif test X"$TMPSYS" '=' X"Darwin-i386"; then
 	export LDFLAGS
 fi
 
+AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+
+DEFAULT_VERBOSITY=1
+if test X${enable_silent_rules} = Xyes; then
+  DEFAULT_VERBOSITY=0
+fi
+AC_SUBST(DEFAULT_VERBOSITY)
+
 if test X${enable_m64_build} = Xyes; then
 	enable_hipe=no
 	CFLAGS="-m64 $CFLAGS"
@@ -378,7 +393,7 @@ AC_SUBST(NATIVE_LIBS_ENABLED)
 export ERL_TOP
 AC_CONFIG_SUBDIRS(lib erts)
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile make/output.mk])
 AC_CONFIG_FILES([make/emd2exml], [chmod +x make/emd2exml])
 
 AC_OUTPUT
diff --git a/erts/Makefile.in b/erts/Makefile.in
index 5df6d71ef3..0bcb784972 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -19,6 +19,7 @@
 
 .NOTPARALLEL:
 
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 include vsn.mk
 
@@ -38,11 +39,11 @@ all: smp opt
 
 .PHONY: docs
 docs:
-	( cd doc/src && $(MAKE) $@ )
+	$(V_at)( cd doc/src && $(MAKE) $@ )
 
 .PHONY: debug opt clean
 debug opt clean:
-	for d in emulator $(ERTSDIRS); do \
+	$(V_at)for d in emulator $(ERTSDIRS); do \
 		if test -d $$d; then \
 			( cd $$d && $(MAKE) $@ FLAVOR=$(FLAVOR) ) || exit $$? ; \
 		fi ; \
@@ -55,7 +56,7 @@ debug opt clean:
 
 .PHONY: $(EXTRA_FLAVORS)
 $(EXTRA_FLAVORS):
-	( cd emulator && $(MAKE) opt FLAVOR=$@ )
+	$(V_at)( cd emulator && $(MAKE) opt FLAVOR=$@ )
 
 # Make erl script and erlc in $(ERL_TOP)/bin which runs the compiled version
 # Note that erlc is not a script and requires extra handling on cygwin.
@@ -67,7 +68,7 @@ $(EXTRA_FLAVORS):
 .PHONY: local_setup
 local_setup:
 	@cd start_scripts && $(MAKE)
-	@echo `ls $(ERL_TOP)/bin/`
+	$(V_colon)@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 \
@@ -128,10 +129,10 @@ makefiles:
 
 .PHONY: release
 release:
-	for f in plain $(EXTRA_FLAVORS) ; do \
+	$(V_at)for f in plain $(EXTRA_FLAVORS) ; do \
 		( cd emulator && $(MAKE) release FLAVOR=$$f ) \
 	done
-	for d in $(ERTSDIRS) $(XINSTDIRS); do \
+	$(V_at)for d in $(ERTSDIRS) $(XINSTDIRS); do \
 		if test -d $$d; then \
 			( cd $$d && $(MAKE) $@ ) || exit $$? ; \
 		fi ; \
@@ -139,4 +140,4 @@ release:
 
 .PHONY: release_docs
 release_docs:
-	( cd doc/src && $(MAKE) $@ )
+	$(V_at)( cd doc/src && $(MAKE) $@ )
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 9578cd35c4..918e30a886 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -1849,6 +1849,31 @@ case $erl_gethrvtime in
 esac
 ])dnl
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $$2";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $$2")
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
 dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
 dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
diff --git a/erts/configure.in b/erts/configure.in
index 3256b0cb59..a0c5cab181 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -537,6 +537,9 @@ else
 fi
 
 if test "x$GCC" = xyes; then
+  # Treat certain GCC warnings as errors
+  LM_TRY_ENABLE_CFLAG([-Werror=return-type], [WERRORFLAGS])
+
   # until the emulator can handle this, I suggest we turn it off!
   #WFLAGS="-Wall -Wshadow -Wcast-qual -Wmissing-declarations"
   WFLAGS="-Wall -Wstrict-prototypes"
@@ -559,11 +562,13 @@ if test "x$GCC" = xyes; then
   CFLAGS=$saved_CFLAGS
 else
   WFLAGS=""
+  WERRORFLAGS=""
 fi
 dnl DEBUG_FLAGS is obsolete (I hope)
 AC_SUBST(DEBUG_FLAGS)
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(WFLAGS)
+AC_SUBST(WERRORFLAGS)
 AC_SUBST(CFLAG_RUNTIME_LIBRARY_PATH)
 
 AC_CHECK_SIZEOF(void *) # Needed for ARCH and smp checks below
@@ -735,12 +740,8 @@ esac
 
 AC_MSG_CHECKING(if VM has to be linked with Carbon framework)
 case $ARCH-$OPSYS in
-	amd64-darwin*)
-		LIBCARBON=
-		AC_MSG_RESULT([no])
-		;;
 	*-darwin*)
-		LIBCARBON="-framework Carbon "
+  		LIBCARBON="-framework Carbon -framework Cocoa"
 		AC_MSG_RESULT([yes])
 		;;
 	*)
@@ -826,6 +827,12 @@ if test -z "$FOP"; then
   AC_MSG_WARN([No 'fop' command found: going to generate placeholder PDF files])
 fi
 
+AC_CHECK_PROGS(XMLLINT, xmllint)
+if test -z "$XMLLINT"; then
+  echo "xmllint" >> doc/CONF_INFO
+  AC_MSG_WARN([No 'xmllint' command found: can't run the xmllint target for the documentation])
+fi
+
 dnl
 dnl We can live with Solaris /usr/ucb/install
 dnl
@@ -1075,8 +1082,45 @@ fi
 
 AC_SUBST(ERTS_BUILD_SMP_EMU)
 
-AC_CHECK_FUNCS([posix_fadvise])
+AC_CHECK_FUNCS([posix_fadvise, fallocate])
+AC_CHECK_HEADERS([linux/falloc.h])
 
+dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
+dnl * It may also be broken in AIX.
+AC_CACHE_CHECK([whether posix_fallocate() works],i_cv_posix_fallocate_works,[
+    AC_TRY_RUN([
+        #if !defined(__sun) && !defined(__sun__)
+        #define _XOPEN_SOURCE 600
+        #endif
+        #include <stdio.h>
+        #include <stdlib.h>
+        #include <fcntl.h>
+        #include <unistd.h>
+        #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7))
+            possibly broken posix_fallocate
+        #endif
+        int main() {
+            int fd = creat("conftest.temp", 0600);
+            int ret;
+            if (-1 == fd) {
+               perror("creat()");
+               return 2;
+            }
+            ret = posix_fallocate(fd, 1024, 1024) < 0 ? 1 : 0;
+            unlink("conftest.temp");
+            return ret;
+        }
+    ], [
+        i_cv_posix_fallocate_works=yes
+    ], [
+        i_cv_posix_fallocate_works=no
+    ], [
+        i_cv_posix_fallocate_works=no
+    ])
+])
+if test $i_cv_posix_fallocate_works = yes; then
+   AC_DEFINE(HAVE_POSIX_FALLOCATE,, Define if you have a working posix_fallocate())
+fi
 
 #
 # Figure out if the emulator should use threads. The default is set above
@@ -4461,7 +4505,7 @@ dnl needs to be rebuilt.
 dnl
 
 AC_DEFINE_UNQUOTED(ERTS_EMU_CMDLINE_FLAGS,
-"$STATIC_CFLAGS $CFLAGS $DEBUG_CFLAGS $EMU_THR_DEFS $DEFS $WFLAGS",
+"$STATIC_CFLAGS $CFLAGS $DEBUG_CFLAGS $EMU_THR_DEFS $DEFS $WERRORFLAGS $WFLAGS",
 [The only reason ERTS_EMU_CMDLINE_FLAGS exists is to force modification of config.h when the emulator command line flags are modified by configure])
 
 dnl ----------------------------------------------------------------------
@@ -4524,6 +4568,10 @@ AH_BOTTOM([
 #endif
 ])
 
+if test "x$GCC" = xyes; then
+  CFLAGS="$WERRORFLAGS $CFLAGS"
+fi
+
 dnl ----------------------------------------------------------------------
 dnl Output the result.
 dnl ----------------------------------------------------------------------
diff --git a/erts/doc/src/absform.xml b/erts/doc/src/absform.xml
index 4455d0ac92..d036b4c7fb 100644
--- a/erts/doc/src/absform.xml
+++ b/erts/doc/src/absform.xml
@@ -290,13 +290,6 @@
       <item>If E is <c><![CDATA[fun Fc_1 ; ... ; Fc_k end]]></c> 
        where each <c><![CDATA[Fc_i]]></c> is a function clause then Rep(E) =
       <c><![CDATA[{'fun',LINE,{clauses,[Rep(Fc_1), ..., Rep(Fc_k)]}}]]></c>.</item>
-      <item>If E is <c><![CDATA[query [E_0 || W_1, ..., W_k] end]]></c>,
-       where each <c><![CDATA[W_i]]></c> is a generator or a filter, then
-       Rep(E) = <c><![CDATA[{'query',LINE,{lc,LINE,Rep(E_0),[Rep(W_1), ..., Rep(W_k)]}}]]></c>.
-       For Rep(W), see below.</item>
-      <item>If E is <c><![CDATA[E_0.Field]]></c>, a Mnesia record access
-       inside a query, then
-       Rep(E) = <c><![CDATA[{record_field,LINE,Rep(E_0),Rep(Field)}]]></c>.</item>
       <item>If E is <c><![CDATA[( E_0 )]]></c>, then
        Rep(E) = <c><![CDATA[Rep(E_0)]]></c>,
        i.e., parenthesized expressions cannot be distinguished from their bodies.</item>
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 512784d9f0..37c7f3466b 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -479,7 +479,7 @@
       <tag><marker id="async_thread_pool_size"><c><![CDATA[+A size]]></c></marker></tag>
       <item>
         <p>Sets the number of threads in async thread pool, valid range
-          is 0-1024. Default is 0.</p>
+          is 0-1024. If thread support is available, the default is 10.</p>
       </item>
       <tag><c><![CDATA[+B [c | d | i]]]></c></tag>
       <item>
@@ -672,7 +672,7 @@
       <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>
+	   default the reader groups limit equals 64.</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,
@@ -710,7 +710,24 @@
         <taglist>
           <tag><marker id="+sbt"><c>+sbt BindType</c></marker></tag>
           <item>
-            <p>Set scheduler bind type. Currently valid <c>BindType</c>s:
+            <p>Set scheduler bind type.</p>
+	    <p>Schedulers can also be bound using the
+	    <seealso marker="#+stbt">+stbt</seealso> flag. The only difference
+	    between these two flags is how the following errors are handled:</p>
+	    <list>
+	      <item>Binding of schedulers is not supported on the specific
+	      platform.</item>
+	      <item>No available CPU topology. That is the runtime system
+	      was not able to automatically detected the CPU topology, and
+	      no <seealso marker="#+sct">user defined CPU topology</seealso>
+	      was set.</item>
+	    </list>
+	    <p>If any of these errors occur when <c>+sbt</c> has been passed,
+	    the runtime system will print an error message, and refuse to
+	    start. If any of these errors occur when <c>+stbt</c> has been
+	    passed, the runtime system will silently ignore the error, and
+	    start up using unbound schedulers.</p>
+	    <p>Currently valid <c>BindType</c>s:
 	    </p>
 	    <taglist>
 	      <tag><c>u</c></tag>
@@ -960,6 +977,14 @@
 	    <p>For more information, see
 	    <seealso marker="erlang#system_info_cpu_topology">erlang:system_info(cpu_topology)</seealso>.</p>
           </item>
+          <tag><marker id="+stbt"><c>+stbt BindType</c></marker></tag>
+          <item>
+            <p>Try to set scheduler bind type. The same as the
+	    <seealso marker="#+sbt">+sbt</seealso> flag with the exception of
+	    how some errors are handled. For more information, see the
+	    documentation of the <seealso marker="#+sbt">+sbt</seealso> flag.
+	    </p>
+	  </item>
 	  <tag><marker id="+sws"><c>+sws default|legacy|proposal</c></marker></tag>
 	  <item>
              <p>Set scheduler wakeup strategy. Default is <c>legacy</c> (has been
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 343ae3c676..ce59908036 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -626,6 +626,22 @@ false</pre>
 {more,6}</pre>
       </desc>
     </func>
+
+    <func>
+      <name name="delete_element" arity="2"/>
+      <fsummary>Delete element at index in a tuple</fsummary>
+      <type_desc variable="Index">1..tuple_size(<anno>Tuple1</anno>)</type_desc>
+      <desc>
+		  <p>
+			  Returns a new tuple with element at <c><anno>Index</anno></c> removed from
+			  tuple <c><anno>Tuple1</anno></c>.
+		  </p>
+        <pre>
+> <input>erlang:delete_element(2, {one, two, three}).</input>
+{one,three}</pre>
+      </desc>
+    </func>
+
     <func>
       <name name="delete_module" arity="1"/>
       <fsummary>Make the current code for a module old</fsummary>
@@ -1361,6 +1377,24 @@ os_prompt% </pre>
           when the process wakes up.</p>
       </desc>
     </func>
+
+    <func>
+      <name name="insert_element" arity="3"/>
+      <fsummary>Insert an element at index in a tuple</fsummary>
+      <type_desc variable="Index">1..tuple_size(<anno>Tuple1</anno>) + 1</type_desc>
+      <desc>
+		  <p>
+			  Returns a new tuple with element <c><anno>Term</anno></c> insert at position
+			  <c><anno>Index</anno></c> in tuple <c><anno>Tuple1</anno></c>.
+			  All elements from position <c><anno>Index</anno></c> and upwards are subsequently
+			  pushed one step higher in the new tuple <c><anno>Tuple2</anno></c>.
+		  </p>
+        <pre>
+> <input>erlang:insert_element(2, {one, two, three}, new).</input>
+{one,new,two,three}</pre>
+      </desc>
+    </func>
+
     <func>
       <name name="integer_to_list" arity="1"/>
       <fsummary>Text representation of an integer</fsummary>
@@ -3672,10 +3706,11 @@ os_prompt% </pre>
               the initial function call with which the process was
               spawned.</p>
           </item>
-          <tag><c>{links, <anno>Pids</anno>}</c></tag>
+          <tag><c>{links, <anno>PidsAndPorts</anno>}</c></tag>
           <item>
-            <p><c><anno>Pids</anno></c> is a list of pids, with processes to
-              which the process has a link.</p>
+            <p><c><anno>PidsAndPorts</anno></c> is a list of pids and 
+	    port identifiers, with processes or ports to which the process 
+	    has a link.</p>
           </item>
           <tag><c>{last_calls, false|Calls}</c></tag>
           <item>
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index ec5e7d9b74..87d6682328 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -341,7 +341,8 @@
        Largest (<c>mseg_alloc</c>) multiblock carrier size (in
        kilobytes).  See <seealso marker="#mseg_mbc_sizes">the description
        on how sizes for mseg_alloc multiblock carriers are decided</seealso>
-       in "the <c>alloc_util</c> framework" section.</item>
+       in "the <c>alloc_util</c> framework" section. On 32-bit Unix style OS
+       this limit can not be set higher than 128 megabyte.</item>
       <tag><marker id="M_mbcgs"><c><![CDATA[+M<S>mbcgs <ratio>]]></c></marker></tag>
       <item>
        (<c>mseg_alloc</c>) multiblock carrier growth stages. See
@@ -413,7 +414,8 @@
        Singleblock carrier threshold. Blocks larger than this
        threshold will be placed in singleblock carriers. Blocks
        smaller than this threshold will be placed in multiblock
-       carriers.</item>
+       carriers. On 32-bit Unix style OS this threshold can not be set higher
+       than 8 megabytes.</item>
       <tag><marker id="M_sbmbcs"><c><![CDATA[+M<S>sbmbcs <size>]]></c></marker></tag>
       <item>
 	Small block multiblock carrier size (in bytes). Memory blocks smaller
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index e996d3e8e3..de6696671b 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,213 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Set new peeled off SCTP socket to nonblocking socket
+	    (Thanks to Jonas Falkevik)</p>
+          <p>
+	    Own Id: OTP-10491</p>
+        </item>
+        <item>
+          <p>
+	    Fix various typos (thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-10611</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A boolean socket option 'ipv6_v6only' for IPv6 sockets
+	    has been added. The default value of the option is OS
+	    dependent, so applications aiming to be portable should
+	    consider using <c>{ipv6_v6only,true}</c> when creating an
+	    <c>inet6</c> listening/destination socket, and if
+	    neccesary also create an <c>inet</c> socket on the same
+	    port for IPv4 traffic. See the documentation.</p>
+          <p>
+	    Own Id: OTP-8928 Aux Id: kunagi-193 [104] </p>
+        </item>
+        <item>
+	    <p>It is now allowed to define stubs for BIFs, to allow
+	    type specs to be written for BIFs. For example, if there
+	    is BIF called <c>lists:member/2</c>, a dummy definition
+	    of <c>lists:member/2</c> is now allowed.</p>
+          <p>
+	    Own Id: OTP-9861</p>
+        </item>
+        <item>
+          <p>
+	    Code loading and upgrade are now done without blocking
+	    the emulator in single threaded mode. This will improve
+	    realtime characteristics when code is loaded/upgraded on
+	    a running SMP system.</p>
+          <p>
+	    Own Id: OTP-9974</p>
+        </item>
+        <item>
+	    <p>In the SMP emulator, turning on and off tracing will
+	    no longer take down the system to single-scheduling. </p>
+          <p>
+	    Own Id: OTP-10122</p>
+        </item>
+        <item>
+          <p>
+	    Tuple funs (deprecated in R15B) are no longer supported.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-10170</p>
+        </item>
+        <item>
+	    <p>Major port improvements. The most notable:</p> <list>
+	    <item>New internal port table implementation allowing for
+	    both parallel reads as well as writes. Especially read
+	    operations have become really cheap.</item> <item>Dynamic
+	    allocation of port structures. This allow for a much
+	    larger maximum amount of ports allowed as a default. The
+	    previous default of 1024 has been raised to 65536.
+	    Maximum amount of ports can be set using the <seealso
+	    marker="erts:erl#+Q">+Q</seealso> command line flag of
+	    <seealso marker="erts:erl">erl(1)</seealso>. The
+	    previously used environment variable <c>ERL_MAX_PORTS</c>
+	    has been deprecated and scheduled for removal in
+	    OTP-R17.</item> <item>Major rewrite of scheduling of port
+	    tasks. Major benefits of the rewrite are reduced
+	    contention on run queue locks, and reduced amount of
+	    memory allocation operations needed. The rewrite was also
+	    necessary in order to make it possible to schedule
+	    signals from processes to ports.</item> <item>Improved
+	    internal thread progress functionality for easy
+	    management of unmanaged threads. This improvement was
+	    necessary for the rewrite of the port task
+	    scheduling.</item> <item>Rewrite of all process to port
+	    signal implementations in order to make it possible to
+	    schedule those operations. All port operations can now be
+	    scheduled which allows for reduced lock contention on the
+	    port lock as well as truly asynchronous communication
+	    with ports.</item> <item>Optimized lookup of port handles
+	    from drivers.</item> <item>Optimized driver lookup when
+	    creating ports.</item> <item>Preemptable <seealso
+	    marker="erts:erlang#ports-0">erlang:ports/0</seealso>
+	    BIF.</item> </list>
+	    <p>These changes imply changes of the characteristics of
+	    the system. The most notable:</p> <taglist> <tag>Order of
+	    signal delivery.</tag> <item>The previous implementation
+	    of the VM has delivered signals from processes to ports
+	    in a synchronous stricter fashion than required by the
+	    language. As of ERTS version 5.10, signals are truly
+	    asynchronously delivered. The order of signal delivery
+	    still adheres to the requirements of the language, but
+	    only to the requirements. That is, some signal sequences
+	    that previously always were delivered in one specific
+	    order may now from time to time be delivered in different
+	    orders. This may cause Erlang programs that have made
+	    <em>false assumptions</em> about signal delivery order to
+	    fail even though they previously succeeded. For more
+	    information about signal ordering guarantees, see the
+	    chapter on <seealso
+	    marker="erts:communication">communication</seealso> in
+	    the ERTS user's guide. The <seealso
+	    marker="erts:erl#+n">+n</seealso> command line flag of
+	    <seealso marker="erts:erl">erl(1)</seealso> can be
+	    helpful when trying to find signaling order bugs in
+	    Erlang code that have been exposed by these
+	    changes.</item> <tag>Latency of signals sent from
+	    processes to ports.</tag> <item>Signals from processes to
+	    ports where previously always delivered immediately. This
+	    kept latency for such communication to a minimum, but it
+	    could cause lock contention which was very expensive for
+	    the system as a whole. In order to keep this latency low
+	    also in the future, most signals from processes to ports
+	    are by default still delivered immediately as long as no
+	    conflicts occur. Such conflicts include not being able to
+	    acquire the port lock, but also include other conflicts.
+	    When a conflict occur, the signal will be scheduled for
+	    delivery at a later time. A scheduled signal delivery may
+	    cause a higher latency for this specific communication,
+	    but improves the overall performance of the system since
+	    it reduce lock contention between schedulers. The default
+	    behavior of only scheduling delivery of these signals on
+	    conflict can be changed by passing the <seealso
+	    marker="erts:erl#+spp">+spp</seealso> command line flag
+	    to <seealso marker="erts:erl">erl(1)</seealso>. The
+	    behavior can also be changed on port basis using the
+	    <seealso
+	    marker="erts:erlang#open_port_parallelism">parallelism</seealso>
+	    option of the <seealso
+	    marker="erts:erlang#open_port-2">open_port/2</seealso>
+	    BIF.</item> <tag>Execution time of the
+	    <c>erlang:ports/0</c> BIF.</tag> <item>Since <seealso
+	    marker="erts:erlang#ports-0">erlang:ports/0</seealso> now
+	    can be preempted, the responsiveness of the system as a
+	    whole has been improved. A call to <c>erlang:ports/0</c>
+	    may, however, take a much longer time to complete than
+	    before. How much longer time heavily depends on the
+	    system load.</item> </taglist>
+	    <p><em>Potential incompatibilities</em>:</p> <list>
+	    <item><c>driver_send_term()</c> has been deprecated and
+	    has been scheduled for removal in OTP-R17. Replace usage
+	    of <c>driver_send_term()</c> with usage of <seealso
+	    marker="erts:erl_driver#erl_drv_send_term">erl_drv_send_term()</seealso>.</item>
+	    <item><c>driver_output_term()</c> has been deprecated and
+	    has been scheduled for removal in OTP-R17. Replace usage
+	    of <c>driver_output_term()</c> with usage of <seealso
+	    marker="erts:erl_driver#erl_drv_output_term">erl_drv_output_term()</seealso>.</item>
+	    <item>The new function <seealso
+	    marker="erts:erl_driver#erl_drv_busy_msgq_limits">erl_drv_busy_msgq_limits()</seealso>
+	    has been added in order to able to control management of
+	    port queues.</item> </list>
+	    <p>The <seealso
+	    marker="erts:erl_driver#version_management">driver API
+	    version</seealso> has been bumped to 2.1 from 2.0 due to
+	    the above changes in the driver API.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-10336 Aux Id: kunagi-138
+	    [b5b97f67-fe34-46dc-93e6-a2931576db12] </p>
+        </item>
+        <item>
+          <p>
+	    Erlang specification 4.7.3 defines max tuple size to
+	    65535 elements It is now enforced to no more than
+	    16777215 elements (arity 24 bits)</p>
+          <p>
+	    Previous edge cases (28 bits) were not validated and
+	    could cause undefined behaviour.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-10633</p>
+        </item>
+        <item>
+          <p>
+	    The previous default of a maximum of 32768 simultaneous
+	    processes has been raised to 262144. This value can be
+	    changed using the the <seealso
+	    marker="erl#+P">+P</seealso> command line flag of
+	    <seealso marker="erl">erl(1)</seealso>. Note that the
+	    value passed now is considered as a hint, and that actual
+	    value chosen in most cases will be a power of two.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-10647 Aux Id: OTP-10336 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.9.3.1</title>
 
     <section><title>Known Bugs and Problems</title>
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 67320697ef..3e44bbb8db 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -61,7 +61,7 @@ else
 ifeq ($(TYPE),purify)
 PURIFY = purify $(PURIFY_BUILD_OPTIONS)
 TYPEMARKER = .purify
-TYPE_FLAGS = $(DEBUG_CFLAGS) -DPURIFY -DNO_JUMP_TABLE -DERTS_MSEG_FAKE_SEGMENTS
+TYPE_FLAGS = $(DEBUG_CFLAGS) -DPURIFY -DNO_JUMP_TABLE
 ENABLE_ALLOC_TYPE_VARS += purify
 else
 
@@ -92,7 +92,7 @@ else
 ifeq ($(TYPE),valgrind)
 PURIFY = 
 TYPEMARKER = .valgrind
-TYPE_FLAGS = $(DEBUG_CFLAGS) -DVALGRIND -DNO_JUMP_TABLE -DERTS_MSEG_FAKE_SEGMENTS
+TYPE_FLAGS = $(DEBUG_CFLAGS) -DVALGRIND -DNO_JUMP_TABLE
 ENABLE_ALLOC_TYPE_VARS += valgrind
 else
 
@@ -399,7 +399,7 @@ include zlib/zlib.mk
 include pcre/pcre.mk
 
 $(ERTS_LIB):
-	cd $(ERTS_LIB_DIR) && $(MAKE) $(TYPE)
+	$(V_at)cd $(ERTS_LIB_DIR) && $(MAKE) $(TYPE)
 
 .PHONY: clean
 clean:
@@ -491,7 +491,7 @@ $(TTF_DIR)/beam_pred_funcs.h \
 $(TTF_DIR)/beam_tr_funcs.h \
 	: $(TTF_DIR)/OPCODES-GENERATED
 $(TTF_DIR)/OPCODES-GENERATED: $(OPCODE_TABLES) utils/beam_makeops
-	LANG=C $(PERL) utils/beam_makeops \
+	$(gen_verbose)LANG=C $(PERL) utils/beam_makeops \
 		-wordsize @EXTERNAL_WORD_SIZE@ \
 		-outdir $(TTF_DIR) \
 		-DUSE_VM_PROBES=$(if $(USE_VM_PROBES),1,0) \
@@ -525,22 +525,22 @@ $(TARGET)/erl_atom_table.h \
 $(TARGET)/erl_pbifs.c \
 	: $(TARGET)/TABLES-GENERATED
 $(TARGET)/TABLES-GENERATED: $(ATOMS) $(BIFS) utils/make_tables
-	LANG=C $(PERL) utils/make_tables -src $(TARGET) -include $(TARGET)\
+	$(gen_verbose)LANG=C $(PERL) utils/make_tables -src $(TARGET) -include $(TARGET)\
 		$(ATOMS) $(BIFS) && echo $? >$(TARGET)/TABLES-GENERATED
 GENERATE += $(TARGET)/TABLES-GENERATED
 
 $(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)
+	$(gen_verbose)LANG=C $(PERL) utils/make_alloc_types -src $< -dst $@ $(ENABLE_ALLOC_TYPE_VARS)
 GENERATE += $(TTF_DIR)/erl_alloc_types.h
 
 # version include file
 $(TARGET)/erl_version.h: ../vsn.mk
-	LANG=C $(PERL) utils/make_version -o $@ $(SYSTEM_VSN) $(VSN)$(SERIALNO) $(TARGET)
+	$(gen_verbose)LANG=C $(PERL) utils/make_version -o $@ $(SYSTEM_VSN) $(VSN)$(SERIALNO) $(TARGET)
 GENERATE += $(TARGET)/erl_version.h
 
 # driver table
 $(TTF_DIR)/driver_tab.c: Makefile.in
-	LANG=C $(PERL) utils/make_driver_tab -o $@ $(DRV_OBJS)
+	$(gen_verbose)LANG=C $(PERL) utils/make_driver_tab -o $@ $(DRV_OBJS)
 GENERATE += $(TTF_DIR)/driver_tab.c
 
 
@@ -562,7 +562,7 @@ $(PRELOAD_SRC): $(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erl_prim_loader.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erlang.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erts_internal.beam
-	LANG=C $(PERL) utils/make_preload $(MAKE_PRELOAD_EXTRA) -rc $^ > $@
+	$(gen_verbose)LANG=C $(PERL) utils/make_preload $(MAKE_PRELOAD_EXTRA) -rc $^ > $@
 else
 PRELOAD_OBJ = $(OBJDIR)/preload.o
 PRELOAD_SRC = $(TARGET)/preload.c
@@ -575,7 +575,7 @@ $(PRELOAD_SRC): $(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erl_prim_loader.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erlang.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erts_internal.beam
-	LANG=C $(PERL) utils/make_preload -old $^ > $@
+	$(gen_verbose)LANG=C $(PERL) utils/make_preload -old $^ > $@
 endif
 
 .PHONY : generate
@@ -586,13 +586,13 @@ else
 generate: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
 
 $(TTF_DIR)/GENERATED: $(GENERATE)
-	echo $? >$(TTF_DIR)/GENERATED
+	$(gen_verbose)echo $? >$(TTF_DIR)/GENERATED
 endif
 
 $(TARGET)/erlang_dtrace.h: beam/erlang_dtrace.d
-	dtrace -h -C -Ibeam -s $< -o ./erlang_dtrace.tmp
-	sed -e '/^#define[ 	]*ERLANG_[A-Z0-9_]*(.*)/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ./erlang_dtrace.tmp > $@
-	rm ./erlang_dtrace.tmp
+	$(dtrace_verbose)dtrace -h -C -Ibeam -s $< -o ./erlang_dtrace.tmp
+	$(V_at)sed -e '/^#define[ 	]*ERLANG_[A-Z0-9_]*(.*)/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ./erlang_dtrace.tmp > $@
+	$(V_at)rm ./erlang_dtrace.tmp
 
 # ----------------------------------------------------------------------
 # Pattern rules
@@ -613,45 +613,45 @@ endif
 
 ifeq ($(TARGET),win32)
 $(OBJDIR)/dll_sys.o: sys/$(ERLANG_OSTYPE)/sys.c
-	$(CC) $(CFLAGS) -DERL_RUN_SHARED_LIB=1 $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) -DERL_RUN_SHARED_LIB=1 $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/beams.$(RES_EXT): $(TARGET)/beams.rc
-	$(RC) -o $@  -I$(ERL_TOP)/erts/etc/win32 $(TARGET)/beams.rc 
+	$(V_RC) -o $@  -I$(ERL_TOP)/erts/etc/win32 $(TARGET)/beams.rc
 
 endif
 
 ifneq ($(filter tile-%,$(TARGET)),)
 $(OBJDIR)/beam_emu.o: beam/beam_emu.c
-	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) \
+	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) \
          -OPT:Olimit=0 -WOPT:lpre=off:spre=off:epre=off \
          $(INCLUDES) -c $< -o $@
 else
 # Usually the same as the default rule, but certain platforms (e.g. win32) mix
 # different compilers
 $(OBJDIR)/beam_emu.o: beam/beam_emu.c
-	$(EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 endif
 
 $(OBJDIR)/%.o: beam/%.c
-	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: $(TARGET)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
 
 $(OBJDIR)/%.o: $(TTF_DIR)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: sys/$(ERLANG_OSTYPE)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: sys/common/%.c
-	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: drivers/common/%.c
-	$(CC) $(CFLAGS) -DLIBSCTP=$(LIBSCTP) $(INCLUDES) -Idrivers/common -Idrivers/$(ERLANG_OSTYPE) -c $< -o $@
+	$(V_CC) $(CFLAGS) -DLIBSCTP=$(LIBSCTP) $(INCLUDES) -Idrivers/common -Idrivers/$(ERLANG_OSTYPE) -c $< -o $@
 
 $(OBJDIR)/%.o: drivers/$(ERLANG_OSTYPE)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -Idrivers/$(ERLANG_OSTYPE) -I../etc/$(ERLANG_OSTYPE) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -Idrivers/$(ERLANG_OSTYPE) -I../etc/$(ERLANG_OSTYPE) -c $< -o $@
 
 # ----------------------------------------------------------------------
 # Specials
@@ -659,19 +659,19 @@ $(OBJDIR)/%.o: drivers/$(ERLANG_OSTYPE)/%.c
 CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c
 
 $(BINDIR)/$(CS_EXECUTABLE): $(TTF_DIR)/GENERATED $(PRELOAD_SRC) $(CS_SRC) $(ERTS_LIB)
-	$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
+	$(ld_verbose)$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
                $(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)
 
 $(OBJDIR)/%.kp.o: sys/common/%.c
-	$(CC) -DERTS_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) -DERTS_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.nkp.o: sys/common/%.c
-	$(CC) -DERTS_NO_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) -DERTS_NO_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
 ifeq ($(GCC),yes)
 
 $(OBJDIR)/erl_goodfit_alloc.o: beam/erl_goodfit_alloc.c
-	$(CC) $(subst -O2, $(GEN_OPT_FLGS) $(UNROLL_FLG), $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS) $(UNROLL_FLG), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 endif
 
 # ----------------------------------------------------------------------
@@ -844,28 +844,28 @@ $(OBJS): $(TTF_DIR)/GENERATED
 M4FLAGS += -DTARGET=$(TARGET) -DOPSYS=$(OPSYS) -DARCH=$(ARCH)
 
 $(TTF_DIR)/%.S: hipe/%.m4
-	m4 $(M4FLAGS) $< > $@
+	$(m4_verbose)m4 $(M4FLAGS) $< > $@
 
 $(TTF_DIR)/%.h: hipe/%.m4
-	m4 $(M4FLAGS) $< > $@
+	$(m4_verbose)m4 $(M4FLAGS) $< > $@
 
 $(OBJDIR)/%.o: $(TTF_DIR)/%.S
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: hipe/%.S
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJDIR)/%.o: hipe/%.c
-	$(CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
 $(BINDIR)/hipe_mkliterals$(TF_MARKER):	$(OBJDIR)/hipe_mkliterals.o
-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
+	$(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
 
 $(OBJDIR)/hipe_mkliterals.o:	$(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h \
 	$(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED
 
 $(TTF_DIR)/hipe_literals.h:	$(BINDIR)/hipe_mkliterals$(TF_MARKER)
-	$(BINDIR)/hipe_mkliterals$(TF_MARKER) -c > $@
+	$(gen_verbose)$(BINDIR)/hipe_mkliterals$(TF_MARKER) -c > $@
 
 $(OBJDIR)/hipe_x86_glue.o:	hipe/hipe_x86_glue.S \
 	$(TTF_DIR)/hipe_x86_asm.h $(TTF_DIR)/hipe_literals.h \
@@ -908,7 +908,7 @@ $(OBJDIR)/hipe_arm_bifs.o:	$(TTF_DIR)/hipe_arm_bifs.S \
 # Use -fomit-frame-pointer to work around gcc (v4.5.2) bug causing
 # "error: r7 cannot be used in asm here" for DEBUG build.
 $(OBJDIR)/hipe_arm.o:           hipe/hipe_arm.c
-	$(CC) $(subst O2,O3, $(CFLAGS)) -fomit-frame-pointer $(INCLUDES) -c $< -o $@
+	$(V_CC) $(subst O2,O3, $(CFLAGS)) -fomit-frame-pointer $(INCLUDES) -c $< -o $@
 
 # end of HiPE section
 ########################################
@@ -919,13 +919,13 @@ $(OBJDIR)/hipe_arm.o:           hipe/hipe_arm.c
 ifeq ($(TARGET), win32)
 # Only the basic erlang to begin with eh?
 $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS)
-	$(PURIFY) $(LD) -dll -def:sys/$(ERLANG_OSTYPE)/erl.def -implib:$(BINDIR)/erl_dll.lib -o $(BINDIR)/$(EMULATOR_EXECUTABLE) \
+	$(ld_verbose)$(PURIFY) $(LD) -dll -def:sys/$(ERLANG_OSTYPE)/erl.def -implib:$(BINDIR)/erl_dll.lib -o $(BINDIR)/$(EMULATOR_EXECUTABLE) \
 	$(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS) $(LIBS)
 else
 
 
 $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS)
-	$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE) \
+	$(ld_verbose)$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE) \
 	$(HIPEBEAMLDFLAGS) $(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS) $(LIBS)
 
 endif
@@ -1013,23 +1013,24 @@ depend:
 else
 depend: $(TTF_DIR)/depend.mk
 $(TTF_DIR)/depend.mk: $(TTF_DIR)/GENERATED $(PRELOAD_SRC)
-	$(DEP_CC) $(DEP_FLAGS) $(BEAM_SRC) \
+	$(gen_verbose)
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(BEAM_SRC) \
 		| $(SED_DEPEND) > $(TTF_DIR)/depend.mk
-	$(DEP_CC) $(DEP_FLAGS) -DLIBSCTP=$(LIBSCTP) $(DRV_COMMON_SRC) \
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) -DLIBSCTP=$(LIBSCTP) $(DRV_COMMON_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
-	$(DEP_CC) $(DEP_FLAGS) -I../etc/$(ERLANG_OSTYPE) $(DRV_OSTYPE_SRC) \
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) -I../etc/$(ERLANG_OSTYPE) $(DRV_OSTYPE_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
-	$(DEP_CC) $(DEP_FLAGS) $(SYS_SRC) \
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(SYS_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
-	$(DEP_CC) $(DEP_FLAGS) $(TARGET_SRC) \
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(TARGET_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
-	$(DEP_CC) $(DEP_FLAGS) $(ZLIB_SRC) \
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(ZLIB_SRC) \
 		| $(SED_DEPEND_ZLIB) >> $(TTF_DIR)/depend.mk
 ifdef HIPE_ENABLED
-	$(DEP_CC) $(DEP_FLAGS) $(HIPE_SRC) \
+	$(V_at)$(DEP_CC) $(DEP_FLAGS) $(HIPE_SRC) \
 		| $(SED_DEPEND) >> $(TTF_DIR)/depend.mk
 endif
-	cd $(ERTS_LIB_DIR) && $(MAKE) depend
+	$(V_at)cd $(ERTS_LIB_DIR) && $(MAKE) depend
 endif
 
 ifneq ($(MAKECMDGOALS),clean)
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index 2168d410b5..c1e11f6448 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -65,10 +65,10 @@
 
 #define ERTS_BPF_ALL               0xFF
 
-extern Eterm beam_return_to_trace[1];   /* OpCode(i_return_to_trace) */
-extern Eterm beam_return_trace[1];      /* OpCode(i_return_trace) */
-extern Eterm beam_exception_trace[1];   /* OpCode(i_exception_trace) */
-extern Eterm beam_return_time_trace[1]; /* OpCode(i_return_time_trace) */
+extern BeamInstr beam_return_to_trace[1];   /* OpCode(i_return_to_trace) */
+extern BeamInstr beam_return_trace[1];      /* OpCode(i_return_trace) */
+extern BeamInstr beam_exception_trace[1];   /* OpCode(i_exception_trace) */
+extern BeamInstr beam_return_time_trace[1]; /* OpCode(i_return_time_trace) */
 
 erts_smp_atomic32_t erts_active_bp_index;
 erts_smp_atomic32_t erts_staging_bp_index;
@@ -161,7 +161,7 @@ erts_bp_match_functions(BpFunctions* f, Eterm mfa[3], int specified)
     for (current = 0; current < num_modules; current++) {
 	BeamInstr** code_base = (BeamInstr **) module[current]->curr.code;
 	BeamInstr* code;
-	Uint num_functions = (Uint) code_base[MI_NUM_FUNCTIONS];
+	Uint num_functions = (Uint)(UWord) code_base[MI_NUM_FUNCTIONS];
 	Uint fi;
 
 	if (specified > 0) {
@@ -172,7 +172,7 @@ erts_bp_match_functions(BpFunctions* f, Eterm mfa[3], int specified)
 	}
 
 	for (fi = 0; fi < num_functions; fi++) {
-	    Eterm* pc;
+	    BeamInstr* pc;
 	    int wi;
 
 	    code = code_base[MI_FUNCTIONS+fi];
@@ -555,7 +555,7 @@ erts_clear_module_break(Module *modp) {
     if (code_base == NULL) {
 	return 0;
     }
-    n = (Uint) code_base[MI_NUM_FUNCTIONS];
+    n = (Uint)(UWord) code_base[MI_NUM_FUNCTIONS];
     for (i = 0; i < n; ++i) {
 	BeamInstr* pc;
 
@@ -919,7 +919,7 @@ do_call_trace(Process* c_p, BeamInstr* I, Eterm* reg,
 	E -= 1;
 	ASSERT(c_p->htop <= E && E <= c_p->hend);
 	E[0] = make_cp(c_p->cp);
-	c_p->cp = (BeamInstr *) beam_return_to_trace;
+	c_p->cp = beam_return_to_trace;
     }
     if (flags & MATCH_SET_RX_TRACE) {
 	E -= 3;
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 98dc9a3902..97c8114437 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -2421,9 +2421,7 @@ BIF_RETTYPE setelement_3(BIF_ALIST_3)
 
     /* copy the tuple */
     resp = hp;
-    while (size--) {		/* XXX use memcpy? */
-	*hp++ = *ptr++;
-    }
+    sys_memcpy(hp, ptr, sizeof(Eterm)*size);
     resp[ix] = BIF_ARG_3;
     BIF_RET(make_tuple(resp));
 }
@@ -2436,7 +2434,7 @@ BIF_RETTYPE make_tuple_2(BIF_ALIST_2)
     Eterm* hp;
     Eterm res;
 
-    if (is_not_small(BIF_ARG_1) || (n = signed_val(BIF_ARG_1)) < 0) {
+    if (is_not_small(BIF_ARG_1) || (n = signed_val(BIF_ARG_1)) < 0 || n > ERTS_MAX_TUPLE_SIZE) {
 	BIF_ERROR(BIF_P, BADARG);
     }
     hp = HAlloc(BIF_P, n+1);
@@ -2457,7 +2455,7 @@ BIF_RETTYPE make_tuple_3(BIF_ALIST_3)
     Eterm list = BIF_ARG_3;
     Eterm* tup;
 
-    if (is_not_small(BIF_ARG_1) || (n = signed_val(BIF_ARG_1)) < 0) {
+    if (is_not_small(BIF_ARG_1) || (n = signed_val(BIF_ARG_1)) < 0 || n > ERTS_MAX_TUPLE_SIZE) {
     error:
 	BIF_ERROR(BIF_P, BADARG);
     }
@@ -2509,11 +2507,16 @@ BIF_RETTYPE append_element_2(BIF_ALIST_2)
     Eterm res;
 
     if (is_not_tuple(BIF_ARG_1)) {
+    error:
 	BIF_ERROR(BIF_P, BADARG);
     }
-    ptr = tuple_val(BIF_ARG_1);
+    ptr   = tuple_val(BIF_ARG_1);
     arity = arityval(*ptr);
-    hp = HAlloc(BIF_P, arity + 2);
+
+    if (arity + 1 > ERTS_MAX_TUPLE_SIZE)
+	goto error;
+
+    hp  = HAlloc(BIF_P, arity + 2);
     res = make_tuple(hp);
     *hp = make_arityval(arity+1);
     while (arity--) {
@@ -2523,6 +2526,78 @@ BIF_RETTYPE append_element_2(BIF_ALIST_2)
     BIF_RET(res);
 }
 
+BIF_RETTYPE insert_element_3(BIF_ALIST_3)
+{
+    Eterm* ptr;
+    Eterm* hp;
+    Uint arity;
+    Eterm res;
+    Sint ix;
+
+    if (is_not_tuple(BIF_ARG_2) || is_not_small(BIF_ARG_1)) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+
+    ptr   = tuple_val(BIF_ARG_2);
+    arity = arityval(*ptr);
+    ix    = signed_val(BIF_ARG_1);
+
+    if ((ix < 1) || (ix > (arity + 1))) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+
+    hp  = HAlloc(BIF_P, arity + 1 + 1);
+    res = make_tuple(hp);
+    *hp = make_arityval(arity + 1);
+
+    ix--;
+    arity -= ix;
+
+    while (ix--) { *++hp = *++ptr; }
+
+    *++hp = BIF_ARG_3;
+
+    while(arity--) { *++hp = *++ptr; }
+
+    BIF_RET(res);
+}
+
+BIF_RETTYPE delete_element_2(BIF_ALIST_3)
+{
+    Eterm* ptr;
+    Eterm* hp;
+    Uint arity;
+    Eterm res;
+    Sint ix;
+
+    if (is_not_tuple(BIF_ARG_2) || is_not_small(BIF_ARG_1)) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+
+    ptr   = tuple_val(BIF_ARG_2);
+    arity = arityval(*ptr);
+    ix    = signed_val(BIF_ARG_1);
+
+    if ((ix < 1) || (ix > arity) || (arity == 0)) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+
+    hp  = HAlloc(BIF_P, arity + 1 - 1);
+    res = make_tuple(hp);
+    *hp = make_arityval(arity - 1);
+
+    ix--;
+    arity -= ix;
+
+    while (ix--) { *++hp = *++ptr; }
+
+    ++ptr;
+
+    while(arity--) { *++hp = *++ptr; }
+
+    BIF_RET(res);
+}
+
 /**********************************************************************/
 
 /* convert an atom to a list of ascii integer */
@@ -3097,7 +3172,7 @@ BIF_RETTYPE list_to_tuple_1(BIF_ALIST_1)
     Eterm* hp;
     int len;
 
-    if ((len = list_length(list)) < 0) {
+    if ((len = list_length(list)) < 0 || len > ERTS_MAX_TUPLE_SIZE) {
 	BIF_ERROR(BIF_P, BADARG);
     }
 
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 9a1a25031c..59a91cd40c 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -31,219 +31,116 @@
 #
 # Important: Use "ubif" for guard BIFs and operators; use "bif" for ordinary BIFs.
 #
-# Add new BIFs to the end of the file. Do not bother adding a "packaged BIF name"
-# (such as 'erl.lang.number'); if/when packages will be supported we will add
-# all those names.
+# Add new BIFs to the end of the file.
 #
 # Note: Guards BIFs require special support in the compiler (to be able to actually
 # call them from within a guard).
 #
 
 ubif erlang:abs/1
-ubif 'erl.lang.number':abs/1		ebif_abs_1
 bif erlang:adler32/1
-bif 'erl.util.crypt.adler32':sum/1	ebif_adler32_1
 bif erlang:adler32/2
-bif 'erl.util.crypt.adler32':sum/2	ebif_adler32_2
 bif erlang:adler32_combine/3
-bif 'erl.util.crypt.adler32':combine/3	ebif_adler32_combine_3
 bif erlang:apply/3
-bif 'erl.lang':apply/3			ebif_apply_3
 bif erlang:atom_to_list/1
-bif 'erl.lang.atom':to_string/1		ebif_atom_to_string_1 atom_to_list_1
 bif erlang:binary_to_list/1
-bif 'erl.lang.binary':to_list/1		ebif_binary_to_list_1
 bif erlang:binary_to_list/3
-bif 'erl.lang.binary':to_list/3		ebif_binary_to_list_3
 bif erlang:binary_to_term/1	
-bif 'erl.lang.binary':to_term/1		ebif_binary_to_term_1
 bif erlang:check_process_code/2
-bif 'erl.system.code':check_process/2	ebif_check_process_code_2
 bif erlang:crc32/1
-bif 'erl.util.crypt.crc32':sum/1	ebif_crc32_1
 bif erlang:crc32/2
-bif 'erl.util.crypt.crc32':sum/2	ebif_crc32_2
 bif erlang:crc32_combine/3
-bif 'erl.util.crypt.crc32':combine/3	ebif_crc32_combine_3
 bif erlang:date/0
-bif 'erl.util.date':today/0		ebif_date_0
 bif erlang:delete_module/1
-bif 'erl.system.code':delete/1		ebif_delete_module_1
 bif erlang:display/1
-bif 'erl.system.debug':display/1	ebif_display_1
 bif erlang:display_string/1
-bif 'erl.system.debug':display_string/1	ebif_display_string_1
 bif erlang:display_nl/0
-bif 'erl.system.debug':display_nl/0	ebif_display_nl_0
 ubif erlang:element/2
-ubif 'erl.lang.tuple':element/2		ebif_element_2
 bif erlang:erase/0
-bif 'erl.lang.proc.pdict':erase/0	ebif_erase_0
 bif erlang:erase/1
-bif 'erl.lang.proc.pdict':erase/1	ebif_erase_1
 bif erlang:exit/1
-bif 'erl.lang':exit/1			ebif_exit_1
 bif erlang:exit/2
-bif 'erl.lang.proc':signal/2		ebif_signal_2 exit_2
 bif erlang:external_size/1
-bif 'erl.lang.term':external_size/1	ebif_external_size_1
 bif erlang:external_size/2
-bif 'erl.lang.term':external_size/2	ebif_external_size_2
 ubif erlang:float/1
-ubif 'erl.lang.number':to_float/1	ebif_to_float_1 float_1
 bif erlang:float_to_list/1
-bif 'erl.lang.float':to_string/1	ebif_float_to_string_1 float_to_list_1
 bif erlang:fun_info/2
-bif 'erl.lang.function':info/2		ebif_fun_info_2
 bif erlang:garbage_collect/0
-bif 'erl.system':garbage_collect/0	ebif_garbage_collect_0
 bif erlang:garbage_collect/1
-bif 'erl.system':garbage_collect/1	ebif_garbage_collect_1
 bif erlang:get/0
-bif 'erl.lang.proc.pdict':get/0		ebif_get_0
 bif erlang:get/1
-bif 'erl.lang.proc.pdict':get/1		ebif_get_1
 bif erlang:get_keys/1
-bif 'erl.lang.proc.pdict':get_keys/1	ebif_get_keys_1
 bif erlang:group_leader/0
-bif 'erl.lang.proc':group_leader/0	ebif_group_leader_0
 bif erlang:group_leader/2
-bif 'erl.lang.proc':set_group_leader/2	ebif_group_leader_2
 bif erlang:halt/0
-bif 'erl.lang.system':halt/0		ebif_halt_0
 bif erlang:halt/1
-bif 'erl.lang.system':halt/1		ebif_halt_1
 bif erlang:halt/2
-bif 'erl.lang.system':halt/2		ebif_halt_2
 bif erlang:phash/2
 bif erlang:phash2/1
 bif erlang:phash2/2
-bif 'erl.lang.term':hash/1		ebif_phash2_1
-bif 'erl.lang.term':hash/2		ebif_phash2_2
 ubif erlang:hd/1
-ubif 'erl.lang.list':hd/1		ebif_hd_1
 bif erlang:integer_to_list/1
-bif 'erl.lang.integer':to_string/1	ebif_integer_to_string_1 integer_to_list_1
 bif erlang:is_alive/0
-bif 'erl.lang.node':is_alive/0		ebif_is_alive_0
 ubif erlang:length/1
-ubif 'erl.lang.list':length/1		ebif_length_1
 bif erlang:link/1
-bif 'erl.lang.proc':link/1		ebif_link_1
 bif erlang:list_to_atom/1
-bif 'erl.lang.atom':from_string/1	ebif_string_to_atom_1 list_to_atom_1
 bif erlang:list_to_binary/1
-bif 'erl.lang.binary':from_list/1	ebif_list_to_binary_1
 bif erlang:list_to_float/1
-bif 'erl.lang.float':from_string/1	ebif_string_to_float_1 list_to_float_1
 bif erlang:list_to_integer/1
-bif 'erl.lang.integer':from_string/1	ebif_string_to_integer_1 list_to_integer_1
 bif erlang:list_to_pid/1
-bif 'erl.lang.proc':string_to_pid/1	ebif_string_to_pid_1 list_to_pid_1
 bif erlang:list_to_tuple/1
-bif 'erl.lang.tuple':from_list/1	ebif_list_to_tuple_1
 bif erlang:loaded/0
-bif 'erl.system.code':loaded/0		ebif_loaded_0
 bif erlang:localtime/0
-bif 'erl.util.date':local/0		ebif_localtime_0
 bif erlang:localtime_to_universaltime/2
-bif 'erl.util.date':local_to_utc/2	ebif_localtime_to_universaltime_2
 bif erlang:make_ref/0
-bif 'erl.lang.ref':new/0		ebif_make_ref_0
 bif erlang:md5/1
-bif 'erl.util.crypt.md5':digest/1	ebif_md5_1
 bif erlang:md5_init/0
-bif 'erl.util.crypt.md5':init/0		ebif_md5_init_0
 bif erlang:md5_update/2
-bif 'erl.util.crypt.md5':update/2	ebif_md5_update_2
 bif erlang:md5_final/1
-bif 'erl.util.crypt.md5':final/1	ebif_md5_final_1
 bif erlang:module_loaded/1
-bif 'erl.system.code':is_loaded/1	ebif_is_loaded_1 module_loaded_1
 bif erlang:function_exported/3
-bif 'erl.system.code':is_loaded/3	ebif_is_loaded_3 function_exported_3
 bif erlang:monitor_node/2
-bif 'erl.lang.node':monitor/2		ebif_monitor_node_2
 bif erlang:monitor_node/3
-bif 'erl.lang.node':monitor/3		ebif_monitor_node_3
 ubif erlang:node/1
-ubif 'erl.lang.node':node/1		ebif_node_1
 ubif erlang:node/0
-ubif 'erl.lang.node':node/0		ebif_node_0
 bif erlang:nodes/1
-bif 'erl.lang.node':nodes/1		ebif_nodes_1
 bif erlang:now/0
-bif 'erl.system':now/0		ebif_now_0
 
 bif erlang:open_port/2
-bif 'erl.lang.port':open/2		ebif_open_port_2 open_port_2
 
 bif erlang:pid_to_list/1
-bif 'erl.lang.proc':pid_to_string/1	ebif_pid_to_string_1 pid_to_list_1
 bif erlang:ports/0
-bif 'erl.lang.node':ports/0		ebif_ports_0
 bif erlang:pre_loaded/0
-bif 'erl.system.code':preloaded/0	ebif_pre_loaded_0
 bif erlang:process_flag/2
-bif 'erl.lang.proc':set_flag/2		ebif_process_flag_2
 bif erlang:process_flag/3
-bif 'erl.lang.proc':set_flag/3		ebif_process_flag_3
 bif erlang:process_info/1
-bif 'erl.lang.proc':info/1		ebif_process_info_1
 bif erlang:process_info/2
-bif 'erl.lang.proc':info/2		ebif_process_info_2
 bif erlang:processes/0
-bif 'erl.lang.node':processes/0		ebif_processes_0
 bif erlang:purge_module/1
-bif 'erl.system.code':purge/1		ebif_purge_module_1
 bif erlang:put/2
-bif 'erl.lang.proc.pdict':put/2		ebif_put_2
 bif erlang:register/2
-bif 'erl.lang.node':register/2		ebif_register_2
 bif erlang:registered/0
-bif 'erl.lang.node':registered/0	ebif_registered_0
 ubif erlang:round/1
-ubif 'erl.lang.number':round/1		ebif_round_1
 ubif erlang:self/0
-ubif 'erl.lang.proc':self/0		ebif_self_0
 bif erlang:setelement/3
-bif 'erl.lang.tuple':setelement/3	ebif_setelement_3
 ubif erlang:size/1
-ubif 'erl.lang.term':size/1		ebif_size_1
 bif erlang:spawn/3
-bif 'erl.lang.proc':spawn/3		ebif_spawn_3
 bif erlang:spawn_link/3
-bif 'erl.lang.proc':spawn_link/3	ebif_spawn_link_3
 bif erlang:split_binary/2
-bif 'erl.lang.binary':split/2		ebif_split_binary_2
 bif erlang:statistics/1
-bif 'erl.system':statistics/1		ebif_statistics_1
 bif erlang:term_to_binary/1
-bif 'erl.lang.binary':from_term/1	ebif_term_to_binary_1
 bif erlang:term_to_binary/2
-bif 'erl.lang.binary':from_term/2	ebif_term_to_binary_2
 bif erlang:throw/1
-bif 'erl.lang':throw/1			ebif_throw_1
 bif erlang:time/0
-bif 'erl.util.date':time_of_day/0	ebif_time_0
 ubif erlang:tl/1
-ubif 'erl.lang.list':tl/1		ebif_tl_1
 ubif erlang:trunc/1
-ubif 'erl.lang.number':trunc/1		ebif_trunc_1
 bif erlang:tuple_to_list/1
-bif 'erl.lang.tuple':to_list/1		ebif_tuple_to_list_1
 bif erlang:universaltime/0
-bif 'erl.util.date':utc/0		ebif_universaltime_0
 bif erlang:universaltime_to_localtime/1
-bif 'erl.util.date':utc_to_local/1	ebif_universaltime_to_localtime_1
 bif erlang:unlink/1
-bif 'erl.lang.proc':unlink/1		ebif_unlink_1
 bif erlang:unregister/1
-bif 'erl.lang.node':unregister/1	ebif_unregister_1
 bif erlang:whereis/1
-bif 'erl.lang.node':whereis/1		ebif_whereis_1
 bif erlang:spawn_opt/1
-bif 'erl.lang.proc':spawn_opt/1		ebif_spawn_opt_1
 bif erlang:setnode/2
 bif erlang:setnode/3
 bif erlang:dist_exit/3
@@ -261,190 +158,106 @@ bif erts_internal:port_get_data/1
 
 # Tracing & debugging.
 bif erlang:trace_pattern/2
-bif 'erl.system.debug':trace_pattern/2	ebif_trace_pattern_2
 bif erlang:trace_pattern/3
-bif 'erl.system.debug':trace_pattern/3	ebif_trace_pattern_3
 bif erlang:trace/3
-bif 'erl.system.debug':trace/3		ebif_trace_3
 bif erlang:trace_info/2
-bif 'erl.system.debug':trace_info/2	ebif_trace_info_2
 bif erlang:trace_delivered/1
-bif 'erl.system.debug':trace_delivered/1	ebif_trace_delivered_1
 bif erlang:seq_trace/2
-bif 'erl.system.debug':seq_trace/2	ebif_seq_trace_2
 bif erlang:seq_trace_info/1
-bif 'erl.system.debug':seq_trace_info/1		ebif_seq_trace_info_1
 bif erlang:seq_trace_print/1
-bif 'erl.system.debug':seq_trace_print/1	ebif_seq_trace_print_1
 bif erlang:seq_trace_print/2
-bif 'erl.system.debug':seq_trace_print/2	ebif_seq_trace_print_2
 bif erlang:suspend_process/2
-bif 'erl.system.debug':suspend_process/2	ebif_suspend_process_2
 bif erlang:resume_process/1
-bif 'erl.system.debug':resume_process/1		ebif_resume_process_1
 bif erlang:process_display/2
-bif 'erl.system.debug':process_display/2	ebif_process_display_2
 
 bif erlang:bump_reductions/1
-bif 'erl.lang.proc':bump_reductions/1	ebif_bump_reductions_1
 
 bif math:cos/1
-bif 'erl.lang.math':cos/1		ebif_math_cos_1
 bif math:cosh/1
-bif 'erl.lang.math':cosh/1		ebif_math_cosh_1
 bif math:sin/1
-bif 'erl.lang.math':sin/1		ebif_math_sin_1
 bif math:sinh/1
-bif 'erl.lang.math':sinh/1		ebif_math_sinh_1
 bif math:tan/1
-bif 'erl.lang.math':tan/1		ebif_math_tan_1
 bif math:tanh/1
-bif 'erl.lang.math':tanh/1		ebif_math_tanh_1
 bif math:acos/1
-bif 'erl.lang.math':acos/1		ebif_math_acos_1
 bif math:acosh/1
-bif 'erl.lang.math':acosh/1		ebif_math_acosh_1
 bif math:asin/1
-bif 'erl.lang.math':asin/1		ebif_math_asin_1
 bif math:asinh/1
-bif 'erl.lang.math':asinh/1		ebif_math_asinh_1
 bif math:atan/1
-bif 'erl.lang.math':atan/1		ebif_math_atan_1
 bif math:atanh/1
-bif 'erl.lang.math':atanh/1		ebif_math_atanh_1
 bif math:erf/1
-bif 'erl.lang.math':erf/1		ebif_math_erf_1
 bif math:erfc/1
-bif 'erl.lang.math':erfc/1		ebif_math_erfc_1
 bif math:exp/1
-bif 'erl.lang.math':exp/1		ebif_math_exp_1
 bif math:log/1
-bif 'erl.lang.math':log/1		ebif_math_log_1
 bif math:log10/1
-bif 'erl.lang.math':log10/1		ebif_math_log10_1
 bif math:sqrt/1
-bif 'erl.lang.math':sqrt/1		ebif_math_sqrt_1
 bif math:atan2/2
-bif 'erl.lang.math':atan2/2		ebif_math_atan2_2
 bif math:pow/2
-bif 'erl.lang.math':pow/2		ebif_math_pow_2
 
 bif erlang:start_timer/3
-bif 'erl.lang.timer':start/3		ebif_start_timer_3
 bif erlang:send_after/3
-bif 'erl.lang.timer':send_after/3	ebif_send_after_3
 bif erlang:cancel_timer/1
-bif 'erl.lang.timer':cancel/1		ebif_cancel_timer_1
 bif erlang:read_timer/1
-bif 'erl.lang.timer':read/1		ebif_read_timer_1
 
 bif erlang:make_tuple/2
-bif 'erl.lang.tuple':make/2		ebif_make_tuple_2
 bif erlang:append_element/2
-bif 'erl.lang.tuple':append_element/2	ebif_append_element_2
 bif erlang:make_tuple/3
 
 bif erlang:system_flag/2
-bif 'erl.system':set_flag/2	ebif_system_flag_2
 bif erlang:system_info/1
-bif 'erl.system':info/1		ebif_system_info_1
 # New in R9C
 bif erlang:system_monitor/0
-bif 'erl.system':monitor/0	ebif_system_monitor_0
 bif erlang:system_monitor/1
-bif 'erl.system':monitor/1	ebif_system_monitor_1
 bif erlang:system_monitor/2
-bif 'erl.system':monitor/2	ebif_system_monitor_2
 # Added 2006-11-07
 bif erlang:system_profile/2
-bif 'erl.system':profile/2	ebif_system_profile_2
 # End Added 2006-11-07
 # Added 2007-01-17
 bif erlang:system_profile/0
-bif 'erl.system':profile/0	ebif_system_profile_0
 # End Added 2007-01-17
 bif erlang:ref_to_list/1
-bif 'erl.lang.ref':to_string/1		ebif_ref_to_string_1 ref_to_list_1
 bif erlang:port_to_list/1
-bif 'erl.lang.port':to_string/1		ebif_port_to_string_1 port_to_list_1
 bif erlang:fun_to_list/1
-bif 'erl.lang.function':to_string/1	ebif_fun_to_string_1 fun_to_list_1
 
 bif erlang:monitor/2
-bif 'erl.lang.proc':monitor/2		ebif_monitor_2
 bif erlang:demonitor/1
-bif 'erl.lang.proc':demonitor/1		ebif_demonitor_1
 bif erlang:demonitor/2
-bif 'erl.lang.proc':demonitor/2		ebif_demonitor_2
 
 bif erlang:is_process_alive/1
-bif 'erl.lang.proc':is_alive/1		ebif_proc_is_alive_1 is_process_alive_1
 
 bif erlang:error/1		error_1
-bif 'erl.lang':error/1		ebif_error_1 error_1
 bif erlang:error/2		error_2
-bif 'erl.lang':error/2		ebif_error_2 error_2
 bif erlang:raise/3		raise_3
-bif 'erl.lang':raise/3		ebif_raise_3 raise_3
 bif erlang:get_stacktrace/0
-bif 'erl.lang.proc':get_stacktrace/0	ebif_get_stacktrace_0
 
 bif erlang:is_builtin/3
-bif 'erl.system.code':is_builtin/3	ebif_is_builtin_3
 
 ubif erlang:'and'/2
-ubif 'erl.lang.bool':'and'/2		ebif_and_2
 ubif erlang:'or'/2
-ubif 'erl.lang.bool':'or'/2		ebif_or_2
 ubif erlang:'xor'/2
-ubif 'erl.lang.bool':'xor'/2		ebif_xor_2
 ubif erlang:'not'/1
-ubif 'erl.lang.bool':'not'/1		ebif_not_1
 
 ubif erlang:'>'/2			sgt_2
-ubif 'erl.lang.term':greater/2		ebif_gt_2 sgt_2
 ubif erlang:'>='/2			sge_2
-ubif 'erl.lang.term':greater_or_equal/2	ebif_ge_2 sge_2
 ubif erlang:'<'/2			slt_2
-ubif 'erl.lang.term':less/2		ebif_lt_2 slt_2
 ubif erlang:'=<'/2			sle_2
-ubif 'erl.lang.term':less_or_equal/2	ebif_le_2 sle_2
 ubif erlang:'=:='/2			seq_2
-ubif 'erl.lang.term':equal/2		ebif_eq_2 seq_2
 ubif erlang:'=='/2			seqeq_2
-ubif 'erl.lang.term':arith_equal/2	ebif_areq_2 seqeq_2
 ubif erlang:'=/='/2			sneq_2
-ubif 'erl.lang.term':not_equal/2	ebif_neq_2 sneq_2
 ubif erlang:'/='/2			sneqeq_2
-ubif 'erl.lang.term':not_arith_equal/2	ebif_nareq_2 sneqeq_2
 ubif erlang:'+'/2			splus_2
-ubif 'erl.lang.number':plus/2		ebif_plus_2 splus_2
 ubif erlang:'-'/2			sminus_2
-ubif 'erl.lang.number':minus/2		ebif_minus_2 sminus_2
 ubif erlang:'*'/2			stimes_2
-ubif 'erl.lang.number':multiply/2	ebif_multiply_2 stimes_2
 ubif erlang:'/'/2			div_2
-ubif 'erl.lang.number':divide/2		ebif_divide_2 div_2
 ubif erlang:'div'/2			intdiv_2
-ubif 'erl.lang.integer':'div'/2		ebif_intdiv_2
 ubif erlang:'rem'/2
-ubif 'erl.lang.integer':'rem'/2		ebif_rem_2
 ubif erlang:'bor'/2
-ubif 'erl.lang.integer':'bor'/2		ebif_bor_2
 ubif erlang:'band'/2
-ubif 'erl.lang.integer':'band'/2	ebif_band_2
 ubif erlang:'bxor'/2
-ubif 'erl.lang.integer':'bxor'/2	ebif_bxor_2
 ubif erlang:'bsl'/2
-ubif 'erl.lang.integer':'bsl'/2		ebif_bsl_2
 ubif erlang:'bsr'/2
-ubif 'erl.lang.integer':'bsr'/2		ebif_bsr_2
 ubif erlang:'bnot'/1
-ubif 'erl.lang.integer':'bnot'/1	ebif_bnot_1
 ubif erlang:'-'/1			sminus_1
-ubif 'erl.lang.number':minus/1		ebif_minus_1 sminus_1
 ubif erlang:'+'/1			splus_1
-ubif 'erl.lang.number':plus/1		ebif_plus_1 splus_1
 
 # New operators in R8. These were the only operators missing.
 # erlang:send/2, erlang:append/2 and erlang:subtract/2 are now also
@@ -452,45 +265,27 @@ ubif 'erl.lang.number':plus/1		ebif_plus_1 splus_1
 # internal references have been updated to the new ebif_... entries.
 
 bif erlang:'!'/2		ebif_bang_2
-bif 'erl.lang.proc':send/2	ebif_send_2 send_2
 bif erlang:send/2
-bif 'erl.lang':send/3		ebif_send_3 send_3
 bif erlang:send/3
 bif erlang:'++'/2		ebif_plusplus_2
-bif 'erl.lang.list':append/2	ebif_append_2 ebif_plusplus_2
 bif erlang:append/2
 bif erlang:'--'/2		ebif_minusminus_2
-bif 'erl.lang.list':subtract/2	ebif_list_subtract_2 ebif_minusminus_2
 bif erlang:subtract/2
 
 ubif erlang:is_atom/1
-ubif 'erl.lang.term':is_atom/1		ebif_is_atom_1
 ubif erlang:is_list/1
-ubif 'erl.lang.term':is_list/1		ebif_is_list_1
 ubif erlang:is_tuple/1
-ubif 'erl.lang.term':is_tuple/1		ebif_is_tuple_1
 ubif erlang:is_float/1
-ubif 'erl.lang.term':is_float/1		ebif_is_float_1
 ubif erlang:is_integer/1
-ubif 'erl.lang.term':is_integer/1	ebif_is_integer_1
 ubif erlang:is_number/1
-ubif 'erl.lang.term':is_number/1	ebif_is_number_1
 ubif erlang:is_pid/1
-ubif 'erl.lang.term':is_pid/1		ebif_is_pid_1
 ubif erlang:is_port/1
-ubif 'erl.lang.term':is_port/1		ebif_is_port_1
 ubif erlang:is_reference/1
-ubif 'erl.lang.term':is_reference/1	ebif_is_reference_1
 ubif erlang:is_binary/1
-ubif 'erl.lang.term':is_binary/1	ebif_is_binary_1
 ubif erlang:is_function/1
-ubif 'erl.lang.term':is_function/1	ebif_is_function_1
 ubif erlang:is_function/2
-ubif 'erl.lang.term':is_function/2	ebif_is_function_2
 ubif erlang:is_record/2
-ubif 'erl.lang.term':is_record/2	ebif_is_record_2
 ubif erlang:is_record/3
-ubif 'erl.lang.term':is_record/3	ebif_is_record_3
 
 bif erlang:match_spec_test/3
 
@@ -499,96 +294,53 @@ bif erlang:match_spec_test/3
 #
 
 bif ets:all/0
-bif 'erl.lang.ets':all/0		ebif_ets_all_0
 bif ets:new/2
-bif 'erl.lang.ets':new/2		ebif_ets_new_2
 bif ets:delete/1
-bif 'erl.lang.ets':delete/1		ebif_ets_delete_1
 bif ets:delete/2
-bif 'erl.lang.ets':delete/2		ebif_ets_delete_2
 bif ets:delete_all_objects/1
-bif 'erl.lang.ets':delete_all_objects/1	ebif_ets_delete_all_objects_1
 bif ets:delete_object/2
-bif 'erl.lang.ets':delete_object/2	ebif_ets_delete_object_2
 bif ets:first/1
-bif 'erl.lang.ets':first/1		ebif_ets_first_1
 bif ets:is_compiled_ms/1
-bif 'erl.lang.ets':is_compiled_ms/1	ebif_ets_is_compiled_ms_1
 bif ets:lookup/2
-bif 'erl.lang.ets':lookup/2		ebif_ets_lookup_2
 bif ets:lookup_element/3
-bif 'erl.lang.ets':lookup_element/3	ebif_ets_lookup_element_3
 bif ets:info/1
-bif 'erl.lang.ets':info/1		ebif_ets_info_1
 bif ets:info/2
-bif 'erl.lang.ets':info/2		ebif_ets_info_2
 bif ets:last/1
-bif 'erl.lang.ets':last/1		ebif_ets_last_1
 bif ets:match/1
-bif 'erl.lang.ets':match/1		ebif_ets_match_1
 bif ets:match/2
-bif 'erl.lang.ets':match/2		ebif_ets_match_2
 bif ets:match/3
-bif 'erl.lang.ets':match/3		ebif_ets_match_3
 bif ets:match_object/1
-bif 'erl.lang.ets':match_object/1	ebif_ets_match_object_1
 bif ets:match_object/2
-bif 'erl.lang.ets':match_object/2	ebif_ets_match_object_2
 bif ets:match_object/3
-bif 'erl.lang.ets':match_object/3	ebif_ets_match_object_3
 bif ets:member/2
-bif 'erl.lang.ets':is_key/2		ebif_ets_member_2
 bif ets:next/2
-bif 'erl.lang.ets':next/2		ebif_ets_next_2
 bif ets:prev/2
-bif 'erl.lang.ets':prev/2		ebif_ets_prev_2
 bif ets:insert/2
-bif 'erl.lang.ets':insert/2		ebif_ets_insert_2
 bif ets:insert_new/2
-bif 'erl.lang.ets':insert_new/2		ebif_ets_insert_new_2
 bif ets:rename/2
-bif 'erl.lang.ets':rename/2		ebif_ets_rename_2
 bif ets:safe_fixtable/2
-bif 'erl.lang.ets':fixtable/2		ebif_ets_safe_fixtable_2
 bif ets:slot/2
-bif 'erl.lang.ets':slot/2		ebif_ets_slot_2
 bif ets:update_counter/3
-bif 'erl.lang.ets':update_counter/3	ebif_ets_update_counter_3
 bif ets:select/1
-bif 'erl.lang.ets':select/1		ebif_ets_select_1
 bif ets:select/2
-bif 'erl.lang.ets':select/2		ebif_ets_select_2
 bif ets:select/3
-bif 'erl.lang.ets':select/3		ebif_ets_select_3
 bif ets:select_count/2
-bif 'erl.lang.ets':select/2		ebif_ets_select_count_2
 bif ets:select_reverse/1
-bif 'erl.lang.ets':select_reverse/1	ebif_ets_select_reverse_1
 bif ets:select_reverse/2
-bif 'erl.lang.ets':select_reverse/2	ebif_ets_select_reverse_2
 bif ets:select_reverse/3
-bif 'erl.lang.ets':select_reverse/3	ebif_ets_select_reverse_3
 bif ets:select_delete/2
-bif 'erl.lang.ets':select_delete/2	ebif_ets_select_delete_2
 bif ets:match_spec_compile/1
-bif 'erl.lang.ets':match_spec_compile/1	ebif_ets_match_spec_compile_1
 bif ets:match_spec_run_r/3
-bif 'erl.lang.ets':match_spec_run_r/3	ebif_ets_match_spec_run_r_3
 
 #
 # Bifs in os module.
 #
 
 bif os:putenv/2
-bif 'erl.system.os':setenv/2	ebif_os_setenv_2 os_putenv_2
 bif os:getenv/0
-bif 'erl.system.os':getenv/0	ebif_os_getenv_0
 bif os:getenv/1
-bif 'erl.system.os':getenv/1	ebif_os_getenv_1
 bif os:getpid/0
-bif 'erl.system.os':pid/0	ebif_os_pid_0 os_getpid_0
 bif os:timestamp/0
-bif 'erl.system.os':timestamp/0	ebif_os_timestamp_0 os_timestamp_0
 
 #
 # Bifs in the erl_ddll module (the module actually does not exist)
@@ -615,13 +367,9 @@ bif re:run/3
 #
 
 bif lists:member/2
-bif 'erl.lang.list':is_element/2	ebif_list_is_element_2 lists_member_2
 bif lists:reverse/2
-bif 'erl.lang.list':reverse/2		ebif_list_reverse_2 lists_reverse_2
 bif lists:keymember/3
-bif 'erl.lang.list.keylist':is_element/3 ebif_keylist_is_element_3 lists_keymember_3
 bif lists:keysearch/3
-bif 'erl.lang.list.keylist':search/3	ebif_keylist_search_3 lists_keysearch_3
 bif lists:keyfind/3
 
 #
@@ -629,21 +377,13 @@ bif lists:keyfind/3
 #
 
 bif erts_debug:disassemble/1
-bif 'erl.system.debug':disassemble/1	ebif_erts_debug_disassemble_1
 bif erts_debug:breakpoint/2
-bif 'erl.system.debug':breakpoint/2	ebif_erts_debug_breakpoint_2
 bif erts_debug:same/2
-bif 'erl.system.debug':same/2		ebif_erts_debug_same_2
 bif erts_debug:flat_size/1
-bif 'erl.system.debug':flat_size/1	ebif_erts_debug_flat_size_1
 bif erts_debug:get_internal_state/1
-bif 'erl.system.debug':get_internal_state/1 ebif_erts_debug_get_internal_state_1
 bif erts_debug:set_internal_state/2
-bif 'erl.system.debug':set_internal_state/2 ebif_erts_debug_set_internal_state_2
 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
 
 #
@@ -663,13 +403,9 @@ bif erts_debug:lock_counters/1
 #
 
 bif code:get_chunk/2
-bif 'erl.system.code':get_chunk/2	ebif_code_get_chunk_2
 bif code:module_md5/1
-bif 'erl.system.code':module_md5/1	ebif_code_module_md5_1
 bif code:make_stub_module/3
-bif 'erl.system.code':make_stub_module/3	ebif_code_make_stub_module_3
 bif code:is_module_native/1
-bif 'erl.system.code':is_native/1	ebif_code_is_native_1 code_is_module_native_1
 
 #
 # New Bifs in R9C.
@@ -821,6 +557,8 @@ bif erlang:dt_append_vm_tag_data/1
 #
 bif erlang:prepare_loading/2
 bif erlang:finish_loading/1
+bif erlang:insert_element/3
+bif erlang:delete_element/2
 
 #
 # Obsolete
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index f169a1a34a..64cd93a100 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -67,7 +67,7 @@ dist_msg_dbg(ErtsDistExternal *edep, char *what, byte *buf, int sz)
 {
     byte *extp = edep->extp;
     Eterm msg;
-    Sint size = erts_decode_dist_ext_size(edep, 0);
+    Sint size = erts_decode_dist_ext_size(edep);
     if (size < 0) {
 	erts_fprintf(stderr,
 		     "DIST MSG DEBUG: erts_decode_dist_ext_size(%s) failed:\n",
diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c
index 570cc59be2..306b32691c 100644
--- a/erts/emulator/beam/erl_afit_alloc.c
+++ b/erts/emulator/beam/erl_afit_alloc.c
@@ -37,6 +37,12 @@
 #define GET_ERL_AF_ALLOC_IMPL
 #include "erl_afit_alloc.h"
 
+struct AFFreeBlock_t_ {
+    Block_t block_head;
+    AFFreeBlock_t *prev;
+    AFFreeBlock_t *next;
+};
+#define AF_BLK_SZ(B) MBC_FBLK_SZ(&(B)->block_head)
 
 #define MIN_MBC_SZ		(16*1024)
 #define MIN_MBC_FIRST_FREE_SZ	(4*1024)
@@ -80,7 +86,6 @@ erts_afalc_start(AFAllctr_t *afallctr,
 
     init->sbmbct = 0; /* Small mbc not supported by afit */
 
-    allctr->mbc_header_size		= sizeof(Carrier_t);
     allctr->min_mbc_size		= MIN_MBC_SZ;
     allctr->min_mbc_first_free_size	= MIN_MBC_FIRST_FREE_SZ;
     allctr->min_block_size		= sizeof(AFFreeBlock_t);
@@ -118,7 +123,7 @@ get_free_block(Allctr_t *allctr, Uint size, Block_t *cand_blk, Uint cand_size,
 
     ASSERT(!cand_blk || cand_size >= size);
 
-    if (afallctr->free_list && BLK_SZ(afallctr->free_list) >= size) {
+    if (afallctr->free_list && AF_BLK_SZ(afallctr->free_list) >= size) {
 	AFFreeBlock_t *res = afallctr->free_list;	
 	afallctr->free_list = res->next;
 	if (res->next)
@@ -135,7 +140,7 @@ link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
     AFFreeBlock_t *blk = (AFFreeBlock_t *) block;
     AFAllctr_t *afallctr = (AFAllctr_t *) allctr;
 
-    if (afallctr->free_list && BLK_SZ(afallctr->free_list) > BLK_SZ(blk)) {
+    if (afallctr->free_list && AF_BLK_SZ(afallctr->free_list) > AF_BLK_SZ(blk)) {
 	blk->next = afallctr->free_list->next;
 	blk->prev = afallctr->free_list;
 	afallctr->free_list->next = blk;
diff --git a/erts/emulator/beam/erl_afit_alloc.h b/erts/emulator/beam/erl_afit_alloc.h
index ea408a7194..87caccac20 100644
--- a/erts/emulator/beam/erl_afit_alloc.h
+++ b/erts/emulator/beam/erl_afit_alloc.h
@@ -49,11 +49,6 @@ Allctr_t *erts_afalc_start(AFAllctr_t *, AFAllctrInit_t *, AllctrInit_t *);
 #include "erl_alloc_util.h"
 
 typedef struct AFFreeBlock_t_ AFFreeBlock_t;
-struct AFFreeBlock_t_ {
-    Block_t block_head;
-    AFFreeBlock_t *prev;
-    AFFreeBlock_t *next;
-};
 
 struct AFAllctr_t_ {
     Allctr_t		allctr; /* Has to be first! */
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 04d807b780..5da8c69c03 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -310,9 +310,9 @@ set_default_ll_alloc_opts(struct au_init *ip)
     ip->init.util.name_prefix	= "ll_";
     ip->init.util.alloc_no	= ERTS_ALC_A_LONG_LIVED;
 #ifndef SMALL_MEMORY
-    ip->init.util.mmbcs 	= 2*1024*1024; /* Main carrier size */
+    ip->init.util.mmbcs 	= 2*1024*1024 - 40; /* Main carrier size */
 #else
-    ip->init.util.mmbcs 	= 1*1024*1024; /* Main carrier size */
+    ip->init.util.mmbcs 	= 1*1024*1024 - 40; /* Main carrier size */
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_LONG_LIVED;
     ip->init.util.asbcst	= 0;
@@ -1173,6 +1173,11 @@ handle_au_arg(struct au_init *auip,
 	break;
     case 'e':
 	auip->enable = get_bool_value(sub_param+1, argv, ip);
+#if !HAVE_ERTS_SBMBC
+	if (auip->init.util.alloc_no == ERTS_ALC_A_SBMBC) {
+	    auip->enable = 0;
+	}
+#endif
 	break;
     case 'l':
 	if (has_prefix("lmbcs", sub_param)) {
@@ -1233,10 +1238,16 @@ handle_au_arg(struct au_init *auip,
 	    auip->init.util.sbct = get_kb_value(sub_param + 4, argv, ip);
 	}
 	else if (has_prefix("sbmbcs", sub_param)) {
-	    auip->init.util.sbmbcs = get_byte_value(sub_param + 6, argv, ip);
+#if HAVE_ERTS_SBMBC
+	    auip->init.util.sbmbcs =
+#endif
+		get_byte_value(sub_param + 6, argv, ip);
 	}
 	else if (has_prefix("sbmbct", sub_param)) {
-	    auip->init.util.sbmbct = get_byte_value(sub_param + 6, argv, ip);
+#if HAVE_ERTS_SBMBC
+	    auip->init.util.sbmbct =
+#endif
+		get_byte_value(sub_param + 6, argv, ip);
 	}
 	else if (has_prefix("smbcs", sub_param)) {
 	    auip->default_.smbcs = 0;
@@ -1403,6 +1414,9 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 			else if (strcmp("max", arg) == 0) {
 			    for (a = 0; a < aui_sz; a++)
 				aui[a]->enable = 1;
+#if !HAVE_ERTS_SBMBC
+			    init->sbmbc_alloc.enable = 0;
+#endif
 			}
 			else if (strcmp("config", arg) == 0) {
 			    init->erts_alloc_config = 1;
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 97ba306a79..3d6761339b 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -78,10 +78,12 @@ int erts_have_sbmbc_alloc;
 
 #if HAVE_ERTS_MSEG
 
-#define INV_MSEG_UNIT_MASK	((UWord) (mseg_unit_size - 1))
-#define MSEG_UNIT_MASK		(~INV_MSEG_UNIT_MASK)
+#define MSEG_UNIT_SHIFT         MSEG_ALIGN_BITS
+#define MSEG_UNIT_SZ            (1 << MSEG_UNIT_SHIFT)
+#define MSEG_UNIT_MASK		((~(UWord)0) << MSEG_UNIT_SHIFT)
+
 #define MSEG_UNIT_FLOOR(X)	((X) & MSEG_UNIT_MASK)
-#define MSEG_UNIT_CEILING(X)	MSEG_UNIT_FLOOR((X) + INV_MSEG_UNIT_MASK)
+#define MSEG_UNIT_CEILING(X)	MSEG_UNIT_FLOOR((X) + ~MSEG_UNIT_MASK)
 
 #endif
 
@@ -104,7 +106,6 @@ int erts_have_sbmbc_alloc;
 static Uint sys_alloc_carrier_size;
 #if HAVE_ERTS_MSEG
 static Uint max_mseg_carriers;
-static Uint mseg_unit_size;
 #endif
 
 #define ONE_GIGA (1000000000)
@@ -117,16 +118,47 @@ static Uint mseg_unit_size;
 		    ? ((CC).giga_no--, (CC).no = ONE_GIGA - 1)		\
 		    : (CC).no--)
 
-/* ... */
+/* Multi block carrier (MBC) memory layout in R16: 
+
+Empty MBC:
+[Carrier_t|pad|Block_t L0T|fhdr| free... ]
+
+MBC after allocating first block:
+[Carrier_t|pad|Block_t 000|        udata        |pad|Block_t L0T|fhdr| free... ]
+
+MBC after allocating second block:
+[Carrier_t|pad|Block_t 000|        udata        |pad|Block_t 000|   udata   |pad|Block_t L0T|fhdr| free... ]
+
+MBC after deallocating first block:
+[Carrier_t|pad|Block_t 00T|fhdr| free  |FreeBlkFtr_t|Block_t 0P0|   udata   |pad|Block_t L0T|fhdr| free... ]
+
+
+    udata = Allocated user data
+    pad   = Padding to ensure correct alignment for user data
+    fhdr  = Allocator specific header to keep track of free block
+    free  = Unused free memory
+    T     = This block is free (THIS_FREE_BLK_HDR_FLG)
+    P     = Previous block is free (PREV_FREE_BLK_HDR_FLG)
+    L     = Last block in carrier (LAST_BLK_HDR_FLG)
+*/
+
+/* Single block carrier (SBC):
+[Carrier_t|pad|Block_t 111| udata... ]
+*/
+
 
 /* Blocks ... */
 
-#define SBC_BLK_FTR_FLG		(((UWord) 1) << 0)
+#define UNUSED0_BLK_FTR_FLG	(((UWord) 1) << 0)
 #define UNUSED1_BLK_FTR_FLG	(((UWord) 1) << 1)
 #define UNUSED2_BLK_FTR_FLG	(((UWord) 1) << 2)
 
-#define ABLK_HDR_SZ (sizeof(Block_t))
-#define FBLK_FTR_SZ (sizeof(UWord))
+#if MBC_ABLK_OFFSET_BITS
+#  define ABLK_HDR_SZ (offsetof(Block_t,u))
+#else
+#  define ABLK_HDR_SZ (sizeof(Block_t))
+#endif
+#define FBLK_FTR_SZ (sizeof(FreeBlkFtr_t))
 
 #define UMEMSZ2BLKSZ(AP, SZ)						\
   (ABLK_HDR_SZ + (SZ) <= (AP)->min_block_size				\
@@ -136,88 +168,181 @@ static Uint mseg_unit_size;
 #define UMEM2BLK(P) ((Block_t *) (((char *) (P)) - ABLK_HDR_SZ))
 #define BLK2UMEM(P) ((void *)    (((char *) (P)) + ABLK_HDR_SZ))
 
-#define PREV_BLK_SZ(B) \
-  ((UWord) (*(((UWord *) (B)) - 1) & SZ_MASK))
+#define PREV_BLK_SZ(B) 		((UWord) (((FreeBlkFtr_t *)(B))[-1]))
 
 #define SET_BLK_SZ_FTR(B, SZ) \
-  (*((UWord *) (((char *) (B)) + (SZ) - sizeof(UWord))) = (SZ))
+  (((FreeBlkFtr_t *) (((char *) (B)) + (SZ)))[-1] = (SZ))
 
 #define THIS_FREE_BLK_HDR_FLG 	(((UWord) 1) << 0)
 #define PREV_FREE_BLK_HDR_FLG 	(((UWord) 1) << 1)
 #define LAST_BLK_HDR_FLG 	(((UWord) 1) << 2)
 
-#define SET_BLK_SZ(B, SZ) \
+/* Special flag combo for (allocated) SBC blocks 
+*/
+#define SBC_BLK_HDR_FLG (THIS_FREE_BLK_HDR_FLG | PREV_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG)
+
+#define SET_MBC_ABLK_SZ(B, SZ) \
   (ASSERT(((SZ) & FLG_MASK) == 0), \
-   (*((Block_t *) (B)) = ((*((Block_t *) (B)) & FLG_MASK) | (SZ))))
-#define SET_BLK_FREE(B) \
-  (*((Block_t *) (B)) |= THIS_FREE_BLK_HDR_FLG)
-#define SET_BLK_ALLOCED(B) \
-  (*((Block_t *) (B)) &= ~THIS_FREE_BLK_HDR_FLG)
-#define SET_PREV_BLK_FREE(B) \
-  (*((Block_t *) (B)) |= PREV_FREE_BLK_HDR_FLG)
+   (B)->bhdr = (((B)->bhdr) & ~MBC_ABLK_SZ_MASK) | (SZ))
+#define SET_MBC_FBLK_SZ(B, SZ) \
+  (ASSERT(((SZ) & FLG_MASK) == 0), \
+   (B)->bhdr = (((B)->bhdr) & ~MBC_FBLK_SZ_MASK) | (SZ))
+#define SET_SBC_BLK_SZ(B, SZ) \
+  (ASSERT(((SZ) & FLG_MASK) == 0), \
+   (B)->bhdr = (((B)->bhdr) & ~SBC_BLK_SZ_MASK) | (SZ))
+#define SET_PREV_BLK_FREE(AP,B) \
+  (ASSERT(!IS_MBC_FIRST_BLK(AP,B)), \
+   ASSERT(!IS_FREE_BLK(B)), \
+   (B)->bhdr |= PREV_FREE_BLK_HDR_FLG)
 #define SET_PREV_BLK_ALLOCED(B) \
-  (*((Block_t *) (B)) &= ~PREV_FREE_BLK_HDR_FLG)
+  ((B)->bhdr &= ~PREV_FREE_BLK_HDR_FLG)
 #define SET_LAST_BLK(B) \
-  (*((Block_t *) (B)) |= LAST_BLK_HDR_FLG)
+  ((B)->bhdr |= LAST_BLK_HDR_FLG)
 #define SET_NOT_LAST_BLK(B) \
-  (*((Block_t *) (B)) &= ~LAST_BLK_HDR_FLG)
+  ((B)->bhdr &= ~LAST_BLK_HDR_FLG)
 
 #define SBH_THIS_FREE		THIS_FREE_BLK_HDR_FLG
-#define SBH_THIS_ALLOCED	((UWord) 0)
 #define SBH_PREV_FREE		PREV_FREE_BLK_HDR_FLG
-#define SBH_PREV_ALLOCED	((UWord) 0)
 #define SBH_LAST_BLK		LAST_BLK_HDR_FLG
-#define SBH_NOT_LAST_BLK	((UWord) 0)
 
-#define SET_BLK_HDR(B, Sz, F) \
-  (ASSERT(((Sz) & FLG_MASK) == 0), *((Block_t *) (B)) = ((Sz) | (F)))
+
+#if MBC_ABLK_OFFSET_BITS
+
+#  define MBC_SZ_MAX_LIMIT ((((UWord)1 << MBC_ABLK_OFFSET_BITS) - 1) << MSEG_ALIGN_BITS)
+
+#  define BLK_CARRIER_OFFSET(B, C) (((char*)(B) - (char*)(C)) >> MSEG_UNIT_SHIFT)
+
+#  define SET_MBC_ABLK_HDR(B, Sz, F, C) \
+    (ASSERT(((Sz) & ~MBC_ABLK_SZ_MASK) == 0), \
+     ASSERT(!((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG))), \
+     (B)->bhdr = ((Sz) | (F) | (BLK_CARRIER_OFFSET(B,C) << MBC_ABLK_OFFSET_SHIFT)))
+
+#  define SET_MBC_FBLK_HDR(B, Sz, F, C) \
+    (ASSERT(((Sz) & ~MBC_FBLK_SZ_MASK) == 0), \
+     ASSERT(((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG|PREV_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
+     (B)->bhdr = ((Sz) | (F)), \
+     (B)->u.carrier = (C))
+
+#  define ABLK_TO_MBC(B) \
+    (ASSERT(IS_MBC_BLK(B) && IS_ALLOCED_BLK(B)), \
+     (Carrier_t*)((MSEG_UNIT_FLOOR((UWord)(B)) - \
+		  (((B)->bhdr >> MBC_ABLK_OFFSET_SHIFT) << MSEG_UNIT_SHIFT))))
+
+#  define FBLK_TO_MBC(B) \
+    (ASSERT(IS_MBC_BLK(B) && IS_FREE_BLK(B)), \
+     (B)->u.carrier)
+      
+#  define BLK_TO_MBC(B) (IS_FREE_BLK(B) ? FBLK_TO_MBC(B) : ABLK_TO_MBC(B))
+
+#  define IS_MBC_FIRST_ABLK(AP,B) \
+  ((((UWord)(B) & ~MSEG_UNIT_MASK) == MBC_HEADER_SIZE(AP)) \
+   && ((B)->bhdr & MBC_ABLK_OFFSET_MASK) == 0)
+
+#  define IS_MBC_FIRST_FBLK(AP,B) \
+  ((char*)(B) == (char*)((B)->u.carrier) + MBC_HEADER_SIZE(AP))
+
+#  define IS_MBC_FIRST_BLK(AP,B) \
+  (IS_FREE_BLK(B) ? IS_MBC_FIRST_FBLK(AP,B) : IS_MBC_FIRST_ABLK(AP,B))
+
+#  define SET_BLK_FREE(B) \
+  (ASSERT(!IS_PREV_BLK_FREE(B)), \
+   (B)->u.carrier = ABLK_TO_MBC(B), \
+   (B)->bhdr |= THIS_FREE_BLK_HDR_FLG, \
+   (B)->bhdr &= (MBC_ABLK_SZ_MASK|FLG_MASK))
+
+#  define SET_BLK_ALLOCED(B) \
+  (ASSERT(((B)->bhdr & (MBC_ABLK_OFFSET_MASK|THIS_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
+   (B)->bhdr &= ~THIS_FREE_BLK_HDR_FLG, \
+   (B)->bhdr |= (BLK_CARRIER_OFFSET(B,(B)->u.carrier) << MBC_ABLK_OFFSET_SHIFT))
+
+#else /* !MBC_ABLK_OFFSET_BITS */
+
+#  define MBC_SZ_MAX_LIMIT ((UWord)~0)
+
+#  define SET_MBC_ABLK_HDR(B, Sz, F, C) \
+    (ASSERT(((Sz) & FLG_MASK) == 0), \
+     ASSERT(!((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG))), \
+     ASSERT((UWord)(F) < SBC_BLK_HDR_FLG), \
+     (B)->bhdr = ((Sz) | (F)), \
+     (B)->carrier = (C))
+
+#  define SET_MBC_FBLK_HDR(B, Sz, F, C) \
+    (ASSERT(((Sz) & FLG_MASK) == 0), \
+     ASSERT(((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG|PREV_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
+     (B)->bhdr = ((Sz) | (F)), \
+     (B)->carrier = (C))
+
+#  define BLK_TO_MBC(B) ((B)->carrier)
+#  define ABLK_TO_MBC(B) BLK_TO_MBC(B)
+#  define FBLK_TO_MBC(B) BLK_TO_MBC(B)
+
+#  define IS_MBC_FIRST_BLK(AP,B) \
+  ((char*)(B) == (char*)((B)->carrier) + MBC_HEADER_SIZE(AP))
+#  define IS_MBC_FIRST_ABLK(AP,B) IS_MBC_FIRST_BLK(AP,B)
+#  define IS_MBC_FIRST_FBLK(AP,B) IS_MBC_FIRST_BLK(AP,B)
+
+#  define SET_BLK_FREE(B) \
+  (ASSERT(!IS_PREV_BLK_FREE(B)), \
+   (B)->bhdr |= THIS_FREE_BLK_HDR_FLG)
+
+#  define SET_BLK_ALLOCED(B) \
+  ((B)->bhdr &= ~THIS_FREE_BLK_HDR_FLG)
+
+#endif /* !MBC_ABLK_OFFSET_BITS */
+
+#define SET_SBC_BLK_HDR(B, Sz) \
+  (ASSERT(((Sz) & FLG_MASK) == 0), (B)->bhdr = ((Sz) | (SBC_BLK_HDR_FLG)))
+
 
 #define BLK_UMEM_SZ(B) \
   (BLK_SZ(B) - (ABLK_HDR_SZ))
 #define IS_PREV_BLK_FREE(B) \
-  (*((Block_t *) (B)) & PREV_FREE_BLK_HDR_FLG)
+  ((B)->bhdr & PREV_FREE_BLK_HDR_FLG)
 #define IS_PREV_BLK_ALLOCED(B) \
   (!IS_PREV_BLK_FREE((B)))
 #define IS_FREE_BLK(B) \
-  (*((Block_t *) (B)) & THIS_FREE_BLK_HDR_FLG)
+  (ASSERT(!IS_SBC_BLK(B)), (B)->bhdr & THIS_FREE_BLK_HDR_FLG)
 #define IS_ALLOCED_BLK(B) \
   (!IS_FREE_BLK((B)))  
 #define IS_LAST_BLK(B) \
-  (*((Block_t *) (B)) & LAST_BLK_HDR_FLG)
+  ((B)->bhdr & LAST_BLK_HDR_FLG)
 #define IS_NOT_LAST_BLK(B) \
   (!IS_LAST_BLK((B)))
 
 #define GET_LAST_BLK_HDR_FLG(B) \
-  (*((Block_t*) (B)) & LAST_BLK_HDR_FLG)
+  ((B)->bhdr & LAST_BLK_HDR_FLG)
 #define GET_THIS_FREE_BLK_HDR_FLG(B) \
-  (*((Block_t*) (B)) & THIS_FREE_BLK_HDR_FLG)
+  ((B)->bhdr & THIS_FREE_BLK_HDR_FLG)
 #define GET_PREV_FREE_BLK_HDR_FLG(B) \
-  (*((Block_t*) (B)) & PREV_FREE_BLK_HDR_FLG)
+  ((B)->bhdr & PREV_FREE_BLK_HDR_FLG)
 #define GET_BLK_HDR_FLGS(B) \
-  (*((Block_t*) (B)) & FLG_MASK)
-
-#define IS_FIRST_BLK(B) \
-  (IS_PREV_BLK_FREE((B)) && (PREV_BLK_SZ((B)) == 0))
-#define IS_NOT_FIRST_BLK(B) \
-  (!IS_FIRST_BLK((B)))
-
-#define SET_SBC_BLK_FTR(FTR) \
-  ((FTR) = (0 | SBC_BLK_FTR_FLG))
-#define SET_MBC_BLK_FTR(FTR) \
-  ((FTR) = 0)
+  ((B)->bhdr & FLG_MASK)
 
 #define IS_SBC_BLK(B) \
-  (IS_PREV_BLK_FREE((B)) && (((UWord *) (B))[-1] & SBC_BLK_FTR_FLG))
+    (((B)->bhdr & FLG_MASK) == SBC_BLK_HDR_FLG)
 #define IS_MBC_BLK(B) \
   (!IS_SBC_BLK((B)))
 
+#define MBC_BLK_SZ(B) (IS_FREE_BLK(B) ? MBC_FBLK_SZ(B) : MBC_ABLK_SZ(B))
+
 #define NXT_BLK(B) \
-  ((Block_t *) (((char *) (B)) + BLK_SZ((B))))
+  (ASSERT(IS_MBC_BLK(B)), \
+   (Block_t *) (((char *) (B)) + MBC_BLK_SZ((B))))
 #define PREV_BLK(B) \
   ((Block_t *) (((char *) (B)) - PREV_BLK_SZ((B))))
 
+#define BLK_AFTER(B,Sz) \
+  ((Block_t *) (((char *) (B)) + (Sz)))
+
+#define BLK_SZ(B) ((B)->bhdr & (((B)->bhdr & THIS_FREE_BLK_HDR_FLG) ? MBC_FBLK_SZ_MASK : MBC_ABLK_SZ_MASK))
+
 /* Carriers ... */
 
+#define SBC_HEADER_SIZE	   (UNIT_CEILING(sizeof(Carrier_t) + ABLK_HDR_SZ) \
+			    - ABLK_HDR_SZ)
+#define MBC_HEADER_SIZE(AP) SBC_HEADER_SIZE
+
+
 #define MSEG_CARRIER_HDR_FLAG		(((UWord) 1) << 0)
 #define SBC_CARRIER_HDR_FLAG		(((UWord) 1) << 1)
 
@@ -226,20 +351,20 @@ static Uint mseg_unit_size;
 #define SCH_MBC				0
 #define SCH_SBC				SBC_CARRIER_HDR_FLAG
 
-#define SET_CARRIER_HDR(C, Sz, F) \
-  (ASSERT(((Sz) & FLG_MASK) == 0), (C)->chdr = ((Sz) | (F)))
+#define SET_CARRIER_HDR(C, Sz, F, AP) \
+  (ASSERT(((Sz) & FLG_MASK) == 0), (C)->chdr = ((Sz) | (F)), (C)->allctr = (AP))
 
-#define BLK2SBC(AP, B) \
-  ((Carrier_t *) (((char *) (B)) - (AP)->sbc_header_size))
-#define FBLK2MBC(AP, B) \
-  ((Carrier_t *) (((char *) (B)) - (AP)->mbc_header_size))
+#define BLK_TO_SBC(B) \
+  ((Carrier_t *) (((char *) (B)) - SBC_HEADER_SIZE))
+#define FIRST_BLK_TO_MBC(AP, B) \
+  ((Carrier_t *) (((char *) (B)) - MBC_HEADER_SIZE(AP)))
 
-#define MBC2FBLK(AP, P) \
-  ((Block_t *) (((char *) (P)) + (AP)->mbc_header_size))
+#define MBC_TO_FIRST_BLK(AP, P) \
+  ((Block_t *) (((char *) (P)) + MBC_HEADER_SIZE(AP)))
 #define SBC2BLK(AP, P) \
-  ((Block_t *) (((char *) (P)) + (AP)->sbc_header_size))
+  ((Block_t *) (((char *) (P)) + SBC_HEADER_SIZE))
 #define SBC2UMEM(AP, P) \
-  ((void *) (((char *) (P)) + ((AP)->sbc_header_size + ABLK_HDR_SZ)))
+  ((void *) (((char *) (P)) + (SBC_HEADER_SIZE + ABLK_HDR_SZ)))
 
 #define IS_MSEG_CARRIER(C) \
   ((C)->chdr & MSEG_CARRIER_HDR_FLAG)
@@ -250,15 +375,6 @@ static Uint mseg_unit_size;
 #define IS_MB_CARRIER(C) \
   (!IS_SB_CARRIER((C)))
 
-#define SET_MSEG_CARRIER(C) \
-  ((C)->chdr |= MSEG_CARRIER_HDR_FLAG)
-#define SET_SYS_ALLOC_CARRIER(C) \
-  ((C)->chdr &= ~MSEG_CARRIER_HDR_FLAG)
-#define SET_SB_CARRIER(C) \
-  ((C)->chdr |= SBC_CARRIER_HDR_FLAG)
-#define SET_MB_CARRIER(C) \
-  ((C)->chdr &= ~SBC_CARRIER_HDR_FLAG)
-
 #define SET_CARRIER_SZ(C, SZ) \
   (ASSERT(((SZ) & FLG_MASK) == 0), \
    ((C)->chdr = ((C)->chdr & FLG_MASK) | (SZ)))
@@ -506,11 +622,11 @@ static void mbc_free(Allctr_t *allctr, void *p);
 #if HAVE_ERTS_MSEG
 
 static ERTS_INLINE void *
-alcu_mseg_alloc(Allctr_t *allctr, Uint *size_p)
+alcu_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
 {
     void *res;
 
-    res = erts_mseg_alloc_opt(allctr->alloc_no, size_p, &allctr->mseg_opt);
+    res = erts_mseg_alloc_opt(allctr->alloc_no, size_p, flags, &allctr->mseg_opt);
     INC_CC(allctr->calls.mseg_alloc);
     return res;
 }
@@ -521,7 +637,7 @@ alcu_mseg_realloc(Allctr_t *allctr, void *seg, Uint old_size, Uint *new_size_p)
     void *res;
 
     res = erts_mseg_realloc_opt(allctr->alloc_no, seg, old_size, new_size_p,
-				&allctr->mseg_opt);
+				ERTS_MSEG_FLG_NONE, &allctr->mseg_opt);
     INC_CC(allctr->calls.mseg_realloc);
     return res;
 }
@@ -765,13 +881,9 @@ erts_alcu_fix_alloc_shrink(Allctr_t *allctr, erts_aint32_t flgs)
 #define ERTS_ALCU_DD_FIX_TYPE_OFFS \
   ((sizeof(ErtsAllctrDDBlock_t)-1)/sizeof(UWord) + 1)
 
-#define ERTS_AU_PREF_ALLOC_IX_MASK \
-   ((((UWord) 1) << ERTS_AU_PREF_ALLOC_BITS) - 1)
-#define ERTS_AU_PREF_ALLOC_SIZE_MASK \
-   ((((UWord) 1) << (sizeof(UWord)*8 - ERTS_AU_PREF_ALLOC_BITS)) - 1)
 
-static ERTS_INLINE int
-get_pref_allctr(void *extra, Allctr_t **allctr)
+static ERTS_INLINE Allctr_t*
+get_pref_allctr(void *extra)
 {
     ErtsAllocatorThrSpec_t *tspec = (ErtsAllocatorThrSpec_t *) extra;
     int pref_ix;
@@ -781,34 +893,33 @@ get_pref_allctr(void *extra, Allctr_t **allctr)
     ASSERT(sizeof(UWord) == sizeof(Allctr_t *));
     ASSERT(0 <= pref_ix && pref_ix < tspec->size);
 
-    *allctr = tspec->allctr[pref_ix];
-    return pref_ix;
+    return tspec->allctr[pref_ix];
 }
 
-static ERTS_INLINE void *
-get_used_allctr(void *extra, void *p, Allctr_t **allctr, UWord *sizep)
+/* SMP note:
+ * get_used_allctr() must be safe WITHOUT locking the allocator while
+ * concurrent threads may be updating adjacent blocks.
+ * We rely on getting a consistent result (without atomic op) when reading
+ * the block header word even if a concurrent thread is updating
+ * the "PREV_FREE" flag bit. 
+ */
+static ERTS_INLINE Allctr_t*
+get_used_allctr(void *extra, void *p, UWord *sizep)
 {
-    ErtsAllocatorThrSpec_t *tspec = (ErtsAllocatorThrSpec_t *) extra;
-    void *ptr = (void *) (((char *) p) - sizeof(UWord));
-    UWord ainfo = *((UWord *) ptr);
-    int aix = (int) (ainfo & ERTS_AU_PREF_ALLOC_IX_MASK);
-    *allctr = tspec->allctr[aix];
-    if (sizep)
-	*sizep = ((ainfo >> ERTS_AU_PREF_ALLOC_BITS)
-		  & ERTS_AU_PREF_ALLOC_SIZE_MASK);
-    return ptr;
-}
+    Block_t* blk = UMEM2BLK(p);
+    Carrier_t* crr;
 
-static ERTS_INLINE void *
-put_used_allctr(void *p, int ix, UWord size)
-{
-    UWord ainfo = (size >= ERTS_AU_PREF_ALLOC_SIZE_MASK
-		   ? ERTS_AU_PREF_ALLOC_SIZE_MASK
-		   : size);
-    ainfo <<= ERTS_AU_PREF_ALLOC_BITS;
-    ainfo |= (UWord) ix;
-    *((UWord *) p) = ainfo;
-    return (void *) (((char *) p) + sizeof(UWord));
+    if (IS_SBC_BLK(blk)) {
+	crr = BLK_TO_SBC(blk);
+	if (sizep)
+	    *sizep = SBC_BLK_SZ(blk) - ABLK_HDR_SZ;  
+    }
+    else {
+	crr = ABLK_TO_MBC(blk);
+	if (sizep)
+	    *sizep = MBC_ABLK_SZ(blk) - ABLK_HDR_SZ;
+    }
+    return crr->allctr;
 }
 
 static void
@@ -1209,10 +1320,8 @@ mbc_alloc_block(Allctr_t *allctr, Uint size, Uint *blk_szp, Uint32 *alcu_flgsp)
 	if ((*alcu_flgsp) & ERTS_ALCU_FLG_SBMBC) 
 	    blk = create_sbmbc(allctr, get_blk_sz);
 	else {
-#if HALFWORD_HEAP
-	    blk = create_carrier(allctr, get_blk_sz, CFLG_MBC|CFLG_FORCE_MSEG);
-#else
 	    blk = create_carrier(allctr, get_blk_sz, CFLG_MBC);
+#if !HALFWORD_HEAP && !HAVE_SUPER_ALIGNED_MB_CARRIERS
 	    if (!blk) {
 		/* Emergency! We couldn't create the carrier as we wanted.
 		   Try to place it in a sys_alloced sbc. */
@@ -1242,6 +1351,7 @@ mbc_alloc_finalize(Allctr_t *allctr,
 		   Block_t *blk,
 		   Uint org_blk_sz,
 		   UWord flags,
+		   Carrier_t *crr,
 		   Uint want_blk_sz,
 		   int valid_blk_info,
 		   Uint32 alcu_flgs)
@@ -1262,22 +1372,18 @@ mbc_alloc_finalize(Allctr_t *allctr,
 	/* Shrink block... */
 	blk_sz = want_blk_sz;
 	nxt_blk_sz = org_blk_sz - blk_sz;
-	SET_BLK_HDR(blk,
-		    blk_sz,
-		    SBH_THIS_ALLOCED|SBH_NOT_LAST_BLK|prev_free_flg);
+	SET_MBC_ABLK_HDR(blk, blk_sz, prev_free_flg, crr);
 
-	nxt_blk = NXT_BLK(blk);
-	SET_BLK_HDR(nxt_blk,
-		    nxt_blk_sz,
-		    (SBH_THIS_FREE
-		     | SBH_PREV_ALLOCED
-		     | (flags & LAST_BLK_HDR_FLG)));
+	nxt_blk = BLK_AFTER(blk, blk_sz);
+	SET_MBC_FBLK_HDR(nxt_blk, nxt_blk_sz,
+			 SBH_THIS_FREE|(flags & LAST_BLK_HDR_FLG),
+			 crr);
 
 	if (!(flags & LAST_BLK_HDR_FLG)) {
 	    SET_BLK_SZ_FTR(nxt_blk, nxt_blk_sz);
 	    if (!valid_blk_info) {
-		Block_t *nxt_nxt_blk = NXT_BLK(nxt_blk);
-		SET_PREV_BLK_FREE(nxt_nxt_blk);
+		Block_t *nxt_nxt_blk = BLK_AFTER(nxt_blk, nxt_blk_sz);
+		SET_PREV_BLK_FREE(allctr, nxt_nxt_blk);
 	    }
 	}
 	(*allctr->link_free_block)(allctr, nxt_blk, alcu_flgs);
@@ -1291,40 +1397,40 @@ mbc_alloc_finalize(Allctr_t *allctr,
 	       || nxt_blk == PREV_BLK(NXT_BLK(nxt_blk)));
 	ASSERT((flags & LAST_BLK_HDR_FLG)
 	       || IS_PREV_BLK_FREE(NXT_BLK(nxt_blk)));
-	ASSERT(nxt_blk_sz == BLK_SZ(nxt_blk));
+	ASSERT(nxt_blk_sz == MBC_BLK_SZ(nxt_blk));
 	ASSERT(nxt_blk_sz % sizeof(Unit_t) == 0);
 	ASSERT(nxt_blk_sz >= allctr->min_block_size);
+	ASSERT(ABLK_TO_MBC(blk) == crr);
+	ASSERT(FBLK_TO_MBC(nxt_blk) == crr);
     }
     else {
+	ASSERT(org_blk_sz <= MBC_ABLK_SZ_MASK);
 	blk_sz = org_blk_sz;
 	if (flags & LAST_BLK_HDR_FLG) {
 	    if (valid_blk_info)
 		SET_BLK_ALLOCED(blk);
 	    else
-		SET_BLK_HDR(blk,
-			    blk_sz,
-			    SBH_THIS_ALLOCED|SBH_LAST_BLK|prev_free_flg);
+		SET_MBC_ABLK_HDR(blk, blk_sz, SBH_LAST_BLK|prev_free_flg, crr);
 	}
 	else {
 	    if (valid_blk_info)
 		SET_BLK_ALLOCED(blk);
 	    else
-		SET_BLK_HDR(blk,
-			    blk_sz,
-			    SBH_THIS_ALLOCED|SBH_NOT_LAST_BLK|prev_free_flg);
-	    nxt_blk = NXT_BLK(blk);
+		SET_MBC_ABLK_HDR(blk, blk_sz, prev_free_flg, crr);
+	    nxt_blk = BLK_AFTER(blk, blk_sz);
 	    SET_PREV_BLK_ALLOCED(nxt_blk);
 	}
 
 	ASSERT((flags & LAST_BLK_HDR_FLG)
 	       ? IS_LAST_BLK(blk)
 	       : IS_NOT_LAST_BLK(blk));
+	ASSERT(ABLK_TO_MBC(blk) == crr);
     }
 
     STAT_MBC_BLK_ALLOC(allctr, blk_sz, alcu_flgs);
 
     ASSERT(IS_ALLOCED_BLK(blk));
-    ASSERT(blk_sz == BLK_SZ(blk));
+    ASSERT(blk_sz == MBC_BLK_SZ(blk));
     ASSERT(blk_sz % sizeof(Unit_t) == 0);
     ASSERT(blk_sz >= allctr->min_block_size);
     ASSERT(blk_sz >= want_blk_sz);
@@ -1348,8 +1454,9 @@ mbc_alloc(Allctr_t *allctr, Uint size)
     if (IS_MBC_BLK(blk))
 	mbc_alloc_finalize(allctr,
 			   blk,
-			   BLK_SZ(blk),
+			   MBC_FBLK_SZ(blk),
 			   GET_BLK_HDR_FLGS(blk),
+			   FBLK_TO_MBC(blk),
 			   blk_sz,
 			   1,
 			   alcu_flgs);
@@ -1370,7 +1477,7 @@ mbc_free(Allctr_t *allctr, void *p)
     ASSERT(p);
 
     blk = UMEM2BLK(p);
-    blk_sz = BLK_SZ(blk);
+    blk_sz = MBC_ABLK_SZ(blk);
     if (blk_sz < allctr->sbmbc_threshold)
 	alcu_flgs |= ERTS_ALCU_FLG_SBMBC;
 
@@ -1381,17 +1488,18 @@ mbc_free(Allctr_t *allctr, void *p)
 
     STAT_MBC_BLK_FREE(allctr, blk_sz, alcu_flgs);
 
-    is_first_blk = IS_FIRST_BLK(blk);
+    is_first_blk = IS_MBC_FIRST_ABLK(allctr, blk);
     is_last_blk = IS_LAST_BLK(blk);
 
-    if (!is_first_blk && IS_PREV_BLK_FREE(blk)) {
+    if (IS_PREV_BLK_FREE(blk)) {
+	ASSERT(!is_first_blk); 
 	/* Coalesce with previous block... */
 	blk = PREV_BLK(blk);
 	(*allctr->unlink_free_block)(allctr, blk, alcu_flgs);
 
-	blk_sz += BLK_SZ(blk);
-	is_first_blk = IS_FIRST_BLK(blk);
-	SET_BLK_SZ(blk, blk_sz);
+	blk_sz += MBC_FBLK_SZ(blk);
+	is_first_blk = IS_MBC_FIRST_FBLK(allctr, blk);
+	SET_MBC_FBLK_SZ(blk, blk_sz);
     }
     else {
 	SET_BLK_FREE(blk);
@@ -1400,12 +1508,12 @@ mbc_free(Allctr_t *allctr, void *p)
     if (is_last_blk)
 	SET_LAST_BLK(blk);
     else {
-	nxt_blk = NXT_BLK(blk);
+	nxt_blk = BLK_AFTER(blk, blk_sz);
 	if (IS_FREE_BLK(nxt_blk)) {
 	    /* Coalesce with next block... */
 	    (*allctr->unlink_free_block)(allctr, nxt_blk, alcu_flgs);
-	    blk_sz += BLK_SZ(nxt_blk);
-	    SET_BLK_SZ(blk, blk_sz);
+	    blk_sz += MBC_FBLK_SZ(nxt_blk);
+	    SET_MBC_FBLK_SZ(blk, blk_sz);
 
 	    is_last_blk = IS_LAST_BLK(nxt_blk);
 	    if (is_last_blk) 
@@ -1416,26 +1524,26 @@ mbc_free(Allctr_t *allctr, void *p)
 	    }
 	}
 	else {
-	    SET_PREV_BLK_FREE(nxt_blk);
+	    SET_PREV_BLK_FREE(allctr, nxt_blk);
 	    SET_NOT_LAST_BLK(blk);
 	    SET_BLK_SZ_FTR(blk, blk_sz);
 	}
 
     }
 
-    ASSERT(is_last_blk  ? IS_LAST_BLK(blk)  : IS_NOT_LAST_BLK(blk));
-    ASSERT(is_first_blk ? IS_FIRST_BLK(blk) : IS_NOT_FIRST_BLK(blk));
     ASSERT(IS_FREE_BLK(blk));
+    ASSERT(!is_last_blk  == !IS_LAST_BLK(blk));
+    ASSERT(!is_first_blk == !IS_MBC_FIRST_FBLK(allctr, blk));
     ASSERT(is_first_blk || IS_PREV_BLK_ALLOCED(blk));
     ASSERT(is_last_blk  || IS_PREV_BLK_FREE(NXT_BLK(blk)));
-    ASSERT(blk_sz == BLK_SZ(blk));
+    ASSERT(blk_sz == MBC_BLK_SZ(blk));
     ASSERT(is_last_blk || blk == PREV_BLK(NXT_BLK(blk)));
     ASSERT(blk_sz % sizeof(Unit_t) == 0);
     ASSERT(IS_MBC_BLK(blk));
 
     if (is_first_blk
 	&& is_last_blk
-	&& allctr->main_carrier != FBLK2MBC(allctr, blk)) {
+	&& allctr->main_carrier != FIRST_BLK_TO_MBC(allctr, blk)) {
 	if (alcu_flgs & ERTS_ALCU_FLG_SBMBC)
 	    destroy_sbmbc(allctr, blk);
 	else
@@ -1472,7 +1580,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
     ASSERT(size < allctr->sbc_threshold);
 
     blk = (Block_t *) UMEM2BLK(p);
-    old_blk_sz = BLK_SZ(blk);
+    old_blk_sz = MBC_ABLK_SZ(blk);
 
     ASSERT(old_blk_sz >= allctr->min_block_size);
 
@@ -1497,6 +1605,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 	return p;
     else if (blk_sz < old_blk_sz) {
 	/* Shrink block... */
+	Carrier_t* crr;
 	Block_t *nxt_nxt_blk;
 	Uint diff_sz_val = old_blk_sz - blk_sz;
 	Uint old_blk_sz_val = old_blk_sz;
@@ -1516,16 +1625,18 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 		return NULL;
 
 	    cand_blk_sz = old_blk_sz;
-	    if (!IS_PREV_BLK_FREE(blk) || IS_FIRST_BLK(blk))
+	    if (!IS_PREV_BLK_FREE(blk)) {
 		cand_blk = blk;
+	    }
 	    else {
+		ASSERT(!IS_MBC_FIRST_ABLK(allctr, blk));
 		cand_blk = PREV_BLK(blk);
 		cand_blk_sz += PREV_BLK_SZ(blk);
 	    }
 	    if (!is_last_blk) {
-		nxt_blk = NXT_BLK(blk);
+		nxt_blk = BLK_AFTER(blk, old_blk_sz);
 		if (IS_FREE_BLK(nxt_blk))
-		    cand_blk_sz += BLK_SZ(nxt_blk);
+		    cand_blk_sz += MBC_FBLK_SZ(nxt_blk);
 	    }
 
 	    new_blk = (*allctr->get_free_block)(allctr,
@@ -1541,52 +1652,48 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 
 	nxt_blk_sz = old_blk_sz - blk_sz;
 
-	if ((is_last_blk || IS_ALLOCED_BLK(NXT_BLK(blk)))
+	if ((is_last_blk || IS_ALLOCED_BLK(BLK_AFTER(blk,old_blk_sz)))
 	    && (nxt_blk_sz < allctr->min_block_size))
 	    return p;
 
 	HARD_CHECK_BLK_CARRIER(allctr, blk);
 
-	SET_BLK_SZ(blk, blk_sz);
+	nxt_nxt_blk = BLK_AFTER(blk, old_blk_sz);
+
+	SET_MBC_ABLK_SZ(blk, blk_sz);
 	SET_NOT_LAST_BLK(blk);
 
-	nxt_blk = NXT_BLK(blk);
-	SET_BLK_HDR(nxt_blk,
-		    nxt_blk_sz,
-		    SBH_THIS_FREE|SBH_PREV_ALLOCED|SBH_NOT_LAST_BLK);
+	nxt_blk = BLK_AFTER(blk, blk_sz);
 
 	STAT_MBC_BLK_FREE(allctr, old_blk_sz, alcu_flgs);
 	STAT_MBC_BLK_ALLOC(allctr, blk_sz, alcu_flgs);
 
-	ASSERT(BLK_SZ(blk) >= allctr->min_block_size);
+	ASSERT(MBC_BLK_SZ(blk) >= allctr->min_block_size);
 
-	if (is_last_blk)
-	    SET_LAST_BLK(nxt_blk);
-	else {
-	    nxt_nxt_blk = NXT_BLK(nxt_blk);
+	if (!is_last_blk) {
 	    if (IS_FREE_BLK(nxt_nxt_blk)) {
 		/* Coalesce with next free block... */
-		nxt_blk_sz += BLK_SZ(nxt_nxt_blk);
+		nxt_blk_sz += MBC_FBLK_SZ(nxt_nxt_blk);
 		(*allctr->unlink_free_block)(allctr, nxt_nxt_blk, alcu_flgs);
-		SET_BLK_SZ(nxt_blk, nxt_blk_sz);
 
-		is_last_blk = IS_LAST_BLK(nxt_nxt_blk);
-		if (is_last_blk)
-		    SET_LAST_BLK(nxt_blk);
-		else
-		    SET_BLK_SZ_FTR(nxt_blk, nxt_blk_sz);
+		is_last_blk = GET_LAST_BLK_HDR_FLG(nxt_nxt_blk);
 	    }
 	    else {
-		SET_BLK_SZ_FTR(nxt_blk, nxt_blk_sz);
-		SET_PREV_BLK_FREE(nxt_nxt_blk);
+		SET_PREV_BLK_FREE(allctr, nxt_nxt_blk);
 	    }
+	    SET_BLK_SZ_FTR(nxt_blk, nxt_blk_sz);
 	}
 
+	crr = ABLK_TO_MBC(blk);
+	SET_MBC_FBLK_HDR(nxt_blk, nxt_blk_sz,
+			SBH_THIS_FREE | (is_last_blk ? SBH_LAST_BLK : 0),
+			crr);
+
 	(*allctr->link_free_block)(allctr, nxt_blk, alcu_flgs);
 
 
 	ASSERT(IS_ALLOCED_BLK(blk));
-	ASSERT(blk_sz == BLK_SZ(blk));
+	ASSERT(blk_sz == MBC_BLK_SZ(blk));
 	ASSERT(blk_sz % sizeof(Unit_t) == 0);
 	ASSERT(blk_sz >= allctr->min_block_size);
 	ASSERT(blk_sz >= size + ABLK_HDR_SZ);
@@ -1594,14 +1701,15 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
     
 	ASSERT(IS_FREE_BLK(nxt_blk));
 	ASSERT(IS_PREV_BLK_ALLOCED(nxt_blk));
-	ASSERT(nxt_blk_sz == BLK_SZ(nxt_blk));
+	ASSERT(nxt_blk_sz == MBC_BLK_SZ(nxt_blk));
 	ASSERT(nxt_blk_sz % sizeof(Unit_t) == 0);
 	ASSERT(nxt_blk_sz >= allctr->min_block_size);
 	ASSERT(IS_MBC_BLK(nxt_blk));
 	ASSERT(is_last_blk ? IS_LAST_BLK(nxt_blk) : IS_NOT_LAST_BLK(nxt_blk));
 	ASSERT(is_last_blk || nxt_blk == PREV_BLK(NXT_BLK(nxt_blk)));
 	ASSERT(is_last_blk || IS_PREV_BLK_FREE(NXT_BLK(nxt_blk)));
-
+	ASSERT(FBLK_TO_MBC(nxt_blk) == crr);
+		    
 	HARD_CHECK_BLK_CARRIER(allctr, blk);
 
 	return p;
@@ -1610,8 +1718,8 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
     /* Need larger block... */
 
     if (!is_last_blk) {
-	nxt_blk = NXT_BLK(blk);
-	nxt_blk_sz = BLK_SZ(nxt_blk);
+	nxt_blk = BLK_AFTER(blk, old_blk_sz);
+	nxt_blk_sz = MBC_BLK_SZ(nxt_blk);
 	if (IS_FREE_BLK(nxt_blk) && get_blk_sz <= old_blk_sz + nxt_blk_sz) {
 	    /* Grow into next block... */
 
@@ -1624,7 +1732,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 	    if (nxt_blk_sz < allctr->min_block_size) {
 		blk_sz += nxt_blk_sz;
 
-		SET_BLK_SZ(blk, blk_sz);
+		SET_MBC_ABLK_SZ(blk, blk_sz);
 
 		if (is_last_blk) {
 		    SET_LAST_BLK(blk);
@@ -1633,21 +1741,20 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 #endif
 		}
 		else {
-		    nxt_blk = NXT_BLK(blk);
+		    nxt_blk = BLK_AFTER(blk, blk_sz);
 		    SET_PREV_BLK_ALLOCED(nxt_blk);
 #ifdef DEBUG
 		    is_last_blk = IS_LAST_BLK(nxt_blk);
-		    nxt_blk_sz = BLK_SZ(nxt_blk);
+		    nxt_blk_sz = MBC_BLK_SZ(nxt_blk);
 #endif
 		}
 	    }
 	    else {
-		SET_BLK_SZ(blk, blk_sz);
+		Carrier_t* crr = ABLK_TO_MBC(blk);
+		SET_MBC_ABLK_SZ(blk, blk_sz);
 
-		nxt_blk = NXT_BLK(blk);
-		SET_BLK_HDR(nxt_blk,
-			    nxt_blk_sz,
-			    SBH_THIS_FREE|SBH_PREV_ALLOCED|SBH_NOT_LAST_BLK);
+		nxt_blk = BLK_AFTER(blk, blk_sz);
+		SET_MBC_FBLK_HDR(nxt_blk, nxt_blk_sz, SBH_THIS_FREE, crr);
 
 		if (is_last_blk)
 		    SET_LAST_BLK(nxt_blk);
@@ -1657,6 +1764,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 		(*allctr->link_free_block)(allctr, nxt_blk, alcu_flgs);
 
 		ASSERT(IS_FREE_BLK(nxt_blk));
+		ASSERT(FBLK_TO_MBC(nxt_blk) == crr);
 	    }
 
 	    STAT_MBC_BLK_FREE(allctr, old_blk_sz, alcu_flgs);
@@ -1664,14 +1772,14 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 
 
 	    ASSERT(IS_ALLOCED_BLK(blk));
-	    ASSERT(blk_sz == BLK_SZ(blk));
+	    ASSERT(blk_sz == MBC_BLK_SZ(blk));
 	    ASSERT(blk_sz % sizeof(Unit_t) == 0);
 	    ASSERT(blk_sz >= allctr->min_block_size);
 	    ASSERT(blk_sz >= size + ABLK_HDR_SZ);
 	    ASSERT(IS_MBC_BLK(blk));
 
 	    ASSERT(!nxt_blk || IS_PREV_BLK_ALLOCED(nxt_blk));
-	    ASSERT(!nxt_blk || nxt_blk_sz == BLK_SZ(nxt_blk));
+	    ASSERT(!nxt_blk || nxt_blk_sz == MBC_BLK_SZ(nxt_blk));
 	    ASSERT(!nxt_blk || nxt_blk_sz % sizeof(Unit_t) == 0);
 	    ASSERT(!nxt_blk || nxt_blk_sz >= allctr->min_block_size);
 	    ASSERT(!nxt_blk || IS_MBC_BLK(nxt_blk));
@@ -1696,18 +1804,19 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 
     /* Need to grow in another block */
 
-    if (!IS_PREV_BLK_FREE(blk) || IS_FIRST_BLK(blk)) {
+    if (!IS_PREV_BLK_FREE(blk)) {
 	cand_blk = NULL;
 	cand_blk_sz = 0;
     }
     else {
+	ASSERT(!IS_MBC_FIRST_ABLK(allctr, blk));
 	cand_blk = PREV_BLK(blk);
 	cand_blk_sz = old_blk_sz + PREV_BLK_SZ(blk);
 
 	if (!is_last_blk) {
-	    nxt_blk = NXT_BLK(blk);
+	    nxt_blk = BLK_AFTER(blk, old_blk_sz);
 	    if (IS_FREE_BLK(nxt_blk))
-		cand_blk_sz += BLK_SZ(nxt_blk);
+		cand_blk_sz += MBC_FBLK_SZ(nxt_blk);
 	}
     }
 
@@ -1743,8 +1852,9 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 	if (new_blk) {
 	    mbc_alloc_finalize(allctr,
 			       new_blk,
-			       BLK_SZ(new_blk),
+			       MBC_FBLK_SZ(new_blk),
 			       GET_BLK_HDR_FLGS(new_blk),
+			       FBLK_TO_MBC(new_blk),
 			       blk_sz,
 			       1,
 			       alcu_flgs);
@@ -1754,6 +1864,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 	    return new_p;
 	}
 	else {
+	    Carrier_t* crr;
 	    Uint new_blk_sz;
 	    UWord new_blk_flgs;
 	    Uint prev_blk_sz;
@@ -1774,10 +1885,10 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 	    if (is_last_blk) 
 		new_blk_flgs |= LAST_BLK_HDR_FLG;
 	    else {
-		nxt_blk = NXT_BLK(blk);
+		nxt_blk = BLK_AFTER(blk, old_blk_sz);
 		if (IS_FREE_BLK(nxt_blk)) {
 		    new_blk_flgs |= GET_LAST_BLK_HDR_FLG(nxt_blk);
-		    new_blk_sz += BLK_SZ(nxt_blk);
+		    new_blk_sz += MBC_FBLK_SZ(nxt_blk);
 		    (*allctr->unlink_free_block)(allctr, nxt_blk, alcu_flgs);
 		}
 	    }
@@ -1790,6 +1901,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 
 	    new_p = BLK2UMEM(new_blk);
 	    blk_cpy_sz = MIN(blk_sz, old_blk_sz);
+	    crr = FBLK_TO_MBC(new_blk);
 
 	    if (prev_blk_sz >= blk_cpy_sz)
 		sys_memcpy(new_p, p, blk_cpy_sz - ABLK_HDR_SZ);
@@ -1800,6 +1912,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 			       new_blk,
 			       new_blk_sz,
 			       new_blk_flgs,
+			       crr,
 			       blk_sz,
 			       0,
 			       alcu_flgs);
@@ -1815,35 +1928,40 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs)
 #ifdef DEBUG
 
 #if HAVE_ERTS_MSEG
-#define ASSERT_MSEG_UNIT_SIZE_MULTIPLE(CSZ) ASSERT((CSZ) % mseg_unit_size == 0)
+#define ASSERT_MSEG_UNIT_SIZE_MULTIPLE(CSZ) ASSERT((CSZ) % MSEG_UNIT_SZ == 0)
 #else
 #define ASSERT_MSEG_UNIT_SIZE_MULTIPLE(CSZ)
 #endif
 
-#define CHECK_1BLK_CARRIER(A, SBC, MSEGED, C, CSZ, B, BSZ)		\
-do {									\
-    ASSERT(IS_FIRST_BLK((B)));						\
-    ASSERT(IS_LAST_BLK((B)));						\
-    ASSERT((CSZ) == CARRIER_SZ((C)));					\
-    ASSERT((BSZ) == BLK_SZ((B)));					\
-    ASSERT((BSZ) % sizeof(Unit_t) == 0);				\
-    if ((SBC)) {							\
-	ASSERT(IS_SBC_BLK((B)));					\
-	ASSERT(IS_SB_CARRIER((C)));					\
-    }									\
-    else {								\
-	ASSERT(IS_MBC_BLK((B)));					\
-	ASSERT(IS_MB_CARRIER((C)));					\
-    }									\
-    if ((MSEGED)) {							\
-	ASSERT(IS_MSEG_CARRIER((C)));					\
-	ASSERT_MSEG_UNIT_SIZE_MULTIPLE((CSZ));				\
-    }									\
-    else {								\
-	ASSERT(IS_SYS_ALLOC_CARRIER((C)));					\
-	ASSERT((CSZ) % sizeof(Unit_t) == 0);				\
-    }									\
-} while (0)
+static void CHECK_1BLK_CARRIER(Allctr_t* A, int SBC, int MSEGED, Carrier_t* C,
+			       UWord CSZ, Block_t* B, UWord BSZ) 
+{
+    ASSERT(IS_LAST_BLK((B)));
+    ASSERT((CSZ) == CARRIER_SZ((C)));
+    ASSERT((BSZ) % sizeof(Unit_t) == 0);
+    if ((SBC)) {
+	ASSERT((BSZ) == SBC_BLK_SZ((B)));
+	ASSERT((char*)B == (char*)C + SBC_HEADER_SIZE);
+	ASSERT(IS_SBC_BLK((B)));
+	ASSERT(IS_SB_CARRIER((C)));
+    }
+    else {
+	ASSERT(IS_FREE_BLK(B));
+	ASSERT((BSZ) == MBC_FBLK_SZ((B)));
+	ASSERT(IS_MBC_FIRST_FBLK(A, (B)));
+	ASSERT(IS_MBC_BLK((B)));
+	ASSERT(IS_MB_CARRIER((C)));
+	ASSERT(FBLK_TO_MBC(B) == (C));
+    }
+    if ((MSEGED)) {
+	ASSERT(IS_MSEG_CARRIER((C)));
+	ASSERT_MSEG_UNIT_SIZE_MULTIPLE((CSZ));
+    }
+    else {
+	ASSERT(IS_SYS_ALLOC_CARRIER((C)));
+	ASSERT((CSZ) % sizeof(Unit_t) == 0);
+    }
+}
 
 #else
 #define CHECK_1BLK_CARRIER(A, SBC, MSEGED, C, CSZ, B, BSZ)
@@ -1865,37 +1983,18 @@ create_sbmbc(Allctr_t *allctr, Uint umem_sz)
 	crr = erts_alloc(ERTS_ALC_T_SBMBC, crr_sz);
 
     INC_CC(allctr->calls.sbmbc_alloc);
-    SET_CARRIER_HDR(crr, crr_sz, SCH_SYS_ALLOC|SCH_MBC);
-
-    blk = MBC2FBLK(allctr, crr);
+    SET_CARRIER_HDR(crr, crr_sz, SCH_SYS_ALLOC|SCH_MBC, allctr);
 
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-    if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	crr_sz -= sizeof(UWord);
-#endif
+    blk = MBC_TO_FIRST_BLK(allctr, crr);
 
-    blk_sz = UNIT_FLOOR(crr_sz - allctr->mbc_header_size);
+    blk_sz = UNIT_FLOOR(crr_sz - MBC_HEADER_SIZE(allctr));
 
-    SET_MBC_BLK_FTR(((UWord *) blk)[-1]);
-    SET_BLK_HDR(blk, blk_sz, SBH_THIS_FREE|SBH_PREV_FREE|SBH_LAST_BLK);
-
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-    *((Carrier_t **) NXT_BLK(blk)) = crr;
-#endif
+    SET_MBC_FBLK_HDR(blk, blk_sz, SBH_THIS_FREE|SBH_LAST_BLK, crr);
 
     link_carrier(&allctr->sbmbc_list, crr);
 
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-    if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	crr_sz += sizeof(UWord);
-#endif
-
     STAT_SBMBC_ALLOC(allctr, crr_sz);
     CHECK_1BLK_CARRIER(allctr, 0, 0, crr, crr_sz, blk, blk_sz);
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-    if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	crr_sz -= sizeof(UWord);
-#endif
     if (allctr->creating_mbc)
 	(*allctr->creating_mbc)(allctr, crr, ERTS_ALCU_FLG_SBMBC);
 
@@ -1909,11 +2008,10 @@ destroy_sbmbc(Allctr_t *allctr, Block_t *blk)
     Uint crr_sz;
     Carrier_t *crr;
 
-    ASSERT(IS_FIRST_BLK(blk));
-
     ASSERT(IS_MBC_BLK(blk));
+    ASSERT(IS_MBC_FIRST_FBLK(allctr, blk));
 
-    crr = FBLK2MBC(allctr, blk);
+    crr = FIRST_BLK_TO_MBC(allctr, blk);
     crr_sz = CARRIER_SZ(crr);
 
 #ifdef DEBUG
@@ -1952,14 +2050,25 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
     Uint blk_sz, bcrr_sz, crr_sz;
 #if HAVE_ERTS_MSEG
     int have_tried_sys_alloc = 0, have_tried_mseg = 0;
+    Uint mseg_flags;
 #endif
 #ifdef DEBUG
     int is_mseg = 0;
 #endif
 
+#if HALFWORD_HEAP
+    flags |= CFLG_FORCE_MSEG;
+#elif HAVE_SUPER_ALIGNED_MB_CARRIERS
+    if (flags & CFLG_MBC) {
+	flags |= CFLG_FORCE_MSEG;
+    }
+#endif
+
     ASSERT((flags & CFLG_SBC && !(flags & CFLG_MBC))
 	   || (flags & CFLG_MBC && !(flags & CFLG_SBC)));
 
+    ASSERT(!(flags & CFLG_FORCE_MSEG && flags & CFLG_FORCE_SYS_ALLOC));
+
     blk_sz = UMEMSZ2BLKSZ(allctr, umem_sz);
 
 #if HAVE_ERTS_MSEG
@@ -1974,29 +2083,27 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 	if (allctr->sbcs.curr.norm.mseg.no >= allctr->max_mseg_sbcs)
 	    goto try_sys_alloc;
     }
+#if !HAVE_SUPER_ALIGNED_MB_CARRIERS
     else {
 	if (allctr->mbcs.curr.norm.mseg.no >= allctr->max_mseg_mbcs)
 	    goto try_sys_alloc;
     }
+#endif
 
  try_mseg:
 
     if (flags & CFLG_SBC) {
-	crr_sz = blk_sz + allctr->sbc_header_size;
+	crr_sz = blk_sz + SBC_HEADER_SIZE;
+	mseg_flags = ERTS_MSEG_FLG_NONE;
     }
     else {
 	crr_sz = (*allctr->get_next_mbc_size)(allctr);
-	if (crr_sz < allctr->mbc_header_size + blk_sz)
-	    crr_sz = allctr->mbc_header_size + blk_sz;
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-	if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	    crr_sz += sizeof(UWord);
-#endif
+	if (crr_sz < MBC_HEADER_SIZE(allctr) + blk_sz)
+	    crr_sz = MBC_HEADER_SIZE(allctr) + blk_sz;
+	mseg_flags = ERTS_MSEG_FLG_2POW;
     }
-    crr_sz = MSEG_UNIT_CEILING(crr_sz);
-    ASSERT(crr_sz % mseg_unit_size == 0);
 
-    crr = (Carrier_t *) alcu_mseg_alloc(allctr, &crr_sz);
+    crr = (Carrier_t *) alcu_mseg_alloc(allctr, &crr_sz, mseg_flags);
     if (!crr) {
 	have_tried_mseg = 1;
 	if (!(have_tried_sys_alloc || flags & CFLG_FORCE_MSEG))
@@ -2008,32 +2115,31 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
     is_mseg = 1;
 #endif
     if (flags & CFLG_SBC) {
-	SET_CARRIER_HDR(crr, crr_sz, SCH_MSEG|SCH_SBC);
+	SET_CARRIER_HDR(crr, crr_sz, SCH_MSEG|SCH_SBC, allctr);
 	STAT_MSEG_SBC_ALLOC(allctr, crr_sz, blk_sz);
 	goto sbc_final_touch;
     }
     else {
-	SET_CARRIER_HDR(crr, crr_sz, SCH_MSEG|SCH_MBC);
+#ifndef ARCH_64
+	ASSERT(crr_sz <= MBC_SZ_MAX_LIMIT);
+#endif
+	SET_CARRIER_HDR(crr, crr_sz, SCH_MSEG|SCH_MBC, allctr);
 	STAT_MSEG_MBC_ALLOC(allctr, crr_sz);
 	goto mbc_final_touch;
     }
 
  try_sys_alloc:
+
 #endif /* #if HAVE_ERTS_MSEG */
 
     if (flags & CFLG_SBC) {
-	bcrr_sz = blk_sz + allctr->sbc_header_size;
+	bcrr_sz = blk_sz + SBC_HEADER_SIZE;
     }
     else {
-	bcrr_sz = allctr->mbc_header_size + blk_sz;
+	bcrr_sz = MBC_HEADER_SIZE(allctr) + blk_sz;
 	if (!(flags & CFLG_MAIN_CARRIER)
 	    && bcrr_sz < allctr->smallest_mbc_size)
 	    bcrr_sz = allctr->smallest_mbc_size;
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-	if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	    bcrr_sz += sizeof(UWord);
-#endif
-
     }
 
     crr_sz = (flags & CFLG_FORCE_SIZE
@@ -2057,7 +2163,7 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 	}
     }
     if (flags & CFLG_SBC) {
-	SET_CARRIER_HDR(crr, crr_sz, SCH_SYS_ALLOC|SCH_SBC);
+	SET_CARRIER_HDR(crr, crr_sz, SCH_SYS_ALLOC|SCH_SBC, allctr);
 	STAT_SYS_ALLOC_SBC_ALLOC(allctr, crr_sz, blk_sz);
 
 #if HAVE_ERTS_MSEG
@@ -2066,8 +2172,7 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 
 	blk = SBC2BLK(allctr, crr);
 
-	SET_SBC_BLK_FTR(((UWord *) blk)[-1]);
-	SET_BLK_HDR(blk, blk_sz, SBH_THIS_ALLOCED|SBH_PREV_FREE|SBH_LAST_BLK);
+	SET_SBC_BLK_HDR(blk, blk_sz);
 
 	link_carrier(&allctr->sbc_list, crr);
 
@@ -2075,28 +2180,18 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 
     }
     else {
-	SET_CARRIER_HDR(crr, crr_sz, SCH_SYS_ALLOC|SCH_MBC);
+	SET_CARRIER_HDR(crr, crr_sz, SCH_SYS_ALLOC|SCH_MBC, allctr);
 	STAT_SYS_ALLOC_MBC_ALLOC(allctr, crr_sz);
 
 #if HAVE_ERTS_MSEG
     mbc_final_touch:
 #endif
 
-	blk = MBC2FBLK(allctr, crr);
-
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-	if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	    crr_sz -= sizeof(UWord);
-#endif
-
-	blk_sz = UNIT_FLOOR(crr_sz - allctr->mbc_header_size);
+	blk = MBC_TO_FIRST_BLK(allctr, crr);
 
-	SET_MBC_BLK_FTR(((UWord *) blk)[-1]);
-	SET_BLK_HDR(blk, blk_sz, SBH_THIS_FREE|SBH_PREV_FREE|SBH_LAST_BLK);
+	blk_sz = UNIT_FLOOR(crr_sz - MBC_HEADER_SIZE(allctr));
 
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-	*((Carrier_t **) NXT_BLK(blk)) = crr;
-#endif
+	SET_MBC_FBLK_HDR(blk, blk_sz, SBH_THIS_FREE|SBH_LAST_BLK, crr);
 
 	if (flags & CFLG_MAIN_CARRIER) {
 	    ASSERT(!allctr->main_carrier);
@@ -2105,15 +2200,7 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 
 	link_carrier(&allctr->mbc_list, crr);
 
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-	if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	    crr_sz += sizeof(UWord);
-#endif
 	CHECK_1BLK_CARRIER(allctr, 0, is_mseg, crr, crr_sz, blk, blk_sz);
-#ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
-	if (allctr->mbc_header_size % sizeof(Unit_t) == 0)
-	    crr_sz -= sizeof(UWord);
-#endif
 	if (allctr->creating_mbc)
 	    (*allctr->creating_mbc)(allctr, crr, 0);
 
@@ -2142,8 +2229,8 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 
     HARD_CHECK_BLK_CARRIER(allctr, old_blk);
 
-    old_blk_sz = BLK_SZ(old_blk);
-    old_crr = BLK2SBC(allctr, old_blk);
+    old_blk_sz = SBC_BLK_SZ(old_blk);
+    old_crr = BLK_TO_SBC(old_blk);
     old_crr_sz = CARRIER_SZ(old_crr);
     ASSERT(IS_SB_CARRIER(old_crr));
     ASSERT(IS_SBC_BLK(old_blk));
@@ -2157,7 +2244,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 
 	if (!(flags & CFLG_FORCE_SYS_ALLOC)) {
 
-	    new_crr_sz = new_blk_sz + allctr->sbc_header_size;
+	    new_crr_sz = new_blk_sz + SBC_HEADER_SIZE;
 	    new_crr_sz = MSEG_UNIT_CEILING(new_crr_sz);
 	    new_crr = (Carrier_t *) alcu_mseg_realloc(allctr,
 						      old_crr,
@@ -2166,7 +2253,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 	    if (new_crr) {
 		SET_CARRIER_SZ(new_crr, new_crr_sz);
 		new_blk = SBC2BLK(allctr, new_crr);
-		SET_BLK_SZ(new_blk, new_blk_sz);
+		SET_SBC_BLK_SZ(new_blk, new_blk_sz);
 		STAT_MSEG_SBC_ALLOC(allctr, new_crr_sz, new_blk_sz);
 		relink_carrier(&allctr->sbc_list, new_crr);
 		CHECK_1BLK_CARRIER(allctr, 1, 1, new_crr, new_crr_sz,
@@ -2174,6 +2261,11 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 		DEBUG_SAVE_ALIGNMENT(new_crr);
 		return new_blk;
 	    }
+#if HALFWORD_HEAP
+	    /* Old carrier unchanged; restore stat */
+	    STAT_MSEG_SBC_ALLOC(allctr, old_crr_sz, old_blk_sz);
+	    return NULL;
+#endif	    
 	    create_flags |= CFLG_FORCE_SYS_ALLOC; /* since mseg_realloc()
 						     failed */
 	}
@@ -2196,7 +2288,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
     else {
 	if (!(flags & CFLG_FORCE_MSEG)) {
 #endif /* #if HAVE_ERTS_MSEG */
-	    new_bcrr_sz = new_blk_sz + allctr->sbc_header_size;
+	    new_bcrr_sz = new_blk_sz + SBC_HEADER_SIZE;
 	    new_crr_sz = (flags & CFLG_FORCE_SIZE
 			  ? UNIT_CEILING(new_bcrr_sz)
 			  : SYS_ALLOC_CARRIER_CEILING(new_bcrr_sz));
@@ -2208,7 +2300,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 	    sys_realloc_success:
 		SET_CARRIER_SZ(new_crr, new_crr_sz);
 		new_blk = SBC2BLK(allctr, new_crr);
-		SET_BLK_SZ(new_blk, new_blk_sz);
+		SET_SBC_BLK_SZ(new_blk, new_blk_sz);
 		STAT_SYS_ALLOC_SBC_FREE(allctr, old_crr_sz, old_blk_sz);
 		STAT_SYS_ALLOC_SBC_ALLOC(allctr, new_crr_sz, new_blk_sz);
 		relink_carrier(&allctr->sbc_list, new_crr);
@@ -2218,7 +2310,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 		return new_blk;
 	    }
 	    else if (new_crr_sz > UNIT_CEILING(new_bcrr_sz)) {
-		new_crr_sz = new_blk_sz + allctr->sbc_header_size;
+		new_crr_sz = new_blk_sz + SBC_HEADER_SIZE;
 		new_crr_sz = UNIT_CEILING(new_crr_sz);
 		new_crr = (Carrier_t *) alcu_sys_realloc(allctr,
 							 (void *) old_crr,
@@ -2262,11 +2354,9 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk)
     Uint is_mseg = 0;
 #endif
 
-    ASSERT(IS_FIRST_BLK(blk));
-
     if (IS_SBC_BLK(blk)) {
-	Uint blk_sz = BLK_SZ(blk);
-	crr = BLK2SBC(allctr, blk);
+	Uint blk_sz = SBC_BLK_SZ(blk);
+	crr = BLK_TO_SBC(blk);
 	crr_sz = CARRIER_SZ(crr);
 
 	ASSERT(IS_LAST_BLK(blk));
@@ -2276,7 +2366,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk)
 #if HAVE_ERTS_MSEG
 	if (IS_MSEG_CARRIER(crr)) {
 	    is_mseg++;
-	    ASSERT(crr_sz % mseg_unit_size == 0);
+	    ASSERT(crr_sz % MSEG_UNIT_SZ == 0);
 	    STAT_MSEG_SBC_FREE(allctr, crr_sz, blk_sz);
 	}
 	else
@@ -2287,7 +2377,8 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk)
 
     }
     else {
-	crr = FBLK2MBC(allctr, blk);
+	ASSERT(IS_MBC_FIRST_FBLK(allctr, blk));
+	crr = FIRST_BLK_TO_MBC(allctr, blk);
 	crr_sz = CARRIER_SZ(crr);
 
 #ifdef DEBUG
@@ -2305,7 +2396,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk)
 #if HAVE_ERTS_MSEG
 	if (IS_MSEG_CARRIER(crr)) {
 	    is_mseg++;
-	    ASSERT(crr_sz % mseg_unit_size == 0);
+	    ASSERT(crr_sz % MSEG_UNIT_SZ == 0);
 	    STAT_MSEG_MBC_FREE(allctr, crr_sz);
 	}
 	else
@@ -3430,12 +3521,7 @@ do_erts_alcu_alloc(ErtsAlcType_t type, void *extra, Uint size)
 	if (allctr->dd.use)
 	    ERTS_ALCU_HANDLE_DD_IN_OP(allctr, 1);
 #endif
-#if HALFWORD_HEAP
-	blk = create_carrier(allctr, size,
-			     CFLG_SBC | CFLG_FORCE_MSEG);
-#else
 	blk = create_carrier(allctr, size, CFLG_SBC);
-#endif
 	res = blk ? BLK2UMEM(blk) : NULL;
     }
     else
@@ -3506,24 +3592,20 @@ erts_alcu_alloc_thr_spec(ErtsAlcType_t type, void *extra, Uint size)
 void *
 erts_alcu_alloc_thr_pref(ErtsAlcType_t type, void *extra, Uint size)
 {
-    int pref_ix;
     Allctr_t *pref_allctr;
     void *res;
 
-    pref_ix = get_pref_allctr(extra, &pref_allctr);
+    pref_allctr = get_pref_allctr(extra);
 
     if (pref_allctr->thread_safe)
 	erts_mtx_lock(&pref_allctr->mutex);
 
     ERTS_ALCU_DBG_CHK_THR_ACCESS(pref_allctr);
 
-    res = do_erts_alcu_alloc(type, pref_allctr, size + sizeof(UWord));
+    res = do_erts_alcu_alloc(type, pref_allctr, size);
     if (pref_allctr->thread_safe)
 	erts_mtx_unlock(&pref_allctr->mutex);
 
-    if (res)
-	res = put_used_allctr(res, pref_ix, size);
-
     DEBUG_CHECK_ALIGNMENT(res);
 
 
@@ -3644,21 +3726,20 @@ erts_alcu_free_thr_pref(ErtsAlcType_t type, void *extra, void *p)
 {
     if (p) {
 	Allctr_t *pref_allctr, *used_allctr;
-	void *ptr;
 
-	get_pref_allctr(extra, &pref_allctr);
-	ptr = get_used_allctr(extra, p, &used_allctr, NULL);
+	pref_allctr = get_pref_allctr(extra);
+	used_allctr = get_used_allctr(extra, p, NULL);
 	if (pref_allctr != used_allctr)
 	    enqueue_dealloc_other_instance(type,
 					   used_allctr,
-					   ptr,
+					   p,
 					   (used_allctr->dd.ix
 					    - pref_allctr->dd.ix));
 	else {
 	    if (used_allctr->thread_safe)
 		erts_mtx_lock(&used_allctr->mutex);
 	    ERTS_ALCU_DBG_CHK_THR_ACCESS(used_allctr);
-	    do_erts_alcu_free(type, used_allctr, ptr);
+	    do_erts_alcu_free(type, used_allctr, p);
 	    if (used_allctr->thread_safe)
 		erts_mtx_unlock(&used_allctr->mutex);
 	}
@@ -3739,13 +3820,13 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 	if (IS_MBC_BLK(blk))
 	    res = mbc_realloc(allctr, p, size, alcu_flgs);
 	else {
-	    Uint used_sz = allctr->sbc_header_size + ABLK_HDR_SZ + size;
+	    Uint used_sz = SBC_HEADER_SIZE + ABLK_HDR_SZ + size;
 	    Uint crr_sz;
 	    Uint diff_sz_val;
 	    Uint crr_sz_val;
 
 #if HAVE_ERTS_MSEG
-	    if (IS_SYS_ALLOC_CARRIER(BLK2SBC(allctr, blk)))
+	    if (IS_SYS_ALLOC_CARRIER(BLK_TO_SBC(blk)))
 #endif
 		crr_sz = SYS_ALLOC_CARRIER_CEILING(used_sz);
 #if HAVE_ERTS_MSEG
@@ -3775,7 +3856,7 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 	    if (res) {
 		sys_memcpy((void*) res,
 			   (void*) p,
-			   MIN(BLK_SZ(blk) - ABLK_HDR_SZ, size));
+			   MIN(SBC_BLK_SZ(blk) - ABLK_HDR_SZ, size));
 		destroy_carrier(allctr, blk);
 	    }
 	}
@@ -3798,16 +3879,12 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 	else if (alcu_flgs & ERTS_ALCU_FLG_FAIL_REALLOC_MOVE)
 	    return NULL;
 	else {
-#if HALFWORD_HEAP
-	    new_blk = create_carrier(allctr, size, CFLG_SBC | CFLG_FORCE_MSEG);
-#else
 	    new_blk = create_carrier(allctr, size, CFLG_SBC);
-#endif
 	    if (new_blk) {
 		res = BLK2UMEM(new_blk);
 		sys_memcpy((void *) res,
 			   (void *) p,
-			   MIN(BLK_SZ(blk) - ABLK_HDR_SZ, size));
+			   MIN(MBC_ABLK_SZ(blk) - ABLK_HDR_SZ, size));
 		mbc_free(allctr, p);
 	    }
 	    else
@@ -3966,16 +4043,15 @@ static ERTS_INLINE void *
 realloc_thr_pref(ErtsAlcType_t type, void *extra, void *p, Uint size,
 		 int force_move)
 {
-    int pref_ix;
-    void *ptr, *res;
+    void *res;
     Allctr_t *pref_allctr, *used_allctr;
     UWord old_user_size;
 
     if (!p)
 	return erts_alcu_alloc_thr_pref(type, extra, size);
 
-    pref_ix = get_pref_allctr(extra, &pref_allctr);
-    ptr = get_used_allctr(extra, p, &used_allctr, &old_user_size);
+    pref_allctr = get_pref_allctr(extra);
+    used_allctr = get_used_allctr(extra, p, &old_user_size);
 
     ASSERT(used_allctr && pref_allctr);
 
@@ -3985,56 +4061,33 @@ realloc_thr_pref(ErtsAlcType_t type, void *extra, void *p, Uint size,
 	ERTS_ALCU_DBG_CHK_THR_ACCESS(used_allctr);
 	res = do_erts_alcu_realloc(type,
 				   used_allctr,
-				   ptr,
-				   size + sizeof(UWord),
+				   p,
+				   size,
 				   0);
 	if (used_allctr->thread_safe)
 	    erts_mtx_unlock(&used_allctr->mutex);
-	if (res)
-	    res = put_used_allctr(res, pref_ix, size);
     }
     else {
 	if (pref_allctr->thread_safe)
 	    erts_mtx_lock(&pref_allctr->mutex);
-	res = do_erts_alcu_alloc(type, pref_allctr, size + sizeof(UWord));
-	if (pref_allctr->thread_safe && (!force_move
-					 || used_allctr != pref_allctr))
+	res = do_erts_alcu_alloc(type, pref_allctr, size);
+	if (pref_allctr->thread_safe && used_allctr != pref_allctr) {
 	    erts_mtx_unlock(&pref_allctr->mutex);
+	}
 	if (res) {
-	    Block_t *blk;
-	    size_t cpy_size;
-
-	    res = put_used_allctr(res, pref_ix, size);
-
 	    DEBUG_CHECK_ALIGNMENT(res);
 
-	    blk = UMEM2BLK(ptr);
-	    if (old_user_size != ERTS_AU_PREF_ALLOC_SIZE_MASK)
-		cpy_size = old_user_size;
-	    else {
-		if (used_allctr->thread_safe && (!force_move
-						 || used_allctr != pref_allctr))
-		    erts_mtx_lock(&used_allctr->mutex);
-		ERTS_SMP_LC_ASSERT(!used_allctr->thread_safe ||
-				   erts_lc_mtx_is_locked(&used_allctr->mutex));
-		cpy_size = BLK_SZ(blk);
-		if (used_allctr->thread_safe && (!force_move
-						 || used_allctr != pref_allctr))
-		    erts_mtx_unlock(&used_allctr->mutex);
-		cpy_size -= ABLK_HDR_SZ + sizeof(UWord);
-	    }
-	    if (cpy_size > size)
-		cpy_size = size;
-	    sys_memcpy(res, p, cpy_size);
+	    sys_memcpy(res, p, MIN(size,old_user_size));
 
-	    if (!force_move || used_allctr != pref_allctr)
+	    if (used_allctr != pref_allctr) {
 		enqueue_dealloc_other_instance(type,
 					       used_allctr,
-					       ptr,
+					       p,
 					       (used_allctr->dd.ix
 						- pref_allctr->dd.ix));
+	    }
 	    else {
-		do_erts_alcu_free(type, used_allctr, ptr);
+		do_erts_alcu_free(type, used_allctr, p);
 		ASSERT(pref_allctr == used_allctr);
 		if (pref_allctr->thread_safe)
 		    erts_mtx_unlock(&pref_allctr->mutex);
@@ -4111,7 +4164,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 
     allctr->ramv			= init->ramv;
     allctr->main_carrier_size		= init->mmbcs;
-    allctr->sbc_threshold		= init->sbct;
+
 #if HAVE_ERTS_MSEG
     allctr->mseg_opt.abs_shrink_th	= init->asbcst;
     allctr->mseg_opt.rel_shrink_th	= init->rsbcst;
@@ -4120,20 +4173,29 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
     allctr->mbc_move_threshold		= init->rmbcmt;
 #if HAVE_ERTS_MSEG
     allctr->max_mseg_sbcs		= init->mmsbc;
+# if HAVE_SUPER_ALIGNED_MB_CARRIERS
+    allctr->max_mseg_mbcs		= ~(Uint)0;
+# else
     allctr->max_mseg_mbcs		= init->mmmbc;
+# endif
 #endif
 
     allctr->largest_mbc_size		= MAX(init->lmbcs, init->smbcs);
+#ifndef ARCH_64
+    if (allctr->largest_mbc_size > MBC_SZ_MAX_LIMIT) {
+	allctr->largest_mbc_size = MBC_SZ_MAX_LIMIT;
+    }
+#endif
     allctr->smallest_mbc_size		= init->smbcs;
     allctr->mbc_growth_stages		= MAX(1, init->mbcgs);
 
     if (allctr->min_block_size < ABLK_HDR_SZ)
 	goto error;
     allctr->min_block_size		= UNIT_CEILING(allctr->min_block_size
-						       + sizeof(UWord));
+						       + sizeof(FreeBlkFtr_t));
 #if ERTS_SMP
     if (init->tpref) {
-	Uint sz = sizeof(Block_t);
+	Uint sz = ABLK_HDR_SZ;
 	sz += ERTS_ALCU_DD_FIX_TYPE_OFFS*sizeof(UWord);
 	if (init->fix)
 	    sz += sizeof(UWord);
@@ -4143,6 +4205,23 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
     }
 #endif
 
+    allctr->sbc_threshold		= init->sbct;
+#ifndef ARCH_64
+    if (allctr->sbc_threshold > 0) {
+	Uint max_mbc_block_sz = UNIT_CEILING(allctr->sbc_threshold - 1 + ABLK_HDR_SZ); 
+	if (max_mbc_block_sz + UNIT_FLOOR(allctr->min_block_size - 1) > MBC_ABLK_SZ_MASK
+	    || max_mbc_block_sz < allctr->sbc_threshold) { /* wrap around */
+	    /* 
+	     * By limiting sbc_threshold to (hard limit - min_block_size)
+	     * we avoid having to split off free "residue blocks"
+	     * smaller than min_block_size.
+	     */
+	    max_mbc_block_sz = MBC_ABLK_SZ_MASK - UNIT_FLOOR(allctr->min_block_size - 1);
+	    allctr->sbc_threshold = max_mbc_block_sz - ABLK_HDR_SZ + 1;
+	}
+    }
+#endif
+
 
 
     allctr->sbmbc_threshold		= init->sbmbct;
@@ -4158,7 +4237,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 	allctr->sbmbc_size = init->sbmbcs;
 	min_size = allctr->sbmbc_threshold;
 	min_size += allctr->min_block_size;
-	min_size += allctr->mbc_header_size;
+	min_size += MBC_HEADER_SIZE(allctr);
 	if (allctr->sbmbc_size < min_size)
 	    allctr->sbmbc_size = min_size;
     }
@@ -4203,59 +4282,26 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
     if (!allctr->get_next_mbc_size)
 	allctr->get_next_mbc_size = get_next_mbc_size;
 
-    if (allctr->mbc_header_size < sizeof(Carrier_t))
-	goto error;
 #ifdef ERTS_SMP
     allctr->dd.use = 0;
     if (init->tpref) {
-	allctr->mbc_header_size = (UNIT_CEILING(allctr->mbc_header_size
-						+ FBLK_FTR_SZ
-						+ ABLK_HDR_SZ
-						+ sizeof(UWord))
-				   - ABLK_HDR_SZ
-				   - sizeof(UWord));
-	allctr->sbc_header_size = (UNIT_CEILING(sizeof(Carrier_t)
-						+ FBLK_FTR_SZ
-						+ ABLK_HDR_SZ
-						+ sizeof(UWord))
-				   - ABLK_HDR_SZ
-				   - sizeof(UWord));
-
 	allctr->dd.use = 1;
 	init_dd_queue(&allctr->dd.q);
 	allctr->dd.ix = init->ix;
     }
-    else
 #endif
-    {
-	allctr->mbc_header_size = (UNIT_CEILING(allctr->mbc_header_size
-						+ FBLK_FTR_SZ
-						+ ABLK_HDR_SZ)
-				   - ABLK_HDR_SZ);
-	allctr->sbc_header_size = (UNIT_CEILING(sizeof(Carrier_t)
-						+ FBLK_FTR_SZ
-						+ ABLK_HDR_SZ)
-				   - ABLK_HDR_SZ);
-    }
 
     if (allctr->main_carrier_size) {
 	Block_t *blk;
 
-#if HALFWORD_HEAP
-	blk = create_carrier(allctr,
-			     allctr->main_carrier_size,
-			     CFLG_MBC
-			     | CFLG_FORCE_SIZE
-			     | CFLG_FORCE_MSEG
-			     | CFLG_MAIN_CARRIER);
-#else
 	blk = create_carrier(allctr,
 			     allctr->main_carrier_size,
 			     CFLG_MBC
 			     | CFLG_FORCE_SIZE
+#if !HALFWORD_HEAP && !HAVE_SUPER_ALIGNED_MB_CARRIERS
 			     | CFLG_FORCE_SYS_ALLOC
-			     | CFLG_MAIN_CARRIER);
 #endif
+			     | CFLG_MAIN_CARRIER);
 	if (!blk)
 	    goto error;
 
@@ -4303,9 +4349,9 @@ erts_alcu_stop(Allctr_t *allctr)
     while (allctr->sbc_list.first)
 	destroy_carrier(allctr, SBC2BLK(allctr, allctr->sbc_list.first));
     while (allctr->mbc_list.first)
-	destroy_carrier(allctr, MBC2FBLK(allctr, allctr->mbc_list.first));
+	destroy_carrier(allctr, MBC_TO_FIRST_BLK(allctr, allctr->mbc_list.first));
     while (allctr->sbmbc_list.first)
-	destroy_sbmbc(allctr, MBC2FBLK(allctr, allctr->sbmbc_list.first));
+	destroy_sbmbc(allctr, MBC_TO_FIRST_BLK(allctr, allctr->sbmbc_list.first));
 
 #ifdef USE_THREADS
     if (allctr->thread_safe)
@@ -4319,17 +4365,9 @@ erts_alcu_stop(Allctr_t *allctr)
 void
 erts_alcu_init(AlcUInit_t *init)
 {
-
+    ASSERT(SBC_BLK_SZ_MASK == MBC_FBLK_SZ_MASK); /* see BLK_SZ */
 #if HAVE_ERTS_MSEG
-    mseg_unit_size = erts_mseg_unit_size();
-
-    if (mseg_unit_size % sizeof(Unit_t)) /* A little paranoid... */
-	erl_exit(-1,
-		 "Mseg unit size (%d) not evenly divideble by "
-		 "internal unit size of alloc_util (%d)\n",
-		 mseg_unit_size,
-		 sizeof(Unit_t));
-
+    ASSERT(erts_mseg_unit_size() == MSEG_UNIT_SZ);
     max_mseg_carriers = init->mmc;
     sys_alloc_carrier_size = MSEG_UNIT_CEILING(init->ycs);
 #else /* #if HAVE_ERTS_MSEG */
@@ -4372,11 +4410,10 @@ erts_alcu_test(unsigned long op, unsigned long a1, unsigned long a2)
     case 0x00b:	return (unsigned long) CARRIER_SZ((Carrier_t *) a1);
     case 0x00c:	return (unsigned long) SBC2BLK((Allctr_t *) a1,
 					       (Carrier_t *) a2);
-    case 0x00d:	return (unsigned long) BLK2SBC((Allctr_t *) a1,
-					       (Block_t *) a2);
-    case 0x00e:	return (unsigned long) MBC2FBLK((Allctr_t *) a1,
+    case 0x00d:	return (unsigned long) BLK_TO_SBC((Block_t *) a2);
+    case 0x00e:	return (unsigned long) MBC_TO_FIRST_BLK((Allctr_t *) a1,
 						(Carrier_t *) a2);
-    case 0x00f:	return (unsigned long) FBLK2MBC((Allctr_t *) a1,
+    case 0x00f:	return (unsigned long) FIRST_BLK_TO_MBC((Allctr_t *) a1,
 						(Block_t *) a2);
     case 0x010:	return (unsigned long) ((Allctr_t *) a1)->mbc_list.first;
     case 0x011:	return (unsigned long) ((Allctr_t *) a1)->mbc_list.last;
@@ -4388,7 +4425,7 @@ erts_alcu_test(unsigned long op, unsigned long a1, unsigned long a2)
     case 0x017:	return (unsigned long) ((Allctr_t *) a1)->min_block_size;
     case 0x018:	return (unsigned long) NXT_BLK((Block_t *) a1);
     case 0x019:	return (unsigned long) PREV_BLK((Block_t *) a1);
-    case 0x01a: return (unsigned long) IS_FIRST_BLK((Block_t *) a1);
+    case 0x01a: return (unsigned long) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
     case 0x01b: return (unsigned long) sizeof(Unit_t);
     default:	ASSERT(0); return ~((unsigned long) 0);
     }
@@ -4432,6 +4469,13 @@ erts_alcu_verify_unused_ts(Allctr_t *allctr)
 #endif
 }
 
+#ifdef DEBUG
+int is_sbc_blk(Block_t* blk)
+{
+    return IS_SBC_BLK(blk);
+}
+#endif
+
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
 
 static void
@@ -4441,34 +4485,37 @@ check_blk_carrier(Allctr_t *allctr, Block_t *iblk)
     CarrierList_t *cl;
 
     if (IS_SBC_BLK(iblk)) {
-	Carrier_t *sbc = BLK2SBC(allctr, iblk);
+	Carrier_t *sbc = BLK_TO_SBC(iblk);
 
 	ASSERT(SBC2BLK(allctr, sbc) == iblk);
-	ASSERT(IS_ALLOCED_BLK(iblk));
-	ASSERT(IS_FIRST_BLK(iblk));
-	ASSERT(IS_LAST_BLK(iblk));
-	ASSERT(CARRIER_SZ(sbc) - allctr->sbc_header_size >= BLK_SZ(iblk));
+	ASSERT(CARRIER_SZ(sbc) - SBC_HEADER_SIZE >= SBC_BLK_SZ(iblk));
 #if HAVE_ERTS_MSEG
 	if (IS_MSEG_CARRIER(sbc)) {
-	    ASSERT(CARRIER_SZ(sbc) % mseg_unit_size == 0);
+	    ASSERT(CARRIER_SZ(sbc) % MSEG_UNIT_SZ == 0);
 	}
 #endif
 	crr = sbc;
 	cl = &allctr->sbc_list;
     }
     else {
-	Carrier_t *mbc = NULL;
 	Block_t *prev_blk = NULL;
 	Block_t *blk;
 	char *carrier_end;
 	Uint is_free_blk;
 	Uint tot_blk_sz;
 	Uint blk_sz;
+	int has_wrapped_around = 0;
 
 	blk = iblk;
 	tot_blk_sz = 0;
+	crr = BLK_TO_MBC(blk);
+	ASSERT(IS_MB_CARRIER(crr));
 
+	/* Step around the carrier one whole lap starting at 'iblk'
+	 */
 	while (1) {
+	    ASSERT(IS_MBC_BLK(blk));
+	    ASSERT(BLK_TO_MBC(blk) == crr);
 
 	    if (prev_blk) {
 		ASSERT(NXT_BLK(prev_blk) == blk);
@@ -4481,18 +4528,16 @@ check_blk_carrier(Allctr_t *allctr, Block_t *iblk)
 		}
 	    }
 
-	    if (mbc) {
+	    if (has_wrapped_around) {
+		ASSERT(((Block_t *) crr) < blk);
 		if (blk == iblk)
 		    break;
-		ASSERT(((Block_t *) mbc) < blk && blk < iblk);
+		ASSERT(blk < iblk);
 	    }
 	    else
 		ASSERT(blk >= iblk);
 
-
-	    ASSERT(IS_MBC_BLK(blk));
-
-	    blk_sz = BLK_SZ(blk);
+	    blk_sz = MBC_BLK_SZ(blk);
 
 	    ASSERT(blk_sz % sizeof(Unit_t) == 0);
 	    ASSERT(blk_sz >= allctr->min_block_size);
@@ -4500,44 +4545,40 @@ check_blk_carrier(Allctr_t *allctr, Block_t *iblk)
 	    tot_blk_sz += blk_sz;
 
 	    is_free_blk = (int) IS_FREE_BLK(blk);
-	    if(is_free_blk) {
-		if (IS_NOT_LAST_BLK(blk))
-		    ASSERT(*((UWord *) (((char *) blk)+blk_sz-sizeof(UWord)))
-			   == blk_sz);
-	    }
+	    ASSERT(!is_free_blk
+		   || IS_LAST_BLK(blk)
+		   || PREV_BLK_SZ(((char *) blk)+blk_sz) == blk_sz);
 
 	    if (allctr->check_block)
 		(*allctr->check_block)(allctr, blk, (int) is_free_blk);
 
 	    if (IS_LAST_BLK(blk)) {
 		carrier_end = ((char *) NXT_BLK(blk));
-		mbc = *((Carrier_t **) NXT_BLK(blk));
+		has_wrapped_around = 1;
 		prev_blk = NULL;
-		blk = MBC2FBLK(allctr, mbc);
-		ASSERT(IS_FIRST_BLK(blk));
+		blk = MBC_TO_FIRST_BLK(allctr, crr);
+		ASSERT(IS_MBC_FIRST_BLK(allctr,blk));
 	    }
 	    else {
 		prev_blk = blk;
 		blk = NXT_BLK(blk);
 	    }
 	}
-
-	ASSERT(IS_MB_CARRIER(mbc));
-	ASSERT((((char *) mbc)
-		+ allctr->mbc_header_size
+	
+	ASSERT((((char *) crr)
+		+ MBC_HEADER_SIZE(allctr)
 		+ tot_blk_sz) == carrier_end);
-	ASSERT(((char *) mbc) + CARRIER_SZ(mbc) - sizeof(Unit_t) <= carrier_end
-	       && carrier_end <= ((char *) mbc) + CARRIER_SZ(mbc));
+	ASSERT(((char *) crr) + CARRIER_SZ(crr) - sizeof(Unit_t) <= carrier_end
+	       && carrier_end <= ((char *) crr) + CARRIER_SZ(crr));
 
 	if (allctr->check_mbc)
-	    (*allctr->check_mbc)(allctr, mbc);
+	    (*allctr->check_mbc)(allctr, crr);
 
 #if HAVE_ERTS_MSEG
-	if (IS_MSEG_CARRIER(mbc)) {
-	    ASSERT(CARRIER_SZ(mbc) % mseg_unit_size == 0);
+	if (IS_MSEG_CARRIER(crr)) {
+	    ASSERT(CARRIER_SZ(crr) % MSEG_UNIT_SZ == 0);
 	}
 #endif
-	crr = mbc;
 	cl = &allctr->mbc_list;
     }
 
@@ -4559,4 +4600,5 @@ check_blk_carrier(Allctr_t *allctr, Block_t *iblk)
 #endif
 }
 
-#endif
+#endif /* ERTS_ALLOC_UTIL_HARD_DEBUG */
+
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index cedf4ccf85..e0754e7f69 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -216,16 +216,40 @@ erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t);
 #define UNIT_FLOOR(X)	((X) & UNIT_MASK)
 #define UNIT_CEILING(X)	UNIT_FLOOR((X) + INV_UNIT_MASK)
 
+#define FLG_MASK		INV_UNIT_MASK
+#define SBC_BLK_SZ_MASK         UNIT_MASK
+#define MBC_FBLK_SZ_MASK        UNIT_MASK
+#define CARRIER_SZ_MASK         UNIT_MASK
 
-#define SZ_MASK			(~((UWord) 0) << 3)
-#define FLG_MASK		(~(SZ_MASK))
 
+#if HAVE_ERTS_MSEG
+#  ifdef ARCH_64 
+#    define MBC_ABLK_OFFSET_BITS   24
+#  elif HAVE_SUPER_ALIGNED_MB_CARRIERS
+#    define MBC_ABLK_OFFSET_BITS   9
+     /* Affects hard limits for sbct and lmbcs documented in erts_alloc.xml */
+#  endif
+#endif
+#ifndef MBC_ABLK_OFFSET_BITS
+#  define MBC_ABLK_OFFSET_BITS   0 /* no carrier offset in block header */
+#endif
+
+#if MBC_ABLK_OFFSET_BITS
+#  define MBC_ABLK_OFFSET_SHIFT  (sizeof(UWord)*8 - MBC_ABLK_OFFSET_BITS)
+#  define MBC_ABLK_OFFSET_MASK   (~((UWord)0) << MBC_ABLK_OFFSET_SHIFT)
+#  define MBC_ABLK_SZ_MASK	(~MBC_ABLK_OFFSET_MASK & ~FLG_MASK)
+#  define HAVE_ERTS_SBMBC 0
+#else
+#  define MBC_ABLK_SZ_MASK	(~FLG_MASK)
+#  define HAVE_ERTS_SBMBC 1
+#endif
 
-#define BLK_SZ(B) \
-  (*((Block_t *) (B)) & SZ_MASK)
+#define MBC_ABLK_SZ(B) (ASSERT_EXPR(!is_sbc_blk(B)), (B)->bhdr & MBC_ABLK_SZ_MASK)
+#define MBC_FBLK_SZ(B) (ASSERT_EXPR(!is_sbc_blk(B)), (B)->bhdr & MBC_FBLK_SZ_MASK)
+#define SBC_BLK_SZ(B) (ASSERT_EXPR(is_sbc_blk(B)), (B)->bhdr & SBC_BLK_SZ_MASK)
 
 #define CARRIER_SZ(C) \
-  ((C)->chdr & SZ_MASK)
+  ((C)->chdr & CARRIER_SZ_MASK)
 
 extern int erts_have_sbmbc_alloc;
 
@@ -236,6 +260,7 @@ struct Carrier_t_ {
     UWord chdr;
     Carrier_t *next;
     Carrier_t *prev;
+    Allctr_t  *allctr;
 };
 
 typedef struct {
@@ -243,8 +268,19 @@ typedef struct {
     Carrier_t *last;
 } CarrierList_t;
 
-typedef UWord Block_t;
-typedef UWord FreeBlkFtr_t;
+typedef struct {
+    UWord bhdr;
+#if !MBC_ABLK_OFFSET_BITS
+    Carrier_t *carrier;
+#else
+    union {
+	Carrier_t *carrier;     /* if free */
+	char       udata__[1];  /* if allocated */
+    }u;
+#endif
+} Block_t;
+
+typedef UWord FreeBlkFtr_t; /* Footer of a free block */
 
 typedef struct {
     UWord giga_no;
@@ -381,8 +417,6 @@ struct Allctr_t_ {
 #endif
 
     /* */
-    Uint		mbc_header_size;
-    Uint		sbc_header_size;
     Uint		min_mbc_size;
     Uint		min_mbc_first_free_size;
     Uint		min_block_size;
@@ -469,6 +503,9 @@ void	erts_alcu_verify_unused_ts(Allctr_t *allctr);
 
 unsigned long	erts_alcu_test(unsigned long, unsigned long, unsigned long);
 
+#ifdef DEBUG
+int is_sbc_blk(Block_t*);
+#endif
 
 
 #endif /* #if defined(GET_ERL_ALLOC_UTIL_IMPL)
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c
index 5bdb752d3a..86b4696d8f 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.c
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c
@@ -91,6 +91,7 @@ struct AOFF_RBTree_t_ {
     AOFF_RBTree_t *right;
     Uint max_sz;  /* of all blocks in this sub-tree */
 };
+#define AOFF_BLK_SZ(B) MBC_FBLK_SZ(&(B)->hdr)
 
 #ifdef HARD_DEBUG
 static AOFF_RBTree_t * check_tree(AOFF_RBTree_t* root, Uint);
@@ -102,7 +103,7 @@ static AOFF_RBTree_t * check_tree(AOFF_RBTree_t* root, Uint);
  */
 static ERTS_INLINE Uint node_max_size(AOFF_RBTree_t *x)
 {
-    Uint sz = BLK_SZ(x);
+    Uint sz = AOFF_BLK_SZ(x);
     if (x->left && x->left->max_sz > sz) {
 	sz = x->left->max_sz;
     }
@@ -183,7 +184,6 @@ erts_aoffalc_start(AOFFAllctr_t *alc,
 
     sys_memcpy((void *) alc, (void *) &zero.allctr, sizeof(AOFFAllctr_t));
 
-    allctr->mbc_header_size		= sizeof(Carrier_t);
     allctr->min_mbc_size		= MIN_MBC_SZ;
     allctr->min_mbc_first_free_size	= MIN_MBC_FIRST_FREE_SZ;
     allctr->min_block_size		= sizeof(AOFF_RBTree_t);
@@ -587,7 +587,7 @@ aoff_link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
     AOFF_RBTree_t *blk = (AOFF_RBTree_t *) block;
     AOFF_RBTree_t **root = ((flags & ERTS_ALCU_FLG_SBMBC)
 			    ? &alc->sbmbc_root : &alc->mbc_root);
-    Uint blk_sz = BLK_SZ(blk);
+    Uint blk_sz = AOFF_BLK_SZ(blk);
 
 #ifdef HARD_DEBUG
     check_tree(*root, 0);
@@ -659,7 +659,7 @@ aoff_get_free_block(Allctr_t *allctr, Uint size,
 	if (x->left && x->left->max_sz >= size) {
 	    x = x->left;
 	}
-	else if (BLK_SZ(x) >= size) {
+	else if (AOFF_BLK_SZ(x) >= size) {
 	    blk = x;
 	    break;
 	}
@@ -910,12 +910,12 @@ check_tree(AOFF_RBTree_t* root, Uint size)
 	    ASSERT(x->right > x);
 	    ASSERT(x->right->max_sz <= x->max_sz);	    
 	}
-	ASSERT(x->max_sz >= BLK_SZ(x));
-	ASSERT(x->max_sz == BLK_SZ(x)
+	ASSERT(x->max_sz >= AOFF_BLK_SZ(x));
+	ASSERT(x->max_sz == AOFF_BLK_SZ(x)
 	       || x->max_sz == (x->left ? x->left->max_sz : 0)
 	       || x->max_sz == (x->right ? x->right->max_sz : 0));
 
-	if (size && BLK_SZ(x) >= size) {
+	if (size && AOFF_BLK_SZ(x) >= size) {
 	    if (!res || x < res) {
 		res = x;
 	    }
@@ -956,7 +956,7 @@ print_tree_aux(AOFF_RBTree_t *x, int indent)
 	}
 	fprintf(stderr, "%s: sz=%lu addr=0x%lx max_size=%lu\r\n",
 		IS_BLACK(x) ? "BLACK" : "RED",
-		BLK_SZ(x), (Uint)x, x->max_sz);
+		AOFF_BLK_SZ(x), (Uint)x, x->max_sz);
 	print_tree_aux(x->left,  indent + INDENT_STEP);
     }
 }
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c
index c50fdeb4e8..743cbd93c9 100644
--- a/erts/emulator/beam/erl_bestfit_alloc.c
+++ b/erts/emulator/beam/erl_bestfit_alloc.c
@@ -73,6 +73,8 @@
 #define SET_RED(N)		(((RBTree_t *) (N))->flags |= RED_FLG)
 #define SET_BLACK(N)		(((RBTree_t *) (N))->flags &= ~RED_FLG)
 
+#define BF_BLK_SZ(B)            MBC_FBLK_SZ(&(B)->hdr)
+
 #undef ASSERT
 #define ASSERT ASSERT_EXPR
 
@@ -177,7 +179,6 @@ erts_bfalc_start(BFAllctr_t *bfallctr,
     bfallctr->address_order		= bfinit->ao;
 
 
-    allctr->mbc_header_size		= sizeof(Carrier_t);
     allctr->min_mbc_size		= MIN_MBC_SZ;
     allctr->min_mbc_first_free_size	= MIN_MBC_FIRST_FREE_SZ;
     allctr->min_block_size		= (bfinit->ao
@@ -592,7 +593,7 @@ aobf_link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
 		       ? &bfallctr->sbmbc_root
 		       : &bfallctr->mbc_root);
     RBTree_t *blk = (RBTree_t *) block;
-    Uint blk_sz = BLK_SZ(blk);
+    Uint blk_sz = BF_BLK_SZ(blk);
 
     
 
@@ -610,7 +611,7 @@ aobf_link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
 	while (1) {
 	    Uint size;
 
-	    size = BLK_SZ(x);
+	    size = BF_BLK_SZ(x);
 
 	    if (blk_sz < size || (blk_sz == size && blk < x)) {
 		if (!x->left) {
@@ -668,7 +669,7 @@ aobf_get_free_block(Allctr_t *allctr, Uint size,
     ASSERT(!cand_blk || cand_size >= size);
 
     while (x) {
-	blk_sz = BLK_SZ(x);
+	blk_sz = BF_BLK_SZ(x);
 	if (blk_sz < size) {
 	    x = x->right;
 	}
@@ -686,7 +687,7 @@ aobf_get_free_block(Allctr_t *allctr, Uint size,
 #endif
 
     if (cand_blk) {
-	blk_sz = BLK_SZ(blk);
+	blk_sz = BF_BLK_SZ(blk);
 	if (cand_size < blk_sz)
 	    return NULL; /* cand_blk was better */
 	if (cand_size == blk_sz && ((void *) cand_blk) < ((void *) blk))
@@ -711,7 +712,7 @@ bf_link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
 		       ? &bfallctr->sbmbc_root
 		       : &bfallctr->mbc_root);
     RBTree_t *blk = (RBTree_t *) block;
-    Uint blk_sz = BLK_SZ(blk);
+    Uint blk_sz = BF_BLK_SZ(blk);
 
     SET_TREE_NODE(blk);
 
@@ -730,7 +731,7 @@ bf_link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
 	while (1) {
 	    Uint size;
 
-	    size = BLK_SZ(x);
+	    size = BF_BLK_SZ(x);
 
 	    if (blk_sz == size) {
 
@@ -796,7 +797,7 @@ bf_unlink_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
     else if (LIST_NEXT(x)) {
 	/* Replace tree node by next element in list... */
 
-	ASSERT(BLK_SZ(LIST_NEXT(x)) == BLK_SZ(x));
+	ASSERT(BF_BLK_SZ(LIST_NEXT(x)) == BF_BLK_SZ(x));
 	ASSERT(IS_TREE_NODE(x));
 	ASSERT(IS_LIST_ELEM(LIST_NEXT(x)));
 
@@ -834,7 +835,7 @@ bf_get_free_block(Allctr_t *allctr, Uint size,
     ASSERT(!cand_blk || cand_size >= size);
 
     while (x) {
-	blk_sz = BLK_SZ(x);
+	blk_sz = BF_BLK_SZ(x);
 	if (blk_sz < size) {
 	    x = x->right;
 	}
@@ -855,11 +856,11 @@ bf_get_free_block(Allctr_t *allctr, Uint size,
 #ifdef HARD_DEBUG
     {
 	RBTree_t *ct_blk = check_tree(root, 0, size);
-	ASSERT(BLK_SZ(ct_blk) == BLK_SZ(blk));
+	ASSERT(BF_BLK_SZ(ct_blk) == BF_BLK_SZ(blk));
     }
 #endif
 
-    if (cand_blk && cand_size <= BLK_SZ(blk))
+    if (cand_blk && cand_size <= BF_BLK_SZ(blk))
 	return NULL; /* cand_blk was better */
 
     /* Use next block if it exist in order to avoid replacing
@@ -1093,36 +1094,36 @@ check_tree(RBTree_t *root, int ao, Uint size)
 	if (x->left) {
 	    ASSERT(x->left->parent == x);
 	    if (ao) {
-		ASSERT(BLK_SZ(x->left) < BLK_SZ(x)
-		       || (BLK_SZ(x->left) == BLK_SZ(x) && x->left < x));
+		ASSERT(BF_BLK_SZ(x->left) < BF_BLK_SZ(x)
+		       || (BF_BLK_SZ(x->left) == BF_BLK_SZ(x) && x->left < x));
 	    }
 	    else {
 		ASSERT(IS_TREE_NODE(x->left));
-		ASSERT(BLK_SZ(x->left) < BLK_SZ(x));
+		ASSERT(BF_BLK_SZ(x->left) < BF_BLK_SZ(x));
 	    }
 	}
 
 	if (x->right) {
 	    ASSERT(x->right->parent == x);
 	    if (ao) {
-		ASSERT(BLK_SZ(x->right) > BLK_SZ(x)
-		       || (BLK_SZ(x->right) == BLK_SZ(x) && x->right > x));
+		ASSERT(BF_BLK_SZ(x->right) > BF_BLK_SZ(x)
+		       || (BF_BLK_SZ(x->right) == BF_BLK_SZ(x) && x->right > x));
 	    }
 	    else {
 		ASSERT(IS_TREE_NODE(x->right));
-		ASSERT(BLK_SZ(x->right) > BLK_SZ(x));
+		ASSERT(BF_BLK_SZ(x->right) > BF_BLK_SZ(x));
 	    }
 	}
 
-	if (size && BLK_SZ(x) >= size) {
+	if (size && BF_BLK_SZ(x) >= size) {
 	    if (ao) {
 		if (!res
-		    || BLK_SZ(x) < BLK_SZ(res)
-		    || (BLK_SZ(x) == BLK_SZ(res) && x < res))
+		    || BF_BLK_SZ(x) < BF_BLK_SZ(res)
+		    || (BF_BLK_SZ(x) == BF_BLK_SZ(res) && x < res))
 		    res = x;
 	    }
 	    else {
-		if (!res || BLK_SZ(x) < BLK_SZ(res))
+		if (!res || BF_BLK_SZ(x) < BF_BLK_SZ(res))
 		    res = x;
 	    }
 	}
@@ -1168,7 +1169,7 @@ print_tree_aux(RBTree_t *x, int indent)
 	}
 	fprintf(stderr, "%s: sz=%lu addr=0x%lx\r\n",
 		IS_BLACK(x) ? "BLACK" : "RED",
-		BLK_SZ(x),
+		BF_BLK_SZ(x),
 		(Uint) x);
 	print_tree_aux(x->left,  indent + INDENT_STEP);
     }
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c
index 3f90f34736..88456a85f3 100644
--- a/erts/emulator/beam/erl_cpu_topology.c
+++ b/erts/emulator/beam/erl_cpu_topology.c
@@ -34,7 +34,7 @@
 #include "bif.h"
 #include "erl_cpu_topology.h"
 
-#define ERTS_MAX_READER_GROUPS 8
+#define ERTS_MAX_READER_GROUPS 64
 
 /*
  * Cpu topology hierarchy.
@@ -620,30 +620,38 @@ write_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size)
 int
 erts_init_scheduler_bind_type_string(char *how)
 {
+    ErtsCpuBindOrder order;
+
     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;
+	order = ERTS_CPU_BIND_NONE;
     else if (sys_strcmp(how, "db") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
+	order = ERTS_CPU_BIND_DEFAULT_BIND;
     else if (sys_strcmp(how, "s") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_SPREAD;
+	order = ERTS_CPU_BIND_SPREAD;
     else if (sys_strcmp(how, "ps") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
+	order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
     else if (sys_strcmp(how, "ts") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
+	order = ERTS_CPU_BIND_THREAD_SPREAD;
     else if (sys_strcmp(how, "tnnps") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
+	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;
+	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;
+	order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
     else if (sys_strcmp(how, "ns") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
+	order = ERTS_CPU_BIND_NO_SPREAD;
     else
-	return ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_BAD_TYPE;
+	return ERTS_INIT_SCHED_BIND_TYPE_ERROR_BAD_TYPE;
+
+    if (order != ERTS_CPU_BIND_NONE) {
+	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;
+    }
+
+    cpu_bind_order = order;
+
     return ERTS_INIT_SCHED_BIND_TYPE_SUCCESS;
 }
 
diff --git a/erts/emulator/beam/erl_cpu_topology.h b/erts/emulator/beam/erl_cpu_topology.h
index c5a9520b61..11915e1ea8 100644
--- a/erts/emulator/beam/erl_cpu_topology.h
+++ b/erts/emulator/beam/erl_cpu_topology.h
@@ -40,7 +40,7 @@ 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
+#define ERTS_INIT_SCHED_BIND_TYPE_ERROR_BAD_TYPE	3
 
 int erts_init_scheduler_bind_type_string(char *how);
 
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index bcdb630140..bb08762b26 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -5009,7 +5009,7 @@ static Eterm match_spec_test(Process *p, Eterm against, Eterm spec, int trace)
 static Eterm seq_trace_fake(Process *p, Eterm arg1)
 {
     Eterm result = erl_seq_trace_info(p, arg1);
-    if (is_tuple(result) && *tuple_val(result) == 2) {
+    if (!is_non_value(result) && is_tuple(result) && *tuple_val(result) == 2) {
 	return (tuple_val(result))[2];
     }
     return result;
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 046b46513f..d50ba364d0 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -85,7 +85,7 @@
 #include "erl_drv_nif.h"
 
 #include <stdlib.h>
-#include <string.h>		/* ssize_t on Mac OS X */
+#include <sys/types.h>	/* ssize_t */
 
 #if defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_)
 #ifndef STATIC_ERLANG_DRIVER
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index d377ba8f31..a33085315a 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -129,7 +129,7 @@ static void disallow_heap_frag_ref(Process* p, Eterm* n_htop, Eterm* objv, int n
 #if defined(ARCH_64) && !HALFWORD_HEAP
 # define MAX_HEAP_SIZES 154
 #else
-# define MAX_HEAP_SIZES 55
+# define MAX_HEAP_SIZES 59
 #endif
 
 static Sint heap_sizes[MAX_HEAP_SIZES];	/* Suitable heap sizes. */
@@ -144,6 +144,7 @@ void
 erts_init_gc(void)
 {
     int i = 0;
+    Sint max_heap_size = 0;
 
     ASSERT(offsetof(ProcBin,thing_word) == offsetof(struct erl_off_heap_header,thing_word));
     ASSERT(offsetof(ProcBin,thing_word) == offsetof(ErlFunThing,thing_word));
@@ -168,16 +169,30 @@ erts_init_gc(void)
      * we really don't want that growth when the heaps are that big.
      */
 	    
-    heap_sizes[0] = 34;
-    heap_sizes[1] = 55;
-    for (i = 2; i < 23; i++) {
-	heap_sizes[i] = heap_sizes[i-1] + heap_sizes[i-2];
+    /* Growth stage 1 - Fibonacci + 1*/
+    /* 12,38 will hit size 233, the old default */
+
+    heap_sizes[0] = 12;
+    heap_sizes[1] = 38;
+
+    for(i = 2; i < 23; i++) {
+        /* one extra word for block header */
+        heap_sizes[i] = heap_sizes[i-1] + heap_sizes[i-2] + 1;
     }
 
+
+    /* for 32 bit we want max_heap_size to be MAX(32bit) / 4 [words] (and halfword)
+     * for 64 bit we want max_heap_size to be MAX(52bit) / 8 [words]
+     */
+
+    max_heap_size = sizeof(Eterm) < 8 ? (Sint)((~(Uint)0)/(sizeof(Eterm))) : 
+					(Sint)(((Uint64)1 << 53)/sizeof(Eterm));
+
+    /* Growth stage 2 - 20% growth */
     /* At 1.3 mega words heap, we start to slow down. */
     for (i = 23; i < ALENGTH(heap_sizes); i++) {
-	heap_sizes[i] = 5*(heap_sizes[i-1]/4);
-	if (heap_sizes[i] < 0) {
+	heap_sizes[i] = heap_sizes[i-1] + heap_sizes[i-1]/5;
+	if ((heap_sizes[i] < 0) || heap_sizes[i] > max_heap_size) {
 	    /* Size turned negative. Discard this last size. */
 	    i--;
 	    break;
@@ -868,14 +883,12 @@ minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
 		}
 	    }
 
-            if (wanted < MIN_HEAP_SIZE(p)) {
-                wanted = MIN_HEAP_SIZE(p);
-            } else {
-                wanted = next_heap_size(p, wanted, 0);
-            }
+	    wanted = wanted < MIN_HEAP_SIZE(p) ? MIN_HEAP_SIZE(p)
+					       : next_heap_size(p, wanted, 0);
             if (wanted < HEAP_SIZE(p)) {
                 shrink_new_heap(p, wanted, objv, nobj);
             }
+
             ASSERT(HEAP_SIZE(p) == next_heap_size(p, HEAP_SIZE(p), 0));
 	    return 1;		/* We are done. */
         }
@@ -1434,11 +1447,10 @@ adjust_after_fullsweep(Process *p, Uint size_before, int need, Eterm *objv, int
            I think this is better as fullsweep is used mainly on
            small memory systems, but I could be wrong... */
         wanted = 2 * need_after;
-        if (wanted < p->min_heap_size) {
-            sz = p->min_heap_size;
-        } else {
-            sz = next_heap_size(p, wanted, 0);
-        }
+	
+	sz = wanted < p->min_heap_size ? p->min_heap_size
+				       : next_heap_size(p, wanted, 0);
+
         if (sz < HEAP_SIZE(p)) {
             shrink_new_heap(p, sz, objv, nobj);
         }
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c
index e7d4ac2b67..f98d377fd6 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.c
+++ b/erts/emulator/beam/erl_goodfit_alloc.c
@@ -205,7 +205,6 @@ erts_gfalc_start(GFAllctr_t *gfallctr,
 
     init->sbmbct = 0; /* Small mbc not yet supported by goodfit */
 
-    allctr->mbc_header_size		= sizeof(Carrier_t);
     allctr->min_mbc_size		= MIN_MBC_SZ;
     allctr->min_mbc_first_free_size	= MIN_MBC_FIRST_FREE_SZ;
     allctr->min_block_size		= sizeof(GFFreeBlock_t);
@@ -363,7 +362,7 @@ search_bucket(Allctr_t *allctr, int ix, Uint size)
 	 blk && i < max_blk_search;
 	 blk = blk->next, i++) {
 
-	blk_sz = BLK_SZ(blk);
+	blk_sz = MBC_FBLK_SZ(&blk->block_head);
 	blk_on_lambc = (((char *) blk) < gfallctr->last_aux_mbc_end
 			&& gfallctr->last_aux_mbc_start <= ((char *) blk));
 
@@ -402,7 +401,7 @@ get_free_block(Allctr_t *allctr, Uint size,
     if (min_bi == unsafe_bi) {
 	blk = search_bucket(allctr, min_bi, size);
 	if (blk) {
-	    if (cand_blk && cand_size <= BLK_SZ(blk))
+	    if (cand_blk && cand_size <= MBC_FBLK_SZ(blk))
 		return NULL; /* cand_blk was better */
 	    unlink_free_block(allctr, blk, flags);
 	    return blk;
@@ -422,7 +421,7 @@ get_free_block(Allctr_t *allctr, Uint size,
     /* We are guaranteed to find a block that fits in this bucket */
     blk = search_bucket(allctr, min_bi, size);
     ASSERT(blk);
-    if (cand_blk && cand_size <= BLK_SZ(blk))
+    if (cand_blk && cand_size <= MBC_FBLK_SZ(blk))
 	return NULL; /* cand_blk was better */
     unlink_free_block(allctr, blk, flags);
     return blk;
@@ -435,7 +434,7 @@ link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
 {
     GFAllctr_t *gfallctr = (GFAllctr_t *) allctr;
     GFFreeBlock_t *blk = (GFFreeBlock_t *) block;
-    Uint sz = BLK_SZ(blk);
+    Uint sz = MBC_FBLK_SZ(&blk->block_head);
     int i = BKT_IX(gfallctr, sz);
 
     ASSERT(sz >= MIN_BLK_SZ);
@@ -456,7 +455,7 @@ unlink_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags)
 {
     GFAllctr_t *gfallctr = (GFAllctr_t *) allctr;
     GFFreeBlock_t *blk = (GFFreeBlock_t *) block;
-    Uint sz = BLK_SZ(blk);
+    Uint sz = MBC_FBLK_SZ(&blk->block_head);
     int i = BKT_IX(gfallctr, sz);
 
     if (!blk->prev) {
@@ -618,7 +617,7 @@ check_block(Allctr_t *allctr, Block_t * blk, int free_block)
     GFFreeBlock_t *fblk;
 
     if(free_block) {
-	Uint blk_sz = BLK_SZ(blk);
+	Uint blk_sz = is_sbc_blk(blk) ? SBC_BLK_SZ(blk) : MBC_BLK_SZ(blk);
 	bi = BKT_IX(gfallctr, blk_sz);
 
 	ASSERT(gfallctr->bucket_mask.main & (((UWord) 1) << IX2SMIX(bi)));
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 175f04b15b..516f7b3cb3 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -55,6 +55,8 @@
 #  include <sys/resource.h>
 #endif
 
+#define ERTS_DEFAULT_NO_ASYNC_THREADS	10
+
 /*
  * The variables below (prefixed with etp_) are for erts/etc/unix/etp-commands
  * only. Do not remove even though they aren't used elsewhere in the emulator!
@@ -521,7 +523,7 @@ void erts_usage(void)
     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, "-stbt type  u|ns|ts|ps|s|nnts|nnps|tnnps|db\n");
     erts_fprintf(stderr, "-sbwt val   set scheduler busy wait threshold, valid values are:\n");
     erts_fprintf(stderr, "            none|very_short|short|medium|long|very_long.\n");
     erts_fprintf(stderr, "-scl bool   enable/disable compaction of scheduler load,\n");
@@ -529,7 +531,7 @@ void erts_usage(void)
     erts_fprintf(stderr, "-sct cput   set cpu topology,\n");
     erts_fprintf(stderr, "            see the erl(1) documentation for more info.\n");
     erts_fprintf(stderr, "-sws val    set scheduler wakeup strategy, valid values are:\n");
-    erts_fprintf(stderr, "            default|legacy|proposal.\n");
+    erts_fprintf(stderr, "            default|legacy.\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");
@@ -631,7 +633,7 @@ early_init(int *argc, char **argv) /*
     erts_disable_tolerant_timeofday = 0;
     display_items = 200;
     erts_backtrace_depth = DEFAULT_BACKTRACE_SIZE;
-    erts_async_max_threads = 0;
+    erts_async_max_threads = ERTS_DEFAULT_NO_ASYNC_THREADS;
     erts_async_thread_suggested_stack_size = ERTS_ASYNC_THREAD_MIN_STACK_SIZE;
     H_MIN_SIZE = H_DEFAULT_SIZE;
     BIN_VH_MIN_SIZE = VH_DEFAULT_SIZE;
@@ -700,7 +702,7 @@ early_init(int *argc, char **argv) /*
     if (erts_sys_getenv__("ERL_THREAD_POOL_SIZE", envbuf, &envbufsz) == 0)
 	erts_async_max_threads = atoi(envbuf);
     else
-	erts_async_max_threads = 0;
+	erts_async_max_threads = ERTS_DEFAULT_NO_ASYNC_THREADS;
     if (erts_async_max_threads > ERTS_MAX_NO_OF_ASYNC_THREADS)
 	erts_async_max_threads = ERTS_MAX_NO_OF_ASYNC_THREADS;
 
@@ -989,6 +991,7 @@ erl_start(int argc, char **argv)
 		    break;
 		case 'a':
 		    erts_set_user_requested_filename_encoding(ERL_FILENAME_UNKNOWN);
+		    break;
 		default:
 		    erts_fprintf(stderr, "bad filename encoding %s, can be (l,u or a)\n", arg);
 		    erts_usage();
@@ -1237,7 +1240,7 @@ erl_start(int argc, char **argv)
 		    case ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_CPU_TOPOLOGY:
 			estr = "no cpu topology available";
 			break;
-		    case ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_BAD_TYPE:
+		    case ERTS_INIT_SCHED_BIND_TYPE_ERROR_BAD_TYPE:
 			estr = "invalid type";
 			break;
 		    default:
@@ -1332,6 +1335,16 @@ erl_start(int argc, char **argv)
 	    }
 	    else if (sys_strcmp("nsp", sub_param) == 0)
 		erts_use_sender_punish = 0;
+	    else if (has_prefix("tbt", sub_param)) {
+		arg = get_arg(sub_param+3, argv[i+1], &i);
+		res = erts_init_scheduler_bind_type_string(arg);
+		if (res == ERTS_INIT_SCHED_BIND_TYPE_ERROR_BAD_TYPE) {
+		    erts_fprintf(stderr,
+				 "setting scheduler bind type '%s' failed: invalid type\n",
+				 arg);
+		    erts_usage();
+		}
+	    }
 	    else if (sys_strcmp("wt", sub_param) == 0) {
 		arg = get_arg(sub_param+2, argv[i+1], &i);
 		if (erts_sched_set_wakeup_other_thresold(arg) != 0) {
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index aaca4b5f59..6e9bf7ca12 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -4080,11 +4080,11 @@ typedef enum {
 } ErtsSchedWakeupOtherThreshold;
 
 typedef enum {
-    ERTS_SCHED_WAKEUP_OTHER_TYPE_PROPOSAL,
+    ERTS_SCHED_WAKEUP_OTHER_TYPE_DEFAULT,
     ERTS_SCHED_WAKEUP_OTHER_TYPE_LEGACY
 } ErtsSchedWakeupOtherType;
 
-/* First proposal */
+/* Default */
 
 #define ERTS_WAKEUP_OTHER_LIMIT_VERY_HIGH (200*CONTEXT_REDS)
 #define ERTS_WAKEUP_OTHER_LIMIT_HIGH (50*CONTEXT_REDS)
@@ -4101,7 +4101,7 @@ typedef enum {
 #define ERTS_WAKEUP_OTHER_DEC_SHIFT 2
 #define ERTS_WAKEUP_OTHER_FIXED_INC (CONTEXT_REDS/10)
 
-/* To be legacy */
+/* Legacy */
 
 #define ERTS_WAKEUP_OTHER_LIMIT_VERY_HIGH_LEGACY (200*CONTEXT_REDS)
 #define ERTS_WAKEUP_OTHER_LIMIT_HIGH_LEGACY (50*CONTEXT_REDS)
@@ -4239,7 +4239,7 @@ static void
 set_wakeup_other_data(void)
 {
     switch (wakeup_other.type) {
-    case ERTS_SCHED_WAKEUP_OTHER_TYPE_PROPOSAL:
+    case ERTS_SCHED_WAKEUP_OTHER_TYPE_DEFAULT:
 	wakeup_other.check = wakeup_other_check;
 	wakeup_other_set_limit();
 	break;
@@ -4258,7 +4258,7 @@ erts_early_init_scheduling(int no_schedulers)
     aux_work_timeout_early_init(no_schedulers);
 #ifdef ERTS_SMP
     wakeup_other.threshold = ERTS_SCHED_WAKEUP_OTHER_THRESHOLD_MEDIUM;
-    wakeup_other.type = ERTS_SCHED_WAKEUP_OTHER_TYPE_LEGACY;
+    wakeup_other.type = ERTS_SCHED_WAKEUP_OTHER_TYPE_DEFAULT;
 #endif
     sched_busy_wait.sys_schedule = ERTS_SCHED_SYS_SLEEP_SPINCOUNT_MEDIUM;
     sched_busy_wait.tse = (ERTS_SCHED_SYS_SLEEP_SPINCOUNT_MEDIUM
@@ -4294,10 +4294,8 @@ int
 erts_sched_set_wakeup_other_type(char *str)
 {
     ErtsSchedWakeupOtherType type;
-    if (sys_strcmp(str, "proposal") == 0)
-	type = ERTS_SCHED_WAKEUP_OTHER_TYPE_PROPOSAL;
-    else if (sys_strcmp(str, "default") == 0)
-	type = ERTS_SCHED_WAKEUP_OTHER_TYPE_LEGACY;
+    if (sys_strcmp(str, "default") == 0)
+	type = ERTS_SCHED_WAKEUP_OTHER_TYPE_DEFAULT;
     else if (sys_strcmp(str, "legacy") == 0)
 	type = ERTS_SCHED_WAKEUP_OTHER_TYPE_LEGACY;
     else
diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c
index 6a04c6fc0b..4587cd84d1 100644
--- a/erts/emulator/beam/erl_term.c
+++ b/erts/emulator/beam/erl_term.c
@@ -133,7 +133,7 @@ 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);
 ET_DEFINE_CHECKED(Uint,header_arity,Eterm,is_header);
-ET_DEFINE_CHECKED(Uint,arityval,Eterm,is_arity_value);
+ET_DEFINE_CHECKED(Uint,arityval,Eterm,is_sane_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,Wterm,is_binary);
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index bc4c3a09a0..fb3ef9cd6c 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -300,8 +300,17 @@ _ET_DECLARE_CHECKED(Uint,header_arity,Eterm)
 #define header_arity(x)	_ET_APPLY(header_arity,(x))
 
 /* arityval access methods */
+/* Erlang Spec. 4.7.3 defines max arity to 65535
+ * we will however enforce max arity of 16777215 (24 bits)
+ * (checked in bifs and asserted in debug)
+ */
+#define MAX_ARITYVAL            ((((Uint)1) << 24) - 1)
+#define ERTS_MAX_TUPLE_SIZE     MAX_ARITYVAL
+
 #define make_arityval(sz)	_make_header((sz),_TAG_HEADER_ARITYVAL)
 #define is_arity_value(x)	(((x) & _TAG_HEADER_MASK) == _TAG_HEADER_ARITYVAL)
+#define is_sane_arity_value(x)	((((x) & _TAG_HEADER_MASK) == _TAG_HEADER_ARITYVAL) && \
+				 (((x) >> _HEADER_ARITY_OFFS) <= MAX_ARITYVAL))
 #define is_not_arity_value(x)	(!is_arity_value((x)))
 #define _unchecked_arityval(x)	_unchecked_header_arity((x))
 _ET_DECLARE_CHECKED(Uint,arityval,Eterm)
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 41f33efa79..848877d43e 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -44,9 +44,9 @@
 #undef DEBUG_PRINTOUTS
 #endif
 
-extern Eterm beam_return_to_trace[1];   /* OpCode(i_return_to_trace) */
-extern Eterm beam_return_trace[1];      /* OpCode(i_return_trace) */
-extern Eterm beam_return_time_trace[1]; /* OpCode(i_return_time_trace) */
+extern BeamInstr beam_return_to_trace[1];   /* OpCode(i_return_to_trace) */
+extern BeamInstr beam_return_trace[1];      /* OpCode(i_return_trace) */
+extern BeamInstr beam_return_time_trace[1]; /* OpCode(i_return_time_trace) */
 
 /* Pseudo export entries. Never filled in with data, only used to
    yield unique pointers of the correct type. */
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 912f5d3d8b..25b02db2c9 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -56,6 +56,7 @@
 #define FILE_FDATASYNC          30
 #define FILE_FADVISE            31
 #define FILE_SENDFILE           32
+#define FILE_FALLOCATE          33
 
 /* Return codes */
 
@@ -439,6 +440,7 @@ struct t_data
     Efile_error    errInfo;
     int            flags;
     SWord          fd;
+    int            is_fd_unused;
     /**/
     Efile_info        info;
     EFILE_DIR_HANDLE  dir_handle; /* Handle to open directory. */
@@ -503,6 +505,10 @@ struct t_data
 	    Uint64 written;
 	} sendfile;
 #endif /* HAVE_SENDFILE */
+	struct {
+	    Sint64 offset;
+	    Sint64 length;
+	} fallocate;
     } c;
     char b[1];
 };
@@ -781,11 +787,6 @@ file_start(ErlDrvPort port, char* command)
     return (ErlDrvData) desc;
 }
 
-static void free_data(void *data)
-{
-    EF_FREE(data);
-}
-
 static void do_close(int flags, SWord fd) {
     if (flags & EFILE_COMPRESSED) {
 	erts_gzclose((gzFile)(fd));
@@ -803,6 +804,17 @@ static void invoke_close(void *data)
     DTRACE_INVOKE_RETURN(FILE_CLOSE);
 }
 
+static void free_data(void *data)
+{
+    struct t_data *d = (struct t_data *) data;
+
+    if (d->command == FILE_OPEN && d->is_fd_unused && d->fd != FILE_FD_INVALID) {
+        do_close(d->flags, d->fd);
+    }
+
+    EF_FREE(data);
+}
+
 /*********************************************************************
  * Driver entry point -> stop
  */
@@ -1862,6 +1874,9 @@ static void invoke_open(void *data)
     }
 
     d->result_ok = status;
+    if (!status) {
+        d->fd = FILE_FD_INVALID;
+    }
     DTRACE_INVOKE_RETURN(FILE_OPEN);
 }
 
@@ -1953,6 +1968,17 @@ static int flush_sendfile(file_descriptor *desc,void *_) {
 #endif /* HAVE_SENDFILE */
 
 
+static void invoke_fallocate(void *data)
+{
+    struct t_data *d = (struct t_data *) data;
+    int fd = (int) d->fd;
+    Sint64 offset = d->c.fallocate.offset;
+    Sint64 length = d->c.fallocate.length;
+
+    d->again = 0;
+    d->result_ok = efile_fallocate(&d->errInfo, fd, offset, length);
+}
+
 static void free_readdir(void *data)
 {
     struct t_data *d = (struct t_data *) data;
@@ -2348,6 +2374,7 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
       case FILE_RENAME:
       case FILE_WRITE_INFO:
       case FILE_FADVISE:
+      case FILE_FALLOCATE:
 	reply(desc, d->result_ok, &d->errInfo);
 	free_data(data);
 	break;
@@ -2373,8 +2400,10 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
 	if (!d->result_ok) {
 	    reply_error(desc, &d->errInfo);
 	} else {
+	    ASSERT(d->is_fd_unused);
 	    desc->fd = d->fd;
 	    desc->flags = d->flags;
+	    d->is_fd_unused = 0;
 	    reply_Uint(desc, d->fd);
 	}
 	free_data(data);
@@ -2745,6 +2774,7 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count)
 	    d->invoke = invoke_open;
 	    d->free = free_data;
 	    d->level = 2;
+	    d->is_fd_unused = 1;
 	    goto done;
 	}
 
@@ -2958,6 +2988,20 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count)
         goto done;
     }
 
+    case FILE_FALLOCATE:
+    {
+        d = EF_SAFE_ALLOC(sizeof(struct t_data));
+
+        d->fd = fd;
+        d->command = command;
+        d->invoke = invoke_fallocate;
+        d->free = free_data;
+        d->level = 2;
+        d->c.fallocate.offset = get_int64((uchar*) buf);
+        d->c.fallocate.length = get_int64(((uchar*) buf) + sizeof(Sint64));
+        goto done;
+    }
+
     }
 
     /*
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h
index 69ad02633c..b29b4f971c 100644
--- a/erts/emulator/drivers/common/erl_efile.h
+++ b/erts/emulator/drivers/common/erl_efile.h
@@ -185,3 +185,4 @@ int efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length,
 int efile_sendfile(Efile_error* errInfo, int in_fd, int out_fd,
 		      off_t *offset, Uint64 *nbytes, struct t_sendfile_hdtl *hdtl);
 #endif /* HAVE_SENDFILE */
+int efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length);
diff --git a/erts/emulator/drivers/common/ram_file_drv.c b/erts/emulator/drivers/common/ram_file_drv.c
index a109e40333..7f7cd7cd91 100644
--- a/erts/emulator/drivers/common/ram_file_drv.c
+++ b/erts/emulator/drivers/common/ram_file_drv.c
@@ -48,6 +48,7 @@
 #define RAM_FILE_SIZE          37  /* get file size */
 #define RAM_FILE_ADVISE        38  /* predeclare the access
                                     * pattern for file data */
+#define RAM_FILE_ALLOCATE      39  /* allocate space for a file */
 /* possible new operations include:
    DES_ENCRYPT
    DES_DECRYPT
@@ -720,6 +721,13 @@ static void rfile_command(ErlDrvData e, char* buf, ErlDrvSizeT count)
 	else
 	    reply(f, 1, 0);
 	break;
+
+    case RAM_FILE_ALLOCATE:
+	if (f->flags == 0)
+	    error_reply(f, EBADF);
+	else
+	    reply(f, 1, 0);
+	break;
     }
     /*
      * Ignore anything else -- let the caller hang.
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index b29f80a8ba..ab2abb88d1 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -912,11 +912,15 @@ static int insert_buf(byte *s, int n)
 		lbuf[lpos++] = (CONTROL_TAG | ((Uint32) ch));
 		ch = 0;
 	    } while (lpos % 8);
-	} else if (ch == '\n' || ch == '\r') {
+	} else if (ch == '\e' || ch == '\n' || ch == '\r') {
 	    write_buf(lbuf + buffpos, lpos - buffpos);
-	    outc('\r');
-	    if (ch == '\n')
-		outc('\n');
+            if (ch == '\e') {
+                outc('\e');
+            } else {
+                outc('\r');
+                if (ch == '\n')
+                    outc('\n');
+            }
 	    if (llen > lpos) {
 		memcpy(lbuf, lbuf + lpos, llen - lpos);
 	    }
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index cf7af71b92..558651fff9 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -22,6 +22,12 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+#if defined(HAVE_POSIX_FALLOCATE) && !defined(__sun) && !defined(__sun__)
+#define _XOPEN_SOURCE 600
+#endif
+#if !defined(_GNU_SOURCE) && defined(HAVE_LINUX_FALLOC_H)
+#define _GNU_SOURCE
+#endif
 #include "sys.h"
 #include "erl_driver.h"
 #include "erl_efile.h"
@@ -41,9 +47,13 @@
 #define DARWIN 1
 #endif
 
-#ifdef DARWIN
+#if defined(DARWIN) || defined(HAVE_LINUX_FALLOC_H) || defined(HAVE_POSIX_FALLOCATE)
 #include <fcntl.h>
-#endif /* DARWIN */
+#endif
+
+#ifdef HAVE_LINUX_FALLOC_H
+#include <linux/falloc.h>
+#endif
 
 #ifdef SUNOS4
 #  define getcwd(buf, size) getwd(buf)
@@ -967,3 +977,81 @@ efile_sendfile(Efile_error* errInfo, int in_fd, int out_fd,
     return check_error(retval, errInfo);
 }
 #endif /* HAVE_SENDFILE */
+
+#ifdef HAVE_POSIX_FALLOCATE
+static int
+call_posix_fallocate(int fd, Sint64 offset, Sint64 length)
+{
+    int ret;
+
+    /*
+     * On Linux and Solaris for example, posix_fallocate() returns
+     * a positive error number on error and it does not set errno.
+     * On FreeBSD however (9.0 at least), it returns -1 on error
+     * and it sets errno.
+     */
+    do {
+        ret = posix_fallocate(fd, (off_t) offset, (off_t) length);
+        if (ret > 0) {
+            errno = ret;
+            ret = -1;
+        }
+    } while (ret != 0 && errno == EINTR);
+
+    return ret;
+}
+#endif /* HAVE_POSIX_FALLOCATE */
+
+int
+efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length)
+{
+#if defined HAVE_FALLOCATE
+    /* Linux specific, more efficient than posix_fallocate. */
+    int ret;
+
+    do {
+        ret = fallocate(fd, FALLOC_FL_KEEP_SIZE, (off_t) offset, (off_t) length);
+    } while (ret != 0 && errno == EINTR);
+
+#if defined HAVE_POSIX_FALLOCATE
+    /* Fallback to posix_fallocate if available. */
+    if (ret != 0) {
+        ret = call_posix_fallocate(fd, offset, length);
+    }
+#endif
+
+    return check_error(ret, errInfo);
+#elif defined F_PREALLOCATE
+    /* Mac OS X specific, equivalent to posix_fallocate. */
+    int ret;
+    fstore_t fs;
+
+    memset(&fs, 0, sizeof(fs));
+    fs.fst_flags = F_ALLOCATECONTIG;
+    fs.fst_posmode = F_VOLPOSMODE;
+    fs.fst_offset = (off_t) offset;
+    fs.fst_length = (off_t) length;
+
+    ret = fcntl(fd, F_PREALLOCATE, &fs);
+
+    if (-1 == ret) {
+        fs.fst_flags = F_ALLOCATEALL;
+        ret = fcntl(fd, F_PREALLOCATE, &fs);
+
+#if defined HAVE_POSIX_FALLOCATE
+        /* Fallback to posix_fallocate if available. */
+        if (-1 == ret) {
+            ret = call_posix_fallocate(fd, offset, length);
+        }
+#endif
+    }
+
+    return check_error(ret, errInfo);
+#elif defined HAVE_POSIX_FALLOCATE
+    /* Other Unixes, use posix_fallocate if available. */
+    return check_error(call_posix_fallocate(fd, offset, length), errInfo);
+#else
+    errno = ENOTSUP;
+    return check_error(-1, errInfo);
+#endif
+}
diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
index dc7add01f7..f2b0c8a843 100644
--- a/erts/emulator/drivers/win32/win_efile.c
+++ b/erts/emulator/drivers/win32/win_efile.c
@@ -41,6 +41,8 @@
 #define IS_DOT_OR_DOTDOT(s) \
     ((s)[0] == L'.' && ((s)[1] == L'\0' || ((s)[1] == L'.' && (s)[2] == L'\0')))
 
+#define FILE_SHARE_FLAGS (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE)
+
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES ((DWORD) 0xFFFFFFFF)
 #endif
@@ -724,7 +726,7 @@ efile_openfile(Efile_error* errInfo,		/* Where to return error codes. */
 	crFlags = CREATE_NEW;
     }
     fd = CreateFileW(wname, access,
-		    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+		    FILE_SHARE_FLAGS,
 		    NULL, crFlags, FILE_ATTRIBUTE_NORMAL, NULL);
 
     /*
@@ -909,7 +911,7 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
 	{
 	    HANDLE handle;	/* Handle returned by CreateFile() */
 	    BY_HANDLE_FILE_INFORMATION fileInfo; /* from  CreateFile() */
-	    if (handle = CreateFileW(name, GENERIC_READ, 0,NULL,
+	    if (handle = CreateFileW(name, GENERIC_READ, FILE_SHARE_FLAGS, NULL,
 				    OPEN_EXISTING, 0, NULL)) {
 		GetFileInformationByHandle(handle, &fileInfo);
 		pInfo->links = fileInfo.nNumberOfLinks;
@@ -1021,7 +1023,7 @@ efile_write_info(Efile_error* errInfo,
     }
 
     fd = CreateFileW(wname, GENERIC_READ|GENERIC_WRITE,
-	    FILE_SHARE_READ | FILE_SHARE_WRITE,
+	    FILE_SHARE_FLAGS,
 	    NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     if (fd != INVALID_HANDLE_VALUE) {
 	BOOL result = SetFileTime(fd, &CreationFileTime, &AccessFileTime, &ModifyFileTime);
@@ -1384,7 +1386,7 @@ efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
 	    DWORD fileAttributes =  GetFileAttributesW(wname);
 	    if ((fileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 		BOOLEAN success = 0;
-		HANDLE h = CreateFileW(wname, GENERIC_READ, 0,NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+		HANDLE h = CreateFileW(wname, GENERIC_READ, FILE_SHARE_FLAGS, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 		int len;
 		if(h != INVALID_HANDLE_VALUE) {
 		    success = pGetFinalPathNameByHandle(h, wbuffer, size / sizeof(WCHAR),0);
@@ -1558,3 +1560,13 @@ efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset,
     errno = ERROR_SUCCESS;
     return check_error(0, errInfo);
 }
+
+int
+efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length)
+{
+    /* No file preallocation method available in Windows. */
+    errno = errno_map(ERROR_NOT_SUPPORTED);
+    SetLastError(ERROR_NOT_SUPPORTED);
+
+    return check_error(-1, errInfo);
+}
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index 5911d76ad9..0e287908b1 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -262,47 +262,6 @@ static const struct literal {
     const char *name;
     int value;
 } literals[] = {
-    /* Field offsets in a process struct */
-    { "P_HP", offsetof(struct process, htop) },
-    { "P_HP_LIMIT", offsetof(struct process, stop) },
-    { "P_OFF_HEAP_FIRST", offsetof(struct process, off_heap.first) },
-    { "P_MBUF", offsetof(struct process, mbuf) },
-    { "P_ID", offsetof(struct process, common.id) },
-    { "P_FLAGS", offsetof(struct process, flags) },
-    { "P_FVALUE", offsetof(struct process, fvalue) },
-    { "P_FREASON", offsetof(struct process, freason) },
-    { "P_FTRACE", offsetof(struct process, ftrace) },
-    { "P_FCALLS", offsetof(struct process, fcalls) },
-    { "P_BEAM_IP", offsetof(struct process, i) },
-    { "P_ARITY", offsetof(struct process, arity) },
-    { "P_ARG0", offsetof(struct process, def_arg_reg[0]) },
-    { "P_ARG1", offsetof(struct process, def_arg_reg[1]) },
-    { "P_ARG2", offsetof(struct process, def_arg_reg[2]) },
-    { "P_ARG3", offsetof(struct process, def_arg_reg[3]) },
-    { "P_ARG4", offsetof(struct process, def_arg_reg[4]) },
-    { "P_ARG5", offsetof(struct process, def_arg_reg[5]) },
-#ifdef HIPE
-    { "P_NSP", offsetof(struct process, hipe.nsp) },
-    { "P_NCALLEE", offsetof(struct process, hipe.ncallee) },
-    { "P_CLOSURE", offsetof(struct process, hipe.closure) },
-#if defined(__i386__) || defined(__x86_64__)
-    { "P_NSP_LIMIT", offsetof(struct process, hipe.nstack) },
-    { "P_CSP", offsetof(struct process, hipe.ncsp) },
-#elif defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__)
-    { "P_NSP_LIMIT", offsetof(struct process, hipe.nstack) },
-    { "P_NRA", offsetof(struct process, hipe.nra) },
-#endif
-    { "P_NARITY", offsetof(struct process, hipe.narity) },
-    { "P_FLOAT_RESULT",
-# ifdef NO_FPE_SIGNALS
-	offsetof(struct process, hipe.float_result)
-# endif
-    },
-# if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP)
-    { "P_BIF_CALLEE", offsetof(struct process, hipe.bif_callee) },
-# endif
-#endif /* HIPE */
-
     /* process flags bits */
     {  "F_TIMO", F_TIMO },
 
@@ -380,8 +339,6 @@ static const struct literal {
     { "MS_SAVEOFFSET_SIZE", field_sizeof(struct erl_bin_match_struct, save_offset)},
 
     /* messages */
-    { "P_MSG_FIRST", offsetof(struct process, msg.first) },
-    { "P_MSG_SAVE", offsetof(struct process, msg.save) },
     { "MSG_NEXT", offsetof(struct erl_mesg, next) },
 
     /* ARM */
@@ -460,12 +417,14 @@ static const struct atom_literal {
  * These depend on configuration options such as heap architecture.
  * The compiler accesses these through hipe_bifs:get_rts_param/1.
  */
-static const struct rts_param {
+struct rts_param {
     unsigned int nr;
     const char *name;
     unsigned int is_defined;
     int value;
-} rts_params[] = {
+};
+
+static const struct rts_param rts_params[] = {
     { 1, "P_OFF_HEAP_FUNS",
       1, offsetof(struct process, off_heap.first)
     },
@@ -518,7 +477,53 @@ static const struct rts_param {
     { 19, "MSG_MESSAGE",
       1, offsetof(struct erl_mesg, m[0])
     },
-    /* highest entry ever used == 21 */
+
+    /* Field offsets in a process struct */
+    { 22, "P_HP", 1, offsetof(struct process, htop) },
+    { 23, "P_HP_LIMIT", 1, offsetof(struct process, stop) },
+    { 24, "P_OFF_HEAP_FIRST", 1, offsetof(struct process, off_heap.first) },
+    { 25, "P_MBUF", 1, offsetof(struct process, mbuf) },
+    { 26, "P_ID", 1, offsetof(struct process, common.id) },
+    { 27, "P_FLAGS", 1, offsetof(struct process, flags) },
+    { 28, "P_FVALUE", 1, offsetof(struct process, fvalue) },
+    { 29, "P_FREASON", 1, offsetof(struct process, freason) },
+    { 30, "P_FTRACE", 1, offsetof(struct process, ftrace) },
+    { 31, "P_FCALLS", 1, offsetof(struct process, fcalls) },
+    { 32, "P_BEAM_IP", 1, offsetof(struct process, i) },
+    { 33, "P_ARITY", 1, offsetof(struct process, arity) },
+    { 34, "P_ARG0", 1, offsetof(struct process, def_arg_reg[0]) },
+    { 35, "P_ARG1", 1, offsetof(struct process, def_arg_reg[1]) },
+    { 36, "P_ARG2", 1, offsetof(struct process, def_arg_reg[2]) },
+    { 37, "P_ARG3", 1, offsetof(struct process, def_arg_reg[3]) },
+    { 38, "P_ARG4", 1, offsetof(struct process, def_arg_reg[4]) },
+    { 39, "P_ARG5", 1, offsetof(struct process, def_arg_reg[5]) },
+    { 40, "P_NSP", 1, offsetof(struct process, hipe.nsp) },
+    { 41, "P_NCALLEE", 1, offsetof(struct process, hipe.ncallee) },
+    { 42, "P_CLOSURE", 1, offsetof(struct process, hipe.closure) },
+    { 43, "P_NSP_LIMIT", 1, offsetof(struct process, hipe.nstack) },
+    { 44, "P_CSP",
+#if defined(__i386__) || defined(__x86_64__)
+	1, offsetof(struct process, hipe.ncsp)
+#endif
+    },
+    { 45, "P_NRA",
+#if defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__)
+	1, offsetof(struct process, hipe.nra)
+#endif
+    },
+    { 46, "P_NARITY", 1, offsetof(struct process, hipe.narity) },
+    { 47, "P_FLOAT_RESULT",
+#ifdef NO_FPE_SIGNALS
+	1, offsetof(struct process, hipe.float_result)
+#endif
+    },
+    { 48, "P_BIF_CALLEE",
+#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP)
+	1, offsetof(struct process, hipe.bif_callee)
+#endif
+    },
+    { 49, "P_MSG_FIRST", 1, offsetof(struct process, msg.first) },
+    { 50, "P_MSG_SAVE", 1, offsetof(struct process, msg.save) },
 };
 
 #define NR_PARAMS	ARRAY_SIZE(rts_params)
diff --git a/erts/emulator/hipe/hipe_x86_gc.h b/erts/emulator/hipe/hipe_x86_gc.h
index aa4abb6f59..4bea9276c0 100644
--- a/erts/emulator/hipe/hipe_x86_gc.h
+++ b/erts/emulator/hipe/hipe_x86_gc.h
@@ -71,7 +71,7 @@ nstack_walk_init_sdesc(const Process *p, struct nstack_walk_state *state)
     state->sdesc0[0].livebits[0] = 0;
 # ifdef DEBUG
     state->sdesc0[0].dbg_M = 0;
-    state->sdesc0[0].dbg_F = am_init;
+    state->sdesc0[0].dbg_F = am_undefined;
     state->sdesc0[0].dbg_A = 0;
 # endif
     /* XXX: this appears to prevent a gcc-4.1.1 bug on x86 */
diff --git a/erts/emulator/pcre/pcre.mk b/erts/emulator/pcre/pcre.mk
index 352137b341..57bf5de2fb 100644
--- a/erts/emulator/pcre/pcre.mk
+++ b/erts/emulator/pcre/pcre.mk
@@ -49,18 +49,18 @@ PCRE_CFLAGS = $(filter-out -DDEBUG,$(CFLAGS)) -DERLANG_INTEGRATION
 
 ifeq ($(TARGET), win32)
 $(EPCRE_LIB): $(PCRE_OBJS)
-	$(AR) -out:$@ $(PCRE_OBJS)
+	$(V_AR) -out:$@ $(PCRE_OBJS)
 else
 $(EPCRE_LIB): $(PCRE_OBJS)
-	$(AR) $(ARFLAGS) $@ $(PCRE_OBJS)
+	$(V_AR) $(ARFLAGS) $@ $(PCRE_OBJS)
 	-@ ($(RANLIB) $@ || true) 2>/dev/null
 endif
 
 $(PCRE_OBJDIR)/%.o: pcre/%.c
-	$(CC) -c $(PCRE_CFLAGS) -o $@ $<
+	$(V_CC) -c $(PCRE_CFLAGS) -o $@ $<
 
 $(PCRE_GENINC): pcre/pcre_exec.c
-	for x in `grep -n COST_CHK pcre/pcre_exec.c | grep -v 'COST_CHK(N)' | awk -F: '{print $$1}'`; \
+	$(gen_verbose)for x in `grep -n COST_CHK pcre/pcre_exec.c | grep -v 'COST_CHK(N)' | awk -F: '{print $$1}'`; \
 	do \
 		N=`expr $$x + 100`; \
 		echo "case $$N: goto L_LOOP_COUNT_$${x};"; \
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index db2854fa40..94f9f76a20 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -57,26 +57,48 @@
      /* Implement some other way to get the real page size if needed! */
 #endif
 
-#define MAX_CACHE_SIZE 30
-
 #undef MIN
 #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
 #undef MAX
 #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
 
-#undef  PAGE_MASK
-#define INV_PAGE_MASK	((Uint) (page_size - 1))
-#define PAGE_MASK	(~INV_PAGE_MASK)
-#define PAGE_FLOOR(X)	((X) & PAGE_MASK)
-#define PAGE_CEILING(X)	PAGE_FLOOR((X) + INV_PAGE_MASK)
-#define PAGES(X)	((X) >> page_shift)
+#define INV_ALIGNED_MASK    ((UWord) ((MSEG_ALIGNED_SIZE) - 1))
+#define ALIGNED_MASK        (~INV_ALIGNED_MASK)
+#define ALIGNED_FLOOR(X)    (((UWord)(X)) & ALIGNED_MASK)
+#define ALIGNED_CEILING(X)  ALIGNED_FLOOR((X) + INV_ALIGNED_MASK)
+#define MAP_IS_ALIGNED(X)   (((UWord)(X) & (MSEG_ALIGNED_SIZE - 1)) == 0)
+
+#define IS_2POW(X)          ((X) && !((X) & ((X) - 1)))
+static ERTS_INLINE Uint ceil_2pow(Uint x) {
+    int i = 1 << (4 + (sizeof(Uint) != 4 ? 1 : 0));
+    x--;
+    do { x |= x >> i; } while(i >>= 1);
+    return x + 1;
+}
+static const int debruijn[32] = {
+     0,  1, 28,  2, 29, 14, 24,  3, 30, 22, 20, 15, 25, 17,  4,  8, 
+    31, 27, 13, 23, 21, 19, 16,  7, 26, 12, 18,  6, 11,  5, 10,  9
+};
+
+#define LOG2(X) (debruijn[((Uint32)(((X) & -(X)) * 0x077CB531U)) >> 27])
+
+#define CACHE_AREAS      (32 - MSEG_ALIGN_BITS)
+
+#define SIZE_TO_CACHE_AREA_IDX(S)   (LOG2((S)) - MSEG_ALIGN_BITS)
+#define MAX_CACHE_SIZE   (30)
+
+#define MSEG_FLG_IS_2POW(X)    ((X) & ERTS_MSEG_FLG_2POW)
+
+#ifdef DEBUG
+#define DBG(F,...) fprintf(stderr, (F), __VA_ARGS__ )
+#else
+#define DBG(F,...) do{}while(0)
+#endif
 
 static int atoms_initialized;
 
 typedef struct mem_kind_t MemKind;
 
-static void mseg_clear_cache(MemKind*);
-
 #if HALFWORD_HEAP
 static int initialize_pmmap(void);
 static void *pmmap(size_t size);
@@ -116,15 +138,6 @@ static int mmap_fd;
 #error "Not supported"
 #endif /* #if HAVE_MMAP */
 
-#if defined(ERTS_MSEG_FAKE_SEGMENTS) && HALFWORD_HEAP
-#  warning "ERTS_MSEG_FAKE_SEGMENTS will only be used for high memory segments" 
-#endif 
-
-#if defined(ERTS_MSEG_FAKE_SEGMENTS)
-#undef CAN_PARTLY_DESTROY
-#define CAN_PARTLY_DESTROY 0
-#endif
-
 const ErtsMsegOpt_t erts_mseg_default_opt = {
     1,			/* Use cache		     */
     1,			/* Preserv data		     */
@@ -137,26 +150,17 @@ const ErtsMsegOpt_t erts_mseg_default_opt = {
 };
 
 
-typedef struct cache_desc_t_ {
-    void *seg;
-    Uint size;
-    struct cache_desc_t_ *next;
-    struct cache_desc_t_ *prev;
-} cache_desc_t;
-
 typedef struct {
     Uint32 giga_no;
     Uint32 no;
 } CallCounter;
 
-static Uint page_size;
-static Uint page_shift;
-
 typedef struct {
     CallCounter alloc;
     CallCounter dealloc;
     CallCounter realloc;
     CallCounter create;
+    CallCounter create_resize;
     CallCounter destroy;
 #if HAVE_MSEG_RECREATE
     CallCounter recreate;
@@ -165,17 +169,25 @@ typedef struct {
     CallCounter check_cache;
 } ErtsMsegCalls;
 
+typedef struct cache_t_ cache_t;
+
+struct cache_t_ {
+    Uint size;
+    void *seg;
+    cache_t *next;
+};
+
+
 typedef struct ErtsMsegAllctr_t_ ErtsMsegAllctr_t;
 
 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;
+
+    cache_t cache[MAX_CACHE_SIZE];
+    cache_t *cache_unpowered;
+    cache_t *cache_area[CACHE_AREAS];
+    cache_t *cache_free;
+
+    Sint cache_size;
     Uint cache_hits;
 
     struct {
@@ -320,8 +332,7 @@ static erts_mtx_t init_atoms_mutex; /* Also needed when !USE_THREADS */
 
 
 static ERTS_INLINE void
-schedule_cache_check(ErtsMsegAllctr_t *ma)
-{
+schedule_cache_check(ErtsMsegAllctr_t *ma) {
 
     if (!ma->is_cache_check_scheduled && ma->is_init_done) {
 	erts_set_aux_work_timeout(ma->ix,
@@ -331,12 +342,45 @@ schedule_cache_check(ErtsMsegAllctr_t *ma)
     }
 }
 
+/* remove ErtsMsegAllctr_t from arguments?
+ * only used for statistics
+ */
+static ERTS_INLINE void *
+mmap_align(ErtsMsegAllctr_t *ma, void *addr, size_t length, int prot, int flags, int fd, off_t offset) {
+
+    void *p, *q;
+    UWord d;
+
+    p = mmap(addr, length, prot, flags, fd, offset);
+
+    if (MAP_IS_ALIGNED(p) || p == MAP_FAILED)
+	return p;
+
+    if (ma)
+	INC_CC(ma, create_resize);
+
+    munmap(p, length);
+
+    if ((p = mmap(addr, length + MSEG_ALIGNED_SIZE, prot, flags, fd, offset)) == MAP_FAILED)
+	return MAP_FAILED;
+
+    q = (void *)ALIGNED_CEILING(p);
+    d = q - p;
+
+    if (d > 0)
+	munmap(p, d);
+
+    if (MSEG_ALIGNED_SIZE - d > 0)
+	munmap((void *) (q + length), MSEG_ALIGNED_SIZE - d);
+
+    return q;
+}
+
 static ERTS_INLINE void *
 mseg_create(ErtsMsegAllctr_t *ma, MemKind* mk, Uint size)
 {
     void *seg;
-
-    ASSERT(size % page_size == 0);
+    ASSERT(size % MSEG_ALIGNED_SIZE == 0);
 
 #if HALFWORD_HEAP
     if (mk == &ma->low_mem) {
@@ -345,18 +389,17 @@ mseg_create(ErtsMsegAllctr_t *ma, MemKind* mk, Uint size)
 	    erts_fprintf(stderr,"Pointer mask failure (0x%08lx)\n",(unsigned long) seg);
 	    return NULL;
 	}
-    }
-    else
+    } else
 #endif
     {
-#if defined(ERTS_MSEG_FAKE_SEGMENTS)
-	seg = erts_sys_alloc(ERTS_ALC_N_INVALID, NULL, size);
-#elif HAVE_MMAP
+#if HAVE_MMAP
 	{
-	    seg = (void *) mmap((void *) 0, (size_t) size,
+	    seg = (void *) mmap_align(ma, (void *) 0, (size_t) size,
 				MMAP_PROT, MMAP_FLAGS, MMAP_FD, 0);
 	    if (seg == (void *) MAP_FAILED)
 		seg = NULL;
+
+	    ASSERT(MAP_IS_ALIGNED(seg) || !seg);
 	}
 #else
 # error "Missing mseg_create() implementation"
@@ -369,38 +412,24 @@ mseg_create(ErtsMsegAllctr_t *ma, MemKind* mk, Uint size)
 }
 
 static ERTS_INLINE void
-mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size)
-{
-#ifdef DEBUG
-    int res;
-#endif
+mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size) {
+    ERTS_DECLARE_DUMMY(int res);
 
 #if HALFWORD_HEAP
     if (mk == &ma->low_mem) {
-#ifdef DEBUG
-	res = 
-#endif
-	    pmunmap((void *) seg, size);
+	res = pmunmap((void *) seg, size);
     }
     else
 #endif
     {
-#ifdef ERTS_MSEG_FAKE_SEGMENTS
-	erts_sys_free(ERTS_ALC_N_INVALID, NULL, seg);
-#ifdef DEBUG
-	res = 0;
-#endif
-#elif HAVE_MMAP
-#ifdef DEBUG
-	res = 
-#endif
-	    munmap((void *) seg, size);
+#ifdef HAVE_MMAP
+	res = munmap((void *) seg, size);
 #else
 # error "Missing mseg_destroy() implementation"
 #endif
     }
 
-    ASSERT(size % page_size == 0);
+    ASSERT(size % MSEG_ALIGNED_SIZE == 0);
     ASSERT(res == 0);
 
     INC_CC(ma, destroy);
@@ -408,14 +437,36 @@ mseg_destroy(ErtsMsegAllctr_t *ma, MemKind* mk, void *seg, Uint size)
 }
 
 #if HAVE_MSEG_RECREATE
+#if defined(__NetBsd__)
+#define MREMAP_FLAGS  (0)
+#else
+#define MREMAP_FLAGS  (MREMAP_MAYMOVE)
+#endif
+
+
+/* mseg_recreate
+ * May return *unaligned* segments as in address not aligned to MSEG_ALIGNMENT
+ * it is still page aligned
+ *
+ * This is fine for single block carriers as long as we don't cache misaligned
+ * segments (since multiblock carriers may use them)
+ *
+ * For multiblock carriers we *need* MSEG_ALIGNMENT but mbc's will never be
+ * reallocated.
+ *
+ * This should probably be fixed the following way:
+ * 1) Use an option to segment allocation - NEED_ALIGNMENT
+ * 2) Add mremap_align which takes care of aligning a new a mremaped area
+ * 3) Fix the cache to handle of aligned and unaligned segments
+ */
 
 static ERTS_INLINE void *
 mseg_recreate(ErtsMsegAllctr_t *ma, MemKind* mk, void *old_seg, Uint old_size, Uint new_size)
 {
     void *new_seg;
 
-    ASSERT(old_size % page_size == 0);
-    ASSERT(new_size % page_size == 0);
+    ASSERT(old_size % MSEG_ALIGNED_SIZE == 0);
+    ASSERT(new_size % MSEG_ALIGNED_SIZE == 0);
 
 #if HALFWORD_HEAP
     if (mk == &ma->low_mem) {
@@ -426,22 +477,12 @@ mseg_recreate(ErtsMsegAllctr_t *ma, MemKind* mk, void *old_seg, Uint old_size, U
     else
 #endif
     {
-#if defined(ERTS_MSEG_FAKE_SEGMENTS)
-	new_seg = erts_sys_realloc(ERTS_ALC_N_INVALID, NULL, old_seg, new_size);
-#elif HAVE_MREMAP
-
-    #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 HAVE_MREMAP
+#if defined(__NetBSD__)
+	new_seg = mremap(old_seg, (size_t)old_size, NULL, new_size, MREMAP_FLAGS);
+#else
+	new_seg = mremap(old_seg, (size_t)old_size, (size_t)new_size, MREMAP_FLAGS);
+#endif
 	if (new_seg == (void *) MAP_FAILED)
 	    new_seg = NULL;
 #else
@@ -475,151 +516,265 @@ do {									\
 #define ERTS_DBG_MK_CHK_THR_ACCESS(MK)
 #endif
 
-static ERTS_INLINE cache_desc_t * 
-alloc_cd(MemKind* mk)
-{    
-    cache_desc_t *cd = mk->free_cache_descs;
+/* NEW CACHE interface */
+
+static ERTS_INLINE cache_t *mseg_cache_alloc_descriptor(MemKind *mk) {
+    cache_t *c = mk->cache_free;
+
     ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    if (cd)
-	mk->free_cache_descs = cd->next;
-    return cd;
+    if (c)
+	mk->cache_free = c->next;
+
+    return c;
 }
 
-static ERTS_INLINE void
-free_cd(MemKind* mk, cache_desc_t *cd)
-{
+static ERTS_INLINE void mseg_cache_free_descriptor(MemKind *mk, cache_t *c) {
     ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    cd->next = mk->free_cache_descs;
-    mk->free_cache_descs = cd;
+    ASSERT(c);
+    
+    c->seg  = NULL;
+    c->size = 0;
+    c->next = mk->cache_free;
+    mk->cache_free = c;
 }
 
+static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, Uint size) {
 
-static ERTS_INLINE void
-link_cd(MemKind* mk, cache_desc_t *cd)
-{
+    cache_t *c;
     ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    if (mk->cache)
-	mk->cache->prev = cd;
-    cd->next = mk->cache;
-    cd->prev = NULL;
-    mk->cache = cd;
-
-    if (!mk->cache_end) {
-	ASSERT(!cd->next);
-	mk->cache_end = cd;
+
+    if (mk->cache_free && MAP_IS_ALIGNED(seg)) {
+	if (IS_2POW(size)) {
+	    int ix = SIZE_TO_CACHE_AREA_IDX(size);
+
+	    ASSERT(ix < CACHE_AREAS);
+	    ASSERT((1 << (ix + MSEG_ALIGN_BITS)) == size);
+
+	    /* unlink from free cache list */
+	    c = mseg_cache_alloc_descriptor(mk);
+
+	    /* link to cache area */
+	    c->seg  = seg;
+	    c->size = size;
+	    c->next = mk->cache_area[ix];
+
+	    mk->cache_area[ix] = c;
+	    mk->cache_size++;
+
+	    ASSERT(mk->cache_size <= mk->ma->max_cache_size);
+
+	    return 1;
+	} else {
+	    /* unlink from free cache list */
+	    c = mseg_cache_alloc_descriptor(mk);
+
+	    /* link to cache area */
+	    c->seg  = seg;
+	    c->size = size;
+	    c->next = mk->cache_unpowered;
+
+	    mk->cache_unpowered = c;
+	    mk->cache_size++;
+
+	    ASSERT(mk->cache_size <= mk->ma->max_cache_size);
+
+	    return 1;
+	}
     }
 
-    mk->cache_size++;
+    return 0;
 }
 
-#if CAN_PARTLY_DESTROY
-static ERTS_INLINE void
-end_link_cd(MemKind* mk, cache_desc_t *cd)
-{
+static ERTS_INLINE void *cache_get_segment(MemKind *mk, Uint *size_p) {
+
+    Uint size = *size_p;
+
     ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    if (mk->cache_end)
-	mk->cache_end->next = cd;
-    cd->next = NULL;
-    cd->prev = mk->cache_end;
-    mk->cache_end = cd;
-
-    if (!mk->cache) {
-	ASSERT(!cd->prev);
-	mk->cache = cd;
-    }
+    if (IS_2POW(size)) {
+
+	int i, ix = SIZE_TO_CACHE_AREA_IDX(size);
+	void *seg;
+	cache_t *c;
+	Uint csize;
+
+	for( i = ix; i < CACHE_AREAS; i++) {
+
+	    if ((c = mk->cache_area[i]) == NULL)
+		continue;
+
+	    ASSERT(IS_2POW(c->size));
+
+	    /* unlink from cache area */
+	    csize   = c->size;
+	    seg     = c->seg;
+	    mk->cache_area[i] = c->next;
+	    c->next = NULL;
+	    mk->cache_size--;
+	    mk->cache_hits++;
+
+	    /* link to free cache list */
+	    mseg_cache_free_descriptor(mk, c);
+
+	    ASSERT(!(mk->cache_size < 0));
+
+	    /* divvy up the cache - if needed */
+	    while( i > ix) {
+		csize = csize >> 1;
+		/* try to cache half of it */
+		if (!cache_bless_segment(mk, (char *)seg + csize, csize)) {
+		    /* wouldn't cache .. destroy it instead */
+		    mseg_destroy(mk->ma, mk, (char *)seg + csize, csize);
+		}
+		i--;
+	    }
+	    ASSERT(csize == size);
+	    return seg;
+	}
+    } 
+    else if (mk->cache_unpowered) {
+	void *seg;
+	cache_t *c, *pc;
+	Uint csize;
+	Uint bad_max_abs = mk->ma->abs_max_cache_bad_fit;
+	Uint bad_max_rel = mk->ma->rel_max_cache_bad_fit;
+
+	c = mk->cache_unpowered;
+	pc = c;
+
+	while (c) {
+	    csize = c->size;
+		if (csize >= size &&
+			((csize - size)*100 < bad_max_rel*size) &&
+			(csize - size) < bad_max_abs ) {
+
+		/* unlink from cache area */
+		seg = c->seg;
+
+		if (pc == c) {
+		    mk->cache_unpowered = c->next;
+		} else {
+		    pc->next = c->next;
+		}
+
+		c->next = NULL;
+		mk->cache_size--;
+		mk->cache_hits++;
+
+		/* link to free cache list */
+		mseg_cache_free_descriptor(mk, c);
+		*size_p = csize;
+
+		return seg;
+	    }
 
-    mk->cache_size++;
+	    pc = c;
+	    c  = c->next;
+	}
+    }
+    return NULL;
 }
-#endif
 
-static ERTS_INLINE void
-unlink_cd(MemKind* mk, cache_desc_t *cd)
-{
-    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    if (cd->next)
-	cd->next->prev = cd->prev;
-    else
-	mk->cache_end = cd->prev;
-    
-    if (cd->prev)
-	cd->prev->next = cd->next;
-    else
-	mk->cache = cd->next;
-    ASSERT(mk->cache_size > 0);
+/* *_mseg_check_*_cache
+ * Slowly remove segments cached in the allocator by
+ * using callbacks from aux-work in the scheduler.
+ */
+
+static ERTS_INLINE Uint mseg_drop_one_memkind_cache_size(MemKind *mk, cache_t **head) {
+    cache_t *c = NULL;
+
+    c = *head;
+
+    ASSERT( c != NULL );
+
+    *head = c->next;
+
+    if (erts_mtrace_enabled)
+	erts_mtrace_crr_free(SEGTYPE, SEGTYPE, c->seg);
+
+    mseg_destroy(mk->ma, mk, c->seg, c->size);
+    mseg_cache_free_descriptor(mk, c);
+
+    mk->segments.current.watermark--;
     mk->cache_size--;
-}
 
-static ERTS_INLINE void
-check_cache_limits(MemKind* mk)
-{
-    cache_desc_t *cd;
-    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    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;
-    }
+    ASSERT( mk->cache_size >= 0 );
+
+    return mk->cache_size;
 }
 
-static ERTS_INLINE void
-adjust_cache_size(MemKind* mk, int force_check_limits)
-{
-    cache_desc_t *cd;
-    int check_limits = force_check_limits;
-    Sint max_cached = ((Sint) mk->segments.current.watermark
-		       - (Sint) mk->segments.current.no);
-    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
-    while (((Sint) mk->cache_size) > max_cached && ((Sint) mk->cache_size) > 0) {
-	ASSERT(mk->cache_end);
-	cd = mk->cache_end;
-	if (!check_limits &&
-	    !(mk->min_cached_seg_size < cd->size
-	      && cd->size < mk->max_cached_seg_size)) {
-	    check_limits = 1;
-	}
+static ERTS_INLINE Uint mseg_drop_memkind_cache_size(MemKind *mk, cache_t **head) {
+    cache_t *c = NULL, *next = NULL;
+
+    c = *head;
+    ASSERT( c != NULL );
+
+    while (c) {
+
+	next = c->next;
+
 	if (erts_mtrace_enabled)
-	    erts_mtrace_crr_free(SEGTYPE, SEGTYPE, cd->seg);
-	mseg_destroy(mk->ma, mk, cd->seg, cd->size);
-	unlink_cd(mk,cd);
-	free_cd(mk,cd);
-    }
+	    erts_mtrace_crr_free(SEGTYPE, SEGTYPE, c->seg);
 
-    if (check_limits)
-	check_cache_limits(mk);
-}
+	mseg_destroy(mk->ma, mk, c->seg, c->size);
+	mseg_cache_free_descriptor(mk, c);
 
-static Uint
-check_one_cache(MemKind* mk)
-{
-    if (mk->segments.current.watermark > mk->segments.current.no)
 	mk->segments.current.watermark--;
-    adjust_cache_size(mk, 0);
+	mk->cache_size--;
+
+	c = next;
+    }
+
+    *head = NULL;
+
+    ASSERT( mk->cache_size >= 0 );
 
-    if (mk->cache_size)
-	schedule_cache_check(mk->ma);
     return mk->cache_size;
 }
 
-static void do_cache_check(ErtsMsegAllctr_t *ma)
-{
-    int empty_cache = 1;
+/* mseg_check_memkind_cache
+ * - Check if we can empty some cached segments in this
+ *   MemKind.
+ */
+
+
+static Uint mseg_check_memkind_cache(MemKind *mk) {
+    int i;
+
+    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
+
+    for (i = 0; i < CACHE_AREAS; i++) {
+	if (mk->cache_area[i] != NULL)
+	    return mseg_drop_one_memkind_cache_size(mk, &(mk->cache_area[i]));
+    }
+
+    if (mk->cache_unpowered)
+	return mseg_drop_one_memkind_cache_size(mk, &(mk->cache_unpowered));
+
+    return 0;
+}
+
+/* mseg_cache_check
+ * - Check if we have some cache we can purge
+ *   in any of the memkinds.
+ */
+
+static void mseg_cache_check(ErtsMsegAllctr_t *ma) {
     MemKind* mk;
+    Uint empty_cache = 1;
 
     ERTS_MSEG_LOCK(ma);
 
-    for (mk=ma->mk_list; mk; mk=mk->next) {
-	if (check_one_cache(mk))
+    for (mk = ma->mk_list; mk; mk = mk->next) {
+	if (mseg_check_memkind_cache(mk))
 	    empty_cache = 0;
     }
 
+    /* If all MemKinds caches are empty,
+     * remove aux-work callback
+     */
     if (empty_cache) {
 	ma->is_cache_check_scheduled = 0;
-	erts_set_aux_work_timeout(ma->ix,
-				  ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK,
-				  0);
+	erts_set_aux_work_timeout(ma->ix, ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK, 0);
     }
 
     INC_CC(ma, check_cache);
@@ -627,27 +782,65 @@ static void do_cache_check(ErtsMsegAllctr_t *ma)
     ERTS_MSEG_UNLOCK(ma);
 }
 
-void erts_mseg_cache_check(void)
-{
-    do_cache_check(ERTS_MSEG_ALLCTR_SS());
+/* erts_mseg_cache_check
+ * - This is a callback that is scheduled as aux-work from
+ *   schedulers and is called at some interval if we have a cache
+ *   on this mseg-allocator and memkind.
+ * - Purpose: Empty cache slowly so we don't collect mapped areas
+ *   and bloat memory.
+ */
+
+void erts_mseg_cache_check(void) {
+    mseg_cache_check(ERTS_MSEG_ALLCTR_SS());
 }
 
-static void
-mseg_clear_cache(MemKind* mk)
-{
-    mk->segments.current.watermark = 0;
 
-    adjust_cache_size(mk, 1);
+/* *_mseg_clear_*_cache
+ * Remove cached segments from the allocator completely
+ */
+
+static void mseg_clear_memkind_cache(MemKind *mk) {
+    int i;
+
+    /* drop pow2 caches */
+    for (i = 0; i < CACHE_AREAS; i++) {
+	if (mk->cache_area[i] == NULL)
+	    continue;
+
+	mseg_drop_memkind_cache_size(mk, &(mk->cache_area[i]));
+	ASSERT(mk->cache_area[i] == NULL);
+    }
+    /* drop varied caches */
+    if(mk->cache_unpowered)
+	mseg_drop_memkind_cache_size(mk, &(mk->cache_unpowered));
+
+    ASSERT(mk->cache_unpowered == NULL);
+    ASSERT(mk->cache_size == 0);
+}
+
+static void mseg_clear_cache(ErtsMsegAllctr_t *ma) {
+    MemKind* mk;
+
+    ERTS_MSEG_LOCK(ma);
+    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
+
 
-    ASSERT(!mk->cache);
-    ASSERT(!mk->cache_end);
-    ASSERT(!mk->cache_size);
+    for (mk = ma->mk_list; mk; mk = mk->next) {
+	mseg_clear_memkind_cache(mk);
+    }
 
-    mk->segments.current.watermark = mk->segments.current.no;
+    INC_CC(ma, clear_cache);
 
-    INC_CC(mk->ma, clear_cache);
+    ERTS_MSEG_UNLOCK(ma);
 }
 
+void erts_mseg_clear_cache(void) {
+    mseg_clear_cache(ERTS_MSEG_ALLCTR_SS());
+    mseg_clear_cache(ERTS_MSEG_ALLCTR_IX(0));
+}
+
+
+
 static ERTS_INLINE MemKind* memkind(ErtsMsegAllctr_t *ma,
 				    const ErtsMsegOpt_t *opt)
 {
@@ -660,116 +853,40 @@ static ERTS_INLINE MemKind* memkind(ErtsMsegAllctr_t *ma,
 
 static void *
 mseg_alloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, Uint *size_p,
-	   const ErtsMsegOpt_t *opt)
+	   Uint flags, const ErtsMsegOpt_t *opt)
 {
-    Uint max, min, diff_size, size;
-    cache_desc_t *cd, *cand_cd;
+    Uint size;
     void *seg;
     MemKind* mk = memkind(ma, opt);
 
     INC_CC(ma, alloc);
 
-    size = PAGE_CEILING(*size_p);
+    /* Carrier align */
+    size = ALIGNED_CEILING(*size_p);
+
+    /* Cache optim (if applicable) */
+    if (MSEG_FLG_IS_2POW(flags) && !IS_2POW(size))
+	size = ceil_2pow(size);
 
 #if CAN_PARTLY_DESTROY
     if (size < ma->min_seg_size)	
 	ma->min_seg_size = size;
 #endif
+    
+    if (opt->cache && mk->cache_size > 0 && (seg = cache_get_segment(mk, &size)) != NULL) 
+	goto done;
 
-    if (!opt->cache) {
-    create_seg:
-	adjust_cache_size(mk,0);
-	seg = mseg_create(ma, mk, size);
-	if (!seg) {
-	    mseg_clear_cache(mk);
-	    seg = mseg_create(ma, mk, size);
-	    if (!seg)
-		size = 0;
-	}
-
-	*size_p = size;
-	if (seg) {
-	    if (erts_mtrace_enabled)
-		erts_mtrace_crr_alloc(seg, atype, ERTS_MTRACE_SEGMENT_ID, size);
-	    ERTS_MSEG_ALLOC_STAT(mk,size);
-	}
-	return seg;
-    }
-
-    if (size > mk->max_cached_seg_size)
-	goto create_seg;
-
-    if (size < mk->min_cached_seg_size) {
-
-	diff_size = mk->min_cached_seg_size - size;
-
-	if (diff_size > ma->abs_max_cache_bad_fit)
-	    goto create_seg;
-
-	if (100*PAGES(diff_size) > ma->rel_max_cache_bad_fit*PAGES(size))
-	    goto create_seg;
-
-    }
-
-    max = 0;
-    min = ~((Uint) 0);
-    cand_cd = NULL;
-
-    for (cd = mk->cache; cd; cd = cd->next) {
-	if (cd->size >= size) {
-	    if (!cand_cd) {
-		cand_cd = cd;
-		continue;
-	    }
-	    else if (cd->size < cand_cd->size) {
-		if (max < cand_cd->size)
-		    max = cand_cd->size;
-		if (min > cand_cd->size)
-		    min = cand_cd->size;
-		cand_cd = cd;
-		continue;
-	    }
-	}
-	if (max < cd->size)
-	    max = cd->size;
-	if (min > cd->size)
-	    min = cd->size;
-    }
-
-    mk->min_cached_seg_size = min;
-    mk->max_cached_seg_size = max;
-
-    if (!cand_cd)
-	goto create_seg;
-
-    diff_size = cand_cd->size - size;
-
-    if (diff_size > ma->abs_max_cache_bad_fit
-	|| 100*PAGES(diff_size) > ma->rel_max_cache_bad_fit*PAGES(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;
-    }
-
-    mk->cache_hits++;
-
-    size = cand_cd->size;
-    seg = cand_cd->seg;
-
-    unlink_cd(mk,cand_cd);
-    free_cd(mk,cand_cd);
+    if ((seg = mseg_create(ma, mk, size)) == NULL)
+	size = 0;
 
+done:
     *size_p = size;
+    if (seg) {
+	if (erts_mtrace_enabled)
+	    erts_mtrace_crr_alloc(seg, atype, ERTS_MTRACE_SEGMENT_ID, size);
 
-    if (erts_mtrace_enabled) {
-	erts_mtrace_crr_free(SEGTYPE, SEGTYPE, seg);
-	erts_mtrace_crr_alloc(seg, atype, SEGTYPE, size);
-    }
-
-    if (seg)
 	ERTS_MSEG_ALLOC_STAT(mk,size);
+    }
 
     return seg;
 }
@@ -780,73 +897,42 @@ mseg_dealloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg, Uint size,
 	     const ErtsMsegOpt_t *opt)
 {
     MemKind* mk = memkind(ma, opt);
-    cache_desc_t *cd;
+
 
     ERTS_MSEG_DEALLOC_STAT(mk,size);
 
-    if (!opt->cache || ma->max_cache_size == 0) {
-	if (erts_mtrace_enabled)
-	    erts_mtrace_crr_free(atype, SEGTYPE, seg);
-	mseg_destroy(ma, mk, seg, size);
+    if (opt->cache && cache_bless_segment(mk, seg, size)) {
+	schedule_cache_check(ma);
+	goto done;
     }
-    else {
-	int check_limits = 0;
-	
-	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(ma, mk, cd->seg, cd->size);
-	    unlink_cd(mk,cd);
-	    free_cd(mk,cd);
-	}
 
-	cd = alloc_cd(mk);
-	ASSERT(cd);
-	cd->seg = seg;
-	cd->size = size;
-	link_cd(mk,cd);
+    if (erts_mtrace_enabled)
+	erts_mtrace_crr_free(atype, SEGTYPE, seg);
 
-	if (erts_mtrace_enabled) {
-	    erts_mtrace_crr_free(atype, SEGTYPE, seg);
-	    erts_mtrace_crr_alloc(seg, SEGTYPE, SEGTYPE, size);
-	}
-
-	/* ASSERT(segments.current.watermark >= segments.current.no + cache_size); */
-
-	if (check_limits)
-	    check_cache_limits(mk);
+    mseg_destroy(ma, mk, seg, size);
 
-	schedule_cache_check(ma);
-
-    }
+done:
 
     INC_CC(ma, dealloc);
 }
 
 static void *
 mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
-	     Uint old_size, Uint *new_size_p, const ErtsMsegOpt_t *opt)
+	     Uint old_size, Uint *new_size_p, Uint flags, const ErtsMsegOpt_t *opt)
 {
     MemKind* mk;
     void *new_seg;
     Uint new_size;
 
+    /* Just allocate a new segment if we didn't have one before */
     if (!seg || !old_size) {
-	new_seg = mseg_alloc(ma, atype, new_size_p, opt);
+	new_seg = mseg_alloc(ma, atype, new_size_p, flags, opt);
 	DEC_CC(ma, alloc);
 	return new_seg;
     }
 
+
+    /* Dealloc old segment if new segment is of size 0 */
     if (!(*new_size_p)) {
 	mseg_dealloc(ma, atype, seg, old_size, opt);
 	DEC_CC(ma, dealloc);
@@ -855,7 +941,13 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 
     mk = memkind(ma, opt);
     new_seg = seg;
-    new_size = PAGE_CEILING(*new_size_p);
+
+    /* Carrier align */
+    new_size = ALIGNED_CEILING(*new_size_p);
+
+    /* Cache optim (if applicable) */
+    if (MSEG_FLG_IS_2POW(flags) && !IS_2POW(new_size))
+	new_size = ceil_2pow(new_size);
 
     if (new_size == old_size)
 	;
@@ -866,53 +958,27 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 	if (new_size < ma->min_seg_size)	
 	    ma->min_seg_size = new_size;
 #endif
-
+	/* +M<S>rsbcst <ratio> */
 	if (shrink_sz < opt->abs_shrink_th
-	    && 100*PAGES(shrink_sz) < opt->rel_shrink_th*PAGES(old_size)) {
+	    && 100*shrink_sz < opt->rel_shrink_th*old_size) {
 	    new_size = old_size;
 	}
 	else {
 
 #if CAN_PARTLY_DESTROY
 
-	    if (shrink_sz > ma->min_seg_size
-		&& mk->free_cache_descs
-		&& opt->cache) {
-		cache_desc_t *cd;
-
-		cd = alloc_cd(mk);
-		ASSERT(cd);
-		cd->seg = ((char *) seg) + new_size;
-		cd->size = shrink_sz;
-		end_link_cd(mk,cd);
-
-		if (erts_mtrace_enabled) {
-		    erts_mtrace_crr_realloc(new_seg,
-					    atype,
-					    SEGTYPE,
-					    seg,
-					    new_size);
-		    erts_mtrace_crr_alloc(cd->seg, SEGTYPE, SEGTYPE, cd->size);
-		}
-		schedule_cache_check(ma);
-	    }
-	    else {
-		if (erts_mtrace_enabled)
-		    erts_mtrace_crr_realloc(new_seg,
-					    atype,
-					    SEGTYPE,
-					    seg,
-					    new_size);
-		mseg_destroy(ma, mk, ((char *) seg) + new_size, shrink_sz);
-	    }
+	    if (erts_mtrace_enabled)
+		erts_mtrace_crr_realloc(new_seg, atype, SEGTYPE, seg, new_size);
 
-#elif HAVE_MSEG_RECREATE
+	    mseg_destroy(ma, mk, ((char *) seg) + new_size, shrink_sz);
 
+#elif HAVE_MSEG_RECREATE
 	    goto do_recreate;
-
 #else
+	    new_seg = mseg_alloc(ma, atype, &new_size, flags, opt);
+
+	    ASSERT(MAP_IS_ALIGNED(new_seg) || !new_seg);
 
-	    new_seg = mseg_alloc(ma, atype, &new_size, opt);
 	    if (!new_seg)
 		new_size = old_size;
 	    else {
@@ -921,16 +987,15 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 			   MIN(new_size, old_size));
 		mseg_dealloc(ma, atype, seg, old_size, opt);
 	    }
-
 #endif
-
 	}
     }
     else {
 
 	if (!opt->preserv) {
 	    mseg_dealloc(ma, atype, seg, old_size, opt);
-	    new_seg = mseg_alloc(ma, atype, &new_size, opt);
+	    new_seg = mseg_alloc(ma, atype, &new_size, flags, opt);
+	    ASSERT(MAP_IS_ALIGNED(new_seg) || !new_seg);
 	}
 	else {
 #if HAVE_MSEG_RECREATE
@@ -938,18 +1003,23 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 	do_recreate:
 #endif
 	    new_seg = mseg_recreate(ma, mk, (void *) seg, old_size, new_size);
+	    /* ASSERT(MAP_IS_ALIGNED(new_seg) || !new_seg);
+	     * will not always be aligned and it ok for now
+	     */
+
 	    if (erts_mtrace_enabled)
 		erts_mtrace_crr_realloc(new_seg, atype, SEGTYPE, seg, new_size);
 	    if (!new_seg)
 		new_size = old_size;
 #else
-	    new_seg = mseg_alloc(ma, atype, &new_size, opt);
+	    new_seg = mseg_alloc(ma, atype, &new_size, flags, opt);
+
+	    ASSERT(MAP_IS_ALIGNED(new_seg) || !new_seg);
+
 	    if (!new_seg)
 		new_size = old_size;
 	    else {
-		sys_memcpy(((char *) new_seg),
-			   ((char *) seg),
-			   MIN(new_size, old_size));
+		sys_memcpy(((char *) new_seg), ((char *) seg), MIN(new_size, old_size));
 		mseg_dealloc(ma, atype, seg, old_size, opt);
 	    }
 #endif
@@ -958,6 +1028,7 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 
     INC_CC(ma, realloc);
 
+    ASSERT(!MSEG_FLG_IS_2POW(flags) || IS_2POW(new_size));
     *new_size_p = new_size;
 
     ERTS_MSEG_REALLOC_STAT(mk, old_size, new_size);
@@ -990,6 +1061,7 @@ static struct {
     Eterm mseg_dealloc;
     Eterm mseg_realloc;
     Eterm mseg_create;
+    Eterm mseg_create_resize;
     Eterm mseg_destroy;
 #if HAVE_MSEG_RECREATE
     Eterm mseg_recreate;
@@ -1046,6 +1118,7 @@ init_atoms(ErtsMsegAllctr_t *ma)
 	AM_INIT(mseg_dealloc);
 	AM_INIT(mseg_realloc);
 	AM_INIT(mseg_create);
+	AM_INIT(mseg_create_resize);
 	AM_INIT(mseg_destroy);
 #if HAVE_MSEG_RECREATE
 	AM_INIT(mseg_recreate);
@@ -1065,14 +1138,12 @@ init_atoms(ErtsMsegAllctr_t *ma)
     erts_mtx_unlock(&init_atoms_mutex);
 }
 
-
 #define bld_uint	erts_bld_uint
 #define bld_cons	erts_bld_cons
 #define bld_tuple	erts_bld_tuple
 #define bld_string	erts_bld_string
 #define bld_2tup_list	erts_bld_2tup_list
 
-
 /*
  * bld_unstable_uint() (instead of bld_uint()) is used when values may
  * change between size check and actual build. This because a value
@@ -1116,6 +1187,7 @@ add_4tup(Uint **hpp, Uint *szp, Eterm *lp,
     *lp = bld_cons(hpp, szp, bld_tuple(hpp, szp, 4, el1, el2, el3, el4), *lp);
 }
 
+
 static Eterm
 info_options(ErtsMsegAllctr_t *ma,
 	     char *prefix,
@@ -1176,6 +1248,7 @@ info_calls(ErtsMsegAllctr_t *ma, int *print_to_p, void *print_to_arg, Uint **hpp
 	PRINT_CC(to, arg, dealloc);
 	PRINT_CC(to, arg, realloc);
 	PRINT_CC(to, arg, create);
+	PRINT_CC(to, arg, create_resize);
 	PRINT_CC(to, arg, destroy);
 #if HAVE_MSEG_RECREATE
 	PRINT_CC(to, arg, recreate);
@@ -1215,6 +1288,10 @@ info_calls(ErtsMsegAllctr_t *ma, int *print_to_p, void *print_to_arg, Uint **hpp
 		 bld_unstable_uint(hpp, szp, ma->calls.create.giga_no),
 		 bld_unstable_uint(hpp, szp, ma->calls.create.no));
 
+	add_3tup(hpp, szp, &res,
+		 am.mseg_create_resize,
+		 bld_unstable_uint(hpp, szp, ma->calls.create_resize.giga_no),
+		 bld_unstable_uint(hpp, szp, ma->calls.create_resize.no));
 
 	add_3tup(hpp, szp, &res,
 		 am.mseg_realloc,
@@ -1401,21 +1478,21 @@ erts_mseg_info(int ix,
 }
 
 void *
-erts_mseg_alloc_opt(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
+erts_mseg_alloc_opt(ErtsAlcType_t atype, Uint *size_p, Uint flags, const ErtsMsegOpt_t *opt)
 {
     ErtsMsegAllctr_t *ma = ERTS_MSEG_ALLCTR_OPT(opt);
     void *seg;
     ERTS_MSEG_LOCK(ma);
     ERTS_DBG_MA_CHK_THR_ACCESS(ma);
-    seg = mseg_alloc(ma, atype, size_p, opt);
+    seg = mseg_alloc(ma, atype, size_p, flags, opt);
     ERTS_MSEG_UNLOCK(ma);
     return seg;
 }
 
 void *
-erts_mseg_alloc(ErtsAlcType_t atype, Uint *size_p)
+erts_mseg_alloc(ErtsAlcType_t atype, Uint *size_p, Uint flags)
 {
-    return erts_mseg_alloc_opt(atype, size_p, &erts_mseg_default_opt);
+    return erts_mseg_alloc_opt(atype, size_p, flags, &erts_mseg_default_opt);
 }
 
 void
@@ -1438,44 +1515,24 @@ erts_mseg_dealloc(ErtsAlcType_t atype, void *seg, Uint size)
 void *
 erts_mseg_realloc_opt(ErtsAlcType_t atype, void *seg,
 		      Uint old_size, Uint *new_size_p,
+		      Uint flags,
 		      const ErtsMsegOpt_t *opt)
 {
     ErtsMsegAllctr_t *ma = ERTS_MSEG_ALLCTR_OPT(opt);
     void *new_seg;
     ERTS_MSEG_LOCK(ma);
     ERTS_DBG_MA_CHK_THR_ACCESS(ma);
-    new_seg = mseg_realloc(ma, atype, seg, old_size, new_size_p, opt);
+    new_seg = mseg_realloc(ma, atype, seg, old_size, new_size_p, flags, opt);
     ERTS_MSEG_UNLOCK(ma);
     return new_seg;
 }
 
 void *
 erts_mseg_realloc(ErtsAlcType_t atype, void *seg,
-		  Uint old_size, Uint *new_size_p)
+		  Uint old_size, Uint *new_size_p, Uint flags)
 {
     return erts_mseg_realloc_opt(atype, seg, old_size, new_size_p,
-				 &erts_mseg_default_opt);
-}
-
-void
-erts_mseg_clear_cache(void)
-{
-    ErtsMsegAllctr_t *ma = ERTS_MSEG_ALLCTR_SS();
-    MemKind* mk;
-
-start:
-
-    ERTS_MSEG_LOCK(ma);
-    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
-    for (mk=ma->mk_list; mk; mk=mk->next) {
-	mseg_clear_cache(mk);
-    }
-    ERTS_MSEG_UNLOCK(ma);
-
-    if (ma->ix != 0) {
-	ma = ERTS_MSEG_ALLCTR_IX(0);
-	goto start;
-    }
+				 flags, &erts_mseg_default_opt);
 }
 
 Uint
@@ -1496,28 +1553,32 @@ erts_mseg_no(const ErtsMsegOpt_t *opt)
 Uint
 erts_mseg_unit_size(void)
 {
-    return page_size;
+    return MSEG_ALIGNED_SIZE;
 }
 
 static void mem_kind_init(ErtsMsegAllctr_t *ma, MemKind* mk, const char* name)
 {
-    unsigned i;
+    int 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;
+    for (i = 0; i < CACHE_AREAS; i++) {
+	mk->cache_area[i] = NULL;
+    }
+
+    mk->cache_free = NULL;
 
-    if (ma->max_cache_size > 0) {
-	for (i = 0; i < ma->max_cache_size - 1; i++)
-	    mk->cache_descs[i].next = &mk->cache_descs[i + 1];
-	mk->cache_descs[ma->max_cache_size - 1].next = NULL;
-	mk->free_cache_descs = &mk->cache_descs[0];
+    ASSERT(ma->max_cache_size <= MAX_CACHE_SIZE);
+
+    for (i = 0; i < ma->max_cache_size; i++) {
+	mk->cache[i].seg  = NULL;
+	mk->cache[i].size = 0;
+	mk->cache[i].next = mk->cache_free;
+	mk->cache_free = &(mk->cache[i]);
     }
-    else
-	mk->free_cache_descs = NULL;
+
+    mk->cache_unpowered = NULL;
+
+    mk->cache_size = 0;
+    mk->cache_hits = 0;
 
     mk->segments.current.watermark = 0;
     mk->segments.current.no = 0;
@@ -1570,15 +1631,10 @@ erts_mseg_init(ErtsMsegInit_t *init)
     initialize_pmmap();
 #endif
 
-    page_size = GET_PAGE_SIZE;
+    if (!IS_2POW(GET_PAGE_SIZE))
+	erl_exit(ERTS_ABORT_EXIT, "erts_mseg: Unexpected page_size %beu\n", GET_PAGE_SIZE);
 
-    page_shift = 1;
-    while ((page_size >> page_shift) != 1) {
-	if ((page_size & (1 << (page_shift - 1))) != 0)
-	    erl_exit(ERTS_ABORT_EXIT,
-		     "erts_mseg: Unexpected page_size %beu\n", page_size);
-	page_shift++;
-    }
+    ASSERT((MSEG_ALIGNED_SIZE % GET_PAGE_SIZE) == 0);
 
     for (i = 0; i < no_mseg_allocators; i++) {
 	ErtsMsegAllctr_t *ma = ERTS_MSEG_ALLCTR_IX(i);
@@ -1663,7 +1719,7 @@ erts_mseg_test(unsigned long op,
     case 0x400: /* Have erts_mseg */
 	return (unsigned long) 1;
     case 0x401:
-	return (unsigned long) erts_mseg_alloc(ERTS_ALC_A_INVALID, (Uint *) a1);
+	return (unsigned long) erts_mseg_alloc(ERTS_ALC_A_INVALID, (Uint *) a1, (Uint) 0);
     case 0x402:
 	erts_mseg_dealloc(ERTS_ALC_A_INVALID, (void *) a1, (Uint) a2);
 	return (unsigned long) 0;
@@ -1671,7 +1727,8 @@ erts_mseg_test(unsigned long op,
 	return (unsigned long) erts_mseg_realloc(ERTS_ALC_A_INVALID,
 						 (void *) a1,
 						 (Uint) a2,
-						 (Uint *) a3);
+						 (Uint *) a3,
+						 (Uint) 0);
     case 0x404:
 	erts_mseg_clear_cache();
 	return (unsigned long) 0;
@@ -1707,7 +1764,40 @@ erts_mseg_test(unsigned long op,
  * mapping tricks.
  */
 
-/*#define HARDDEBUG 1*/
+/* #define HARDDEBUG 1 */
+
+#ifdef HARDDEBUG
+static void dump_freelist(void)
+{
+    FreeBlock *p = first;
+
+    while (p) {
+	fprintf(stderr, "p = %p\r\np->num = %ld\r\np->next = %p\r\n\r\n",
+	       (void *) p, (unsigned long) p->num, (void *) p->next);
+	p = p->next;
+    }
+}
+
+#define HARDDEBUG_HW_INCOMPLETE_ALIGNMENT(PTR, SZ)            \
+    fprintf(stderr,"Mapping of address %p with size %ld "     \
+	    "does not map complete pages (%s:%d)\r\n",        \
+	    (void *) (PTR), (unsigned long) (SZ),__FILE__, __LINE__)
+
+#define HARDDEBUG_HW_UNALIGNED_ALIGNMENT(PTR, SZ)             \
+    fprintf(stderr,"Mapping of address %p with size %ld "     \
+	    "is not page aligned (%s:%d)\r\n",                \
+	    (void *) (PTR), (unsigned long) (SZ),__FILE__, __LINE__)
+
+#define HARDDEBUG_MAP_FAILED(PTR, SZ) \
+    fprintf(stderr, "Could not actually map memory "          \
+	    "at address %p with size %ld (%s:%d) ..\r\n",     \
+	    (void *) (PTR), (unsigned long) (SZ),__FILE__, __LINE__)
+#else
+#define HARDDEBUG_HW_INCOMPLETE_ALIGNMENT(PTR, SZ) do{}while(0)
+#define HARDDEBUG_HW_UNALIGNED_ALIGNMENT(PTR, SZ)  do{}while(0)
+#define HARDDEBUG_MAP_FAILED(PTR, SZ)              do{}while(0)
+#endif
+
 
 #ifdef __APPLE__
 #define MAP_ANONYMOUS MAP_ANON
@@ -1726,49 +1816,20 @@ typedef struct _free_block {
     struct _free_block *next;
 } FreeBlock;
 
-/* Assigned once and for all */
-static size_t pagsz;
-
 /* Protect with lock */
 static FreeBlock *first;
 
-static size_t round_up_to_pagesize(size_t size)
-{
-    size_t x  = size / pagsz;
-
-    if ((size % pagsz)) {
-	++x;
-    }
-
-    return pagsz * x;
-}
-
-static size_t round_down_to_pagesize(size_t size)
-{
-    size_t x  = size / pagsz;
-
-    return pagsz * x;
-}
-
 static void *do_map(void *ptr, size_t sz)
 {
     void *res;
 
-    if (round_up_to_pagesize(sz) != sz) {
-#ifdef HARDDEBUG
-	fprintf(stderr,"Mapping of address %p with size %ld "
-		"does not map complete pages\r\n",
-		(void *) ptr, (unsigned long) sz);
-#endif
+    if (ALIGNED_CEILING(sz) != sz) {
+	HARDDEBUG_HW_INCOMPLETE_ALIGNMENT(ptr, sz);
 	return NULL;
     }
 
-    if (((unsigned long) ptr) % pagsz) {
-#ifdef HARDDEBUG
-	fprintf(stderr,"Mapping of address %p with size %ld "
-		"is not page aligned\r\n",
-		(void *) ptr, (unsigned long) sz);
-#endif
+    if (((unsigned long) ptr) % MSEG_ALIGNED_SIZE) {
+	HARDDEBUG_HW_UNALIGNED_ALIGNMENT(ptr, sz);
 	return NULL;
     }
 
@@ -1782,10 +1843,7 @@ static void *do_map(void *ptr, size_t sz)
 #endif
 
     if (res == MAP_FAILED) {
-#ifdef HARDDEBUG
-	fprintf(stderr,"Mapping of address %p with size %ld failed!\r\n",
-		(void *) ptr, (unsigned long) sz);
-#endif
+	HARDDEBUG_MAP_FAILED(ptr, sz);
 	return NULL;
     }
 
@@ -1796,35 +1854,22 @@ static int do_unmap(void *ptr, size_t sz)
 {
     void *res;
 
-    if (round_up_to_pagesize(sz) != sz) {
-#ifdef HARDDEBUG
-	fprintf(stderr,"Mapping of address %p with size %ld "
-		"does not map complete pages\r\n",
-		(void *) ptr, (unsigned long) sz);
-#endif
+    if (ALIGNED_CEILING(sz) != sz) {
+	HARDDEBUG_HW_INCOMPLETE_ALIGNMENT(ptr, sz);
 	return 1;
     }
 
-    if (((unsigned long) ptr) % pagsz) {
-#ifdef HARDDEBUG
-	fprintf(stderr,"Mapping of address %p with size %ld "
-		"is not page aligned\r\n",
-		(void *) ptr, (unsigned long) sz);
-#endif
+    if (((unsigned long) ptr) % MSEG_ALIGNED_SIZE) {
+	HARDDEBUG_HW_UNALIGNED_ALIGNMENT(ptr, sz);
 	return 1;
     }
 
-
     res = mmap(ptr, sz,
-	       PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE
-	       | MAP_FIXED,
+	       PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED,
 	       -1 , 0);
 
     if (res == MAP_FAILED) {
-#ifdef HARDDEBUG
-	fprintf(stderr,"Mapping of address %p with size %ld failed!\r\n",
-		(void *) ptr, (unsigned long) sz);
-#endif
+	HARDDEBUG_MAP_FAILED(ptr, sz);
 	return 1;
     }
 
@@ -1862,8 +1907,6 @@ static int initialize_pmmap(void)
     size_t rsz;
     FreeBlock *initial;
 
-
-    pagsz = getpagesize();
     SET_RANGE_MIN();
     if (sizeof(void *) != 8) {
 	erl_exit(1,"Halfword emulator cannot be run in 32bit mode");
@@ -1872,15 +1915,15 @@ static int initialize_pmmap(void)
     p = (char *) RANGE_MIN;
     q = (char *) RANGE_MAX;
 
-    rsz = round_down_to_pagesize(q - p);
+    rsz = ALIGNED_FLOOR(q - p);
 
-    rptr = mmap((void *) p, rsz,
+    rptr = mmap_align(NULL, (void *) p, rsz,
 		PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS |
 		MAP_NORESERVE | EXTRA_MAP_FLAGS,
 		-1 , 0);
 #ifdef HARDDEBUG
     printf("p=%p, rsz = %ld, pages = %ld, got range = %p -> %p\r\n",
-	   p, (unsigned long) rsz, (unsigned long) (rsz / pagsz),
+	   p, (unsigned long) rsz, (unsigned long) (rsz / MSEG_ALIGNED_SIZE),
 	   (void *) rptr, (void*)(rptr + rsz));
 #endif
     if ((UWord)(rptr + rsz) > RANGE_MAX) {
@@ -1892,39 +1935,27 @@ static int initialize_pmmap(void)
 	munmap((void*)RANGE_MAX, rsz - rsz_trunc);
 	rsz = rsz_trunc;
     }
-    if (!do_map(rptr,pagsz)) {
+    if (!do_map(rptr, MSEG_ALIGNED_SIZE)) {
 	erl_exit(1,"Could not actually mmap first page for halfword emulator...\n");
     }
     initial = (FreeBlock *) rptr;
-    initial->num = (rsz / pagsz);
+    initial->num = (rsz / MSEG_ALIGNED_SIZE);
     initial->next = NULL;
     first = initial;
     INIT_LOCK();
     return 0;
 }
 
-#ifdef HARDDEBUG
-static void dump_freelist(void)
-{
-    FreeBlock *p = first;
-
-    while (p) {
-	printf("p = %p\r\np->num = %ld\r\np->next = %p\r\n\r\n",
-	       (void *) p, (unsigned long) p->num, (void *) p->next);
-	p = p->next;
-    }
-}
-#endif
-
-
 static void *pmmap(size_t size)
 {
-    size_t real_size = round_up_to_pagesize(size);
-    size_t num_pages = real_size / pagsz;
+    size_t real_size = ALIGNED_CEILING(size);
+    size_t num_pages = real_size / MSEG_ALIGNED_SIZE;
     FreeBlock **block;
     FreeBlock *tail;
     FreeBlock *res;
+
     TAKE_LOCK();
+
     for (block = &first;
 	 *block != NULL && (*block)->num < num_pages;
 	 block = &((*block)->next))
@@ -1935,29 +1966,25 @@ static void *pmmap(size_t size)
     }
     if ((*block)->num == num_pages) {
 	/* nice, perfect fit */
-	res = *block;
+	res    = *block;
 	*block = (*block)->next;
     } else {
 	tail = (FreeBlock *) (((char *) ((void *) (*block))) + real_size);
-	if (!do_map(tail,pagsz)) {
-#ifdef HARDDEBUG
-	    fprintf(stderr, "Could not actually allocate page at %p...\r\n",
-		    (void *) tail);
-#endif
+	if (!do_map(tail, MSEG_ALIGNED_SIZE)) {
+	    HARDDEBUG_MAP_FAILED(tail, MSEG_ALIGNED_SIZE);
 	    RELEASE_LOCK();
 	    return NULL;
 	}
-	tail->num = (*block)->num - num_pages;
+	tail->num  = (*block)->num - num_pages;
 	tail->next = (*block)->next;
 	res = *block;
 	*block = tail;
     }
+
     RELEASE_LOCK();
-    if (!do_map(res,real_size)) {
-#ifdef HARDDEBUG
-	fprintf(stderr, "Could not actually allocate %ld at %p...\r\n",
-		(unsigned long) real_size, (void *) res);
-#endif
+
+    if (!do_map(res, real_size)) {
+	HARDDEBUG_MAP_FAILED(res, real_size);
 	return NULL;
     }
 
@@ -1966,15 +1993,17 @@ static void *pmmap(size_t size)
 
 static int pmunmap(void *p, size_t size)
 {
-    size_t real_size = round_up_to_pagesize(size);
-    size_t num_pages = real_size / pagsz;
+    size_t real_size = ALIGNED_CEILING(size);
+    size_t num_pages = real_size / MSEG_ALIGNED_SIZE;
+
     FreeBlock *block;
     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)) {
+
+    if (real_size > MSEG_ALIGNED_SIZE) {
+	if (do_unmap(((char *) p) + MSEG_ALIGNED_SIZE, real_size - MSEG_ALIGNED_SIZE)) {
 	    return 1;
 	}
     }
@@ -1993,7 +2022,7 @@ static int pmunmap(void *p, size_t size)
 	/* Merge new free block with following */
 	nb->num = block->num + num_pages;
 	nb->next = block->next;
-	if (do_unmap(block,pagsz)) {
+	if (do_unmap(block, MSEG_ALIGNED_SIZE)) {
 	    RELEASE_LOCK();
 	    return 1;
 	}
@@ -2003,11 +2032,11 @@ static int pmunmap(void *p, size_t size)
 	nb->next = block;
     }
     if (last != NULL) {
-	if (p == ((void *) (((char *) last) + (last->num * pagsz)))) {
+	if (p == ((void *) (((char *) last) + (last->num * MSEG_ALIGNED_SIZE)))) {
 	    /* Merge with previous */
 	    last->num += nb->num;
 	    last->next = nb->next;
-	    if (do_unmap(nb,pagsz)) {
+	    if (do_unmap(nb, MSEG_ALIGNED_SIZE)) {
 		RELEASE_LOCK();
 		return 1;
 	    }
@@ -2024,10 +2053,10 @@ static int pmunmap(void *p, size_t size)
 static void *pmremap(void *old_address, size_t old_size,
 	      size_t new_size)
 {
-    size_t new_real_size = round_up_to_pagesize(new_size);
-    size_t new_num_pages = new_real_size / pagsz;
-    size_t old_real_size = round_up_to_pagesize(old_size);
-    size_t old_num_pages = old_real_size / pagsz;
+    size_t new_real_size = ALIGNED_CEILING(new_size);
+    size_t new_num_pages = new_real_size / MSEG_ALIGNED_SIZE;
+    size_t old_real_size = ALIGNED_CEILING(old_size);
+    size_t old_num_pages = old_real_size / MSEG_ALIGNED_SIZE;
     if (new_num_pages == old_num_pages) {
 	return old_address;
     } else if (new_num_pages < old_num_pages) { /* Shrink */
@@ -2045,8 +2074,8 @@ static void *pmremap(void *old_address, size_t old_size,
 	    (*block) > ((FreeBlock *)(((char *) vnfb) + nfb_real_size))) {
 	    /* Normal link in */
 	    if (nfb_pages > 1) {
-		if (do_unmap((void *)(((char *) vnfb) + pagsz),
-			     (nfb_pages - 1)*pagsz)) {
+		if (do_unmap((void *)(((char *) vnfb) + MSEG_ALIGNED_SIZE),
+			     (nfb_pages - 1)*MSEG_ALIGNED_SIZE)) {
 		    return NULL;
 		}
 	    }
@@ -2058,8 +2087,8 @@ static void *pmremap(void *old_address, size_t old_size,
 	    nfb->num = nfb_pages + (*block)->num;
 	    /* unmap also the first page of the next freeblock */
 	    (*block) = nfb;
-	    if (do_unmap((void *)(((char *) vnfb) + pagsz),
-			 nfb_pages*pagsz)) {
+	    if (do_unmap((void *)(((char *) vnfb) + MSEG_ALIGNED_SIZE),
+			 nfb_pages*MSEG_ALIGNED_SIZE)) {
 		return NULL;
 	    }
 	}
@@ -2094,9 +2123,9 @@ static void *pmremap(void *old_address, size_t old_size,
 	    size_t remaining_pages = (*block)->num -
 		(new_num_pages - old_num_pages);
 	    if (!remaining_pages) {
-		void *p = (void *) (((char *) (*block)) + pagsz);
+		void *p = (void *) (((char *) (*block)) + MSEG_ALIGNED_SIZE);
 		void *n = (*block)->next;
-		size_t x = ((*block)->num - 1) * pagsz;
+		size_t x = ((*block)->num - 1) * MSEG_ALIGNED_SIZE;
 		if (x > 0) {
 		    if (do_map(p,x) == NULL) {
 			RELEASE_LOCK();
@@ -2108,7 +2137,7 @@ static void *pmremap(void *old_address, size_t old_size,
 		FreeBlock *nfb = (FreeBlock *) ((void *)
 						(((char *) old_address) +
 						 new_real_size));
-		void *p = (void *) (((char *) (*block)) + pagsz);
+		void *p = (void *) (((char *) (*block)) + MSEG_ALIGNED_SIZE);
 		if (do_map(p,new_real_size - old_real_size) == NULL) {
 		    RELEASE_LOCK();
 		    return NULL;
@@ -2122,5 +2151,4 @@ static void *pmremap(void *old_address, size_t old_size,
 	}
     }
 }
-
 #endif /* HALFWORD_HEAP */
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h
index 741080fb78..6f373f13f9 100644
--- a/erts/emulator/sys/common/erl_mseg.h
+++ b/erts/emulator/sys/common/erl_mseg.h
@@ -32,12 +32,35 @@
 
 #if HAVE_MMAP
 #  define HAVE_ERTS_MSEG 1
+#  define HAVE_SUPER_ALIGNED_MB_CARRIERS 1
 #else
 #  define HAVE_ERTS_MSEG 0
+#  define HAVE_SUPER_ALIGNED_MB_CARRIERS 0
+#endif
+
+#if HAVE_SUPER_ALIGNED_MB_CARRIERS
+#  define MSEG_ALIGN_BITS (18)
+   /* Affects hard limits for sbct and lmbcs documented in erts_alloc.xml */
+#else
+/* If we don't use super aligned multiblock carriers
+ * we will mmap with page size alignment (and thus use corresponding
+ * align bits).
+ *
+ * Current implementation needs this to be a constant and
+ * only uses this for user dev testing so setting page size
+ * to 4096 (12 bits) is fine.
+ */
+#  define MSEG_ALIGN_BITS       (12)
 #endif
 
 #if HAVE_ERTS_MSEG
 
+#define MSEG_ALIGNED_SIZE     (1 << MSEG_ALIGN_BITS)
+
+#define ERTS_MSEG_FLG_NONE    ((Uint)(0))
+#define ERTS_MSEG_FLG_2POW    ((Uint)(1 << 0))
+
+
 #define ERTS_MSEG_VSN_STR "0.9"
 
 typedef struct {
@@ -68,13 +91,13 @@ typedef struct {
 
 extern const ErtsMsegOpt_t erts_mseg_default_opt;
 
-void *erts_mseg_alloc(ErtsAlcType_t, Uint *);
-void *erts_mseg_alloc_opt(ErtsAlcType_t, Uint *, const ErtsMsegOpt_t *);
+void *erts_mseg_alloc(ErtsAlcType_t, Uint *, Uint);
+void *erts_mseg_alloc_opt(ErtsAlcType_t, Uint *, Uint, const ErtsMsegOpt_t *);
 void  erts_mseg_dealloc(ErtsAlcType_t, void *, Uint);
 void  erts_mseg_dealloc_opt(ErtsAlcType_t, void *, Uint, const ErtsMsegOpt_t *);
-void *erts_mseg_realloc(ErtsAlcType_t, void *, Uint, Uint *);
+void *erts_mseg_realloc(ErtsAlcType_t, void *, Uint, Uint *, Uint);
 void *erts_mseg_realloc_opt(ErtsAlcType_t, void *, Uint, Uint *,
-			    const ErtsMsegOpt_t *);
+			    Uint, const ErtsMsegOpt_t *);
 void  erts_mseg_clear_cache(void);
 void  erts_mseg_cache_check(void);
 Uint  erts_mseg_no( const ErtsMsegOpt_t *);
diff --git a/erts/emulator/test/alloc_SUITE_data/allocator_test.h b/erts/emulator/test/alloc_SUITE_data/allocator_test.h
index cd4a91d34a..c0396ddb61 100644
--- a/erts/emulator/test/alloc_SUITE_data/allocator_test.h
+++ b/erts/emulator/test/alloc_SUITE_data/allocator_test.h
@@ -60,9 +60,9 @@ typedef void* erts_cond;
 #define IS_MMAP_C(C)		((Ulong)	ALC_TEST1(0x00a, (C)))
 #define C_SZ(C)			((Ulong)	ALC_TEST1(0x00b, (C)))
 #define SBC2BLK(A, C)		((Block_t *)	ALC_TEST2(0x00c, (A), (C)))
-#define BLK2SBC(A, B)		((Carrier_t *)	ALC_TEST2(0x00d, (A), (B)))
-#define MBC2FBLK(A, C)		((Block_t *)	ALC_TEST2(0x00e, (A), (C)))
-#define FBLK2MBC(A, B)		((Carrier_t *)	ALC_TEST2(0x00f, (A), (B)))
+#define BLK_TO_SBC(A, B)	((Carrier_t *)	ALC_TEST2(0x00d, (A), (B)))
+#define MBC_TO_FIRST_BLK(A, C)	((Block_t *)	ALC_TEST2(0x00e, (A), (C)))
+#define FIRST_BLK_TO_MBC(A, B)	((Carrier_t *)	ALC_TEST2(0x00f, (A), (B)))
 #define FIRST_MBC(A)		((Carrier_t *)	ALC_TEST1(0x010, (A)))
 #define LAST_MBC(A)		((Carrier_t *)	ALC_TEST1(0x011, (A)))
 #define FIRST_SBC(A)		((Carrier_t *)	ALC_TEST1(0x012, (A)))
@@ -73,7 +73,7 @@ typedef void* erts_cond;
 #define MIN_BLK_SZ(A)		((Ulong)	ALC_TEST1(0x017, (A)))
 #define NXT_BLK(B)		((Block_t *)	ALC_TEST1(0x018, (B)))
 #define PREV_BLK(B)		((Block_t *)	ALC_TEST1(0x019, (B)))
-#define IS_FIRST_BLK(B)		((Ulong)	ALC_TEST1(0x01a, (B)))
+#define IS_MBC_FIRST_BLK(A,B)	((Ulong)	ALC_TEST2(0x01a, (A), (B)))
 #define UNIT_SZ			((Ulong)	ALC_TEST0(0x01b))
 
 /* From erl_goodfit_alloc.c */
diff --git a/erts/emulator/test/alloc_SUITE_data/basic.c b/erts/emulator/test/alloc_SUITE_data/basic.c
index 4a5e888161..0c27665712 100644
--- a/erts/emulator/test/alloc_SUITE_data/basic.c
+++ b/erts/emulator/test/alloc_SUITE_data/basic.c
@@ -44,7 +44,7 @@ testcase_run(TestCaseState_t *tcs)
 
     c = FIRST_MBC(a);
     ASSERT(tcs, !NEXT_C(c));
-    blk = MBC2FBLK(a, c);
+    blk = MBC_TO_FIRST_BLK(a, c);
     ASSERT(tcs, IS_LAST_BLK(blk));
     ASSERT(tcs, IS_FREE_BLK(blk));
 
diff --git a/erts/emulator/test/alloc_SUITE_data/bucket_mask.c b/erts/emulator/test/alloc_SUITE_data/bucket_mask.c
index b214f87e4a..34979cacf1 100644
--- a/erts/emulator/test/alloc_SUITE_data/bucket_mask.c
+++ b/erts/emulator/test/alloc_SUITE_data/bucket_mask.c
@@ -22,7 +22,7 @@
 #include "allocator_test.h"
 #include <stdio.h>
 
-#ifdef __WIN32__ && SIZEOF_VOID_P == 8
+#if defined(__WIN32__) && SIZEOF_VOID_P == 8
 /* Use larger threashold for win64 as block alignment
    is 16 bytes and not 8 */
 #define SBCT ((1024*1024))
@@ -48,10 +48,16 @@ testcase_cleanup(TestCaseState_t *tcs)
 void
 testcase_run(TestCaseState_t *tcs)
 {
-    void *tmp;
-    void **fence;
+    typedef struct linked_block {
+	struct linked_block* next;
+    }Linked;
+    Linked* link;
+    Linked* fence_list;
+    Linked* pad_list;
+    void* tmp;
     void **blk;
     Ulong sz;
+    Ulong residue;
     Ulong smbcs;
     int i;
     int bi;
@@ -73,7 +79,7 @@ testcase_run(TestCaseState_t *tcs)
     ASSERT(tcs, a);
 
     min_blk_sz = MIN_BLK_SZ(a);
-    smbcs = 2*(no_bkts*sizeof(void *) + min_blk_sz) + min_blk_sz;
+    smbcs = (no_bkts*sizeof(void *) + min_blk_sz) + min_blk_sz;
     for (i = 0; i < no_bkts; i++) {
 	sz = BKT_MIN_SZ(a, i);
 	if (sz >= sbct)
@@ -98,26 +104,42 @@ testcase_run(TestCaseState_t *tcs)
     tcs->extra = (void *) a;
     ASSERT(tcs, a);
 
+
     blk = (void **) ALLOC(a, no_bkts*sizeof(void *));
-    fence = (void **) ALLOC(a, no_bkts*sizeof(void *));
 
-    ASSERT(tcs, blk && fence);
+    ASSERT(tcs, blk);
+    fence_list = NULL;
 
     testcase_printf(tcs, "Allocating blocks and fences\n");
     for (i = 0; i < bi_tests; i++) {
 	sz = BKT_MIN_SZ(a, i);
 	blk[i] = ALLOC(a, sz - ablk_hdr_sz);
-	fence[i] = ALLOC(a, 1);
-	ASSERT(tcs, blk[i] && fence[i]);
+	link = (Linked*) ALLOC(a, sizeof(Linked));
+	ASSERT(tcs, blk[i] && link);
+	link->next = fence_list;
+	fence_list = link;
     }
 
-    tmp = (void *) UMEM2BLK(fence[bi_tests - 1]);
-    tmp = (void *) NXT_BLK((Block_t *) tmp);
-    ASSERT(tcs, IS_LAST_BLK(tmp));
-    sz = BLK_SZ((Block_t *) tmp);
-    testcase_printf(tcs, "Allocating leftover size = %lu\n", sz);
-    tmp = ALLOC(a, sz - ablk_hdr_sz);
-    ASSERT(tcs, tmp);
+    pad_list = 0;
+    do {
+	tmp = (void *) UMEM2BLK(link); /* last allocated */
+	tmp = (void *) NXT_BLK((Block_t *) tmp);
+	ASSERT(tcs, IS_LAST_BLK(tmp));
+	sz = BLK_SZ((Block_t *) tmp);
+	if (sz >= sbct) {
+	    residue = sz;
+	    sz = sbct - min_blk_sz;
+	    residue -= sz;
+	}
+	else {
+	    residue = 0;
+	}
+	testcase_printf(tcs, "Allocating leftover size = %lu, residue = %lu\n", sz, residue);
+	link = (Linked*) ALLOC(a, sz - ablk_hdr_sz);
+	ASSERT(tcs, link);
+	link->next = pad_list;
+	pad_list = link;
+    } while (residue);
 
     bi = FIND_BKT(a, 0);
     ASSERT(tcs, bi < 0);
@@ -135,16 +157,23 @@ testcase_run(TestCaseState_t *tcs)
 
     for (i = 0; i < bi_tests; i++) {
 	FREE(a, blk[i]);
-	FREE(a, fence[i]);
+    }
+    while (fence_list) {
+	link = fence_list;
+	fence_list = link->next;
+	FREE(a, link);
     }
 
     FREE(a, (void *) blk);
-    FREE(a, (void *) fence);
 
     bi = FIND_BKT(a, 0);
     ASSERT(tcs, bi == no_bkts - 1);
 
-    FREE(a, tmp);
+    while (pad_list) {
+	link = pad_list;
+	pad_list = link->next;
+	FREE(a, link);
+    }
 
     bi = FIND_BKT(a, 0);
     ASSERT(tcs, bi < 0);
diff --git a/erts/emulator/test/alloc_SUITE_data/coalesce.c b/erts/emulator/test/alloc_SUITE_data/coalesce.c
index 6f35d3279b..981fa6d43e 100644
--- a/erts/emulator/test/alloc_SUITE_data/coalesce.c
+++ b/erts/emulator/test/alloc_SUITE_data/coalesce.c
@@ -54,7 +54,7 @@ setup_sequence(TestCaseState_t *tcs, Allctr_t *a, Ulong bsz, int no,
 		    no, bsz);
     c = FIRST_MBC(a);
     ASSERT(tcs, !NEXT_C(c));
-    blk = MBC2FBLK(a, c);
+    blk = MBC_TO_FIRST_BLK(a, c);
     ASSERT(tcs, IS_LAST_BLK(blk));
 
     for (i = 0; i < no; i++)
@@ -266,7 +266,7 @@ testcase_name(void)
 void
 testcase_run(TestCaseState_t *tcs)
 {
-    char *argv_org[] = {"-tmmbcs1024", "-tsbct2048", "-trmbcmt100", "-tas", NULL, NULL};
+    char *argv_org[] = {"-tsmbcs511","-tmmbcs511", "-tsbct512", "-trmbcmt100", "-tas", NULL, NULL};
     char *alg[] = {"af", "gf", "bf", "aobf", "aoff", NULL};
     int i;
 
@@ -276,7 +276,7 @@ testcase_run(TestCaseState_t *tcs)
 	char *argv[sizeof(argv_org)/sizeof(argv_org[0])];
 	memcpy((void *) argv, (void *) argv_org, sizeof(argv_org));
 
-	argv[4] = alg[i];
+	argv[5] = alg[i];
 	testcase_printf(tcs, " *** Starting \"%s\" allocator *** \n", alg[i]);
 	a = START_ALC("coalesce_", 0, argv);
 	ASSERT(tcs, a);
diff --git a/erts/emulator/test/alloc_SUITE_data/mseg_clear_cache.c b/erts/emulator/test/alloc_SUITE_data/mseg_clear_cache.c
index 0277616bd0..7d5608f890 100644
--- a/erts/emulator/test/alloc_SUITE_data/mseg_clear_cache.c
+++ b/erts/emulator/test/alloc_SUITE_data/mseg_clear_cache.c
@@ -52,10 +52,10 @@ testcase_run(TestCaseState_t *tcs)
     tcs->extra = &seg[0];
 
     for (i = 0; i < MAX_SEGS; i++) {
-	seg[i].size = 1000;
+	seg[i].size = 1 << 18;
 	seg[i].ptr = MSEG_ALLOC(&seg[i].size);
 	ASSERT(tcs, seg[i].ptr);
-	ASSERT(tcs, seg[i].size >= 1000);
+	ASSERT(tcs, seg[i].size >= (1 << 18));
     }
 
     n = MSEG_NO();
diff --git a/erts/emulator/test/beam_SUITE.erl b/erts/emulator/test/beam_SUITE.erl
index 02c6e19686..3197a4c137 100644
--- a/erts/emulator/test/beam_SUITE.erl
+++ b/erts/emulator/test/beam_SUITE.erl
@@ -54,7 +54,7 @@ end_per_group(_GroupName, Config) ->
 
 %% Verify that apply(M, F, A) is really tail recursive.
 apply_last(Config) when is_list(Config) ->
-    Pid=spawn(?MODULE, applied, [self(), 10000]),
+    Pid  = spawn(?MODULE, applied, [self(), 10000]),
     Size =
 	receive
 	    {Pid, finished} ->
@@ -94,32 +94,32 @@ apply_last_bif(Config) when is_list(Config) ->
 %% Test three high register numbers in a put_list instruction
 %% (to test whether packing works properly).
 packed_registers(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Mod = packed_regs,
-    ?line Name = filename:join(PrivDir, atom_to_list(Mod) ++ ".erl"),
+    PrivDir = ?config(priv_dir, Config),
+    Mod = packed_regs,
+    Name = filename:join(PrivDir, atom_to_list(Mod) ++ ".erl"),
 
     %% Generate a module which generates a list of tuples.
     %% put_list(A) -> [{A, 600}, {A, 999}, ... {A, 0}].
-    ?line Code = gen_packed_regs(600, ["-module("++atom_to_list(Mod)++").\n",
+    Code = gen_packed_regs(600, ["-module("++atom_to_list(Mod)++").\n",
 				       "-export([put_list/1]).\n",
 				       "put_list(A) ->\n["]),
-    ?line ok = file:write_file(Name, Code),
+    ok = file:write_file(Name, Code),
 
     %% Compile the module.
-    ?line io:format("Compiling: ~s\n", [Name]),
-    ?line CompRc = compile:file(Name, [{outdir, PrivDir}, report]),
-    ?line io:format("Result: ~p\n",[CompRc]),
-    ?line {ok, Mod} = CompRc,
+    io:format("Compiling: ~s\n", [Name]),
+    CompRc = compile:file(Name, [{outdir, PrivDir}, report]),
+    io:format("Result: ~p\n",[CompRc]),
+    {ok, Mod} = CompRc,
 
     %% Load it.
-    ?line io:format("Loading...\n",[]),
-    ?line LoadRc = code:load_abs(filename:join(PrivDir, atom_to_list(Mod))),
-    ?line {module,_Module} = LoadRc,
+    io:format("Loading...\n",[]),
+    LoadRc = code:load_abs(filename:join(PrivDir, atom_to_list(Mod))),
+    {module,_Module} = LoadRc,
 
     %% Call it and verify result.
-    ?line Term = {a, b},
-    ?line L = Mod:put_list(Term),
-    ?line verify_packed_regs(L, Term, 600),
+    Term = {a, b},
+    L = Mod:put_list(Term),
+    verify_packed_regs(L, Term, 600),
     ok.
 
 gen_packed_regs(0, Acc) ->
@@ -131,11 +131,11 @@ verify_packed_regs([], _, -1) -> ok;
 verify_packed_regs([{Term, N}| T], Term, N) ->
     verify_packed_regs(T, Term, N-1);
 verify_packed_regs(L, Term, N) ->
-    ?line ok = io:format("Expected [{~p, ~p}|T]; got\n~p\n", [Term, N, L]),
-    ?line test_server:fail().
+    ok = io:format("Expected [{~p, ~p}|T]; got\n~p\n", [Term, N, L]),
+    test_server:fail().
 
 buildo_mucho(Config) when is_list(Config) ->
-    ?line buildo_mucho_1(),
+    buildo_mucho_1(),
     ok.
 
 buildo_mucho_1() ->
@@ -206,20 +206,27 @@ buildo_mucho_1() ->
      {<<>>,1},{<<>>,1},{<<>>,1},{<<>>,1},{<<>>,1},{<<>>,1},{<<>>,1},{<<>>,1}].
 
 heap_sizes(Config) when is_list(Config) ->
-    ?line Sizes = erlang:system_info(heap_sizes),
-    ?line io:format("~p heap sizes\n", [length(Sizes)]),
-    ?line io:format("~p\n", [Sizes]),
+    Sizes = erlang:system_info(heap_sizes),
+    io:format("~p heap sizes\n", [length(Sizes)]),
+    io:format("~p\n", [Sizes]),
 
     %% Verify that heap sizes increase monotonically.
-    ?line Largest = lists:foldl(fun(E, P) when is_integer(P), E > P -> E;
+    Largest = lists:foldl(fun(E, P) when is_integer(P), E > P -> E;
 				   (E, []) -> E
 				end, [], Sizes),
 
-    %% Verify that the largest heap size consists of 31 or 63 bits.
-    ?line
-	case Largest bsr (erlang:system_info(wordsize)*8-2) of
-	    R when R > 0 -> ok
-	end,
+    %% Verify that the largest heap size consists of
+    %%  - 31 bits of bytes on 32 bits arch
+    %%  - atleast 52 bits of bytes (48 is the maximum virtual address)
+    %%    and at the most 63 bits on 64 bit archs
+    %% heap sizes are in words
+    case erlang:system_info(wordsize) of
+	8 ->
+	    0    = (Largest*8) bsr 63,
+	    true = (Largest*8) > (1 bsl 52);
+	4 ->
+	    1 = (Largest*4) bsr 31
+    end,
     ok.
 
 %% Thanks to Igor Goryachev.
@@ -302,10 +309,10 @@ b() ->
     end.
 
 fconv(Config) when is_list(Config) ->
-    ?line do_fconv(atom),
-    ?line do_fconv(nil),
-    ?line do_fconv(tuple_literal),
-    ?line 3.0 = do_fconv(1.0, 2.0),
+    do_fconv(atom),
+    do_fconv(nil),
+    do_fconv(tuple_literal),
+    3.0 = do_fconv(1.0, 2.0),
     ok.
 
 do_fconv(Type) ->
@@ -325,9 +332,9 @@ 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),
+    zero = do_select_val(0),
+    big = do_select_val(1 bsl 64),
+    integer = do_select_val(42),
     ok.
 
 do_select_val(X) ->
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 461773114e..d5cb4ee1b7 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -28,7 +28,7 @@
 	 unary_plus/1, unary_minus/1, moving_labels/1]).
 -export([fpe/1]).
 -export([otp_9422/1]).
-
+-export([faulty_seq_trace/1, do_faulty_seq_trace/0]).
 -export([runner/2, loop_runner/3]).
 -export([f1/1, f2/2, f3/2, fn/1, fn/2, fn/3]).
 -export([do_boxed_and_small/0]).
@@ -59,6 +59,7 @@ all() ->
 	     ms_trace3, boxed_and_small, destructive_in_test_bif,
 	     guard_exceptions, unary_plus, unary_minus, fpe,
 	     moving_labels,
+	     faulty_seq_trace,
 	     otp_9422];
 	true -> [not_run]
     end.
@@ -726,6 +727,19 @@ do_boxed_and_small() ->
     {ok, false, _, _} = erlang:match_spec_test({0,3},[{{make_ref(),'_'},[],['$_']}],table),
     ok.
 
+faulty_seq_trace(doc) ->
+    ["Test that faulty seq_trace_call does not crash emulator"];
+faulty_seq_trace(suite) -> [];
+faulty_seq_trace(Config) when is_list(Config) ->
+    ?line {ok, Node} = start_node(match_spec_suite_other),
+    ?line ok = rpc:call(Node,?MODULE,do_faulty_seq_trace,[]),
+    ?line stop_node(Node),
+    ok.
+
+do_faulty_seq_trace() ->
+    {ok,'EXIT',_,_} = erlang:match_spec_test([],[{'_',[],[{message,{set_seq_token,yxa,true}}]}],trace),
+    ok.
+
 errchk(Pat) ->
     case catch erlang:trace_pattern({?MODULE, f2, 2}, Pat) of
 	{'EXIT', {badarg, _}} ->
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 898535693f..11dd88413f 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -118,15 +118,15 @@ fun_spawn(Fun) ->
 %% (unclear if this test case will actually prove anything on
 %% a modern computer with lots of memory).
 spawn_with_binaries(Config) when is_list(Config) ->
-    ?line L = lists:duplicate(2048, 42),
-    ?line TwoMeg = lists:duplicate(1024, L),
-    ?line Fun = fun() -> spawn(?MODULE, binary_owner, [list_to_binary(TwoMeg)]),
+    L = lists:duplicate(2048, 42),
+    TwoMeg = lists:duplicate(1024, L),
+    Fun = fun() -> spawn(?MODULE, binary_owner, [list_to_binary(TwoMeg)]),
 			 receive after 1 -> ok end end,
-    ?line Iter = case test_server:purify_is_running() of
+    Iter = case test_server:purify_is_running() of
 		     true -> 10;
 		     false -> 150
 		 end,
-    ?line test_server:do_times(Iter, Fun),
+    test_server:do_times(Iter, Fun),
     ok.
 
 binary_owner(Bin) when is_binary(Bin) ->
@@ -134,87 +134,87 @@ binary_owner(Bin) when is_binary(Bin) ->
 
 %% Tests exit/1 with a big message.
 t_exit_1(Config) when is_list(Config) ->
-    ?line start_spawner(),
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-    ?line process_flag(trap_exit, true),
-    ?line test_server:do_times(10, fun t_exit_1/0),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line stop_spawner(),
+    start_spawner(),
+    Dog = test_server:timetrap(test_server:seconds(20)),
+    process_flag(trap_exit, true),
+    test_server:do_times(10, fun t_exit_1/0),
+    test_server:timetrap_cancel(Dog),
+    stop_spawner(),
     ok.
 
 t_exit_1() ->
-    ?line Pid = fun_spawn(fun() -> exit(kb_128()) end),
-    ?line Garbage = kb_128(),
-    ?line receive
+    Pid = fun_spawn(fun() -> exit(kb_128()) end),
+    Garbage = kb_128(),
+    receive
 	      {'EXIT', Pid, Garbage} -> ok
 	  end.
 
 
 %% Tests exit/2 with a lot of data in the exit message.
 t_exit_2_other(Config) when is_list(Config) ->
-    ?line start_spawner(),
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-    ?line process_flag(trap_exit, true),
-    ?line test_server:do_times(10, fun t_exit_2_other/0),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line stop_spawner(),
+    start_spawner(),
+    Dog = test_server:timetrap(test_server:seconds(20)),
+    process_flag(trap_exit, true),
+    test_server:do_times(10, fun t_exit_2_other/0),
+    test_server:timetrap_cancel(Dog),
+    stop_spawner(),
     ok.
 
 t_exit_2_other() ->
-    ?line Pid = fun_spawn(fun() -> receive x -> ok end end),
-    ?line Garbage = kb_128(),
-    ?line exit(Pid, Garbage),
-    ?line receive
+    Pid = fun_spawn(fun() -> receive x -> ok end end),
+    Garbage = kb_128(),
+    exit(Pid, Garbage),
+    receive
 	      {'EXIT', Pid, Garbage} -> ok
 	  end.
 
 %% Tests that exit(Pid, normal) does not kill another process.;
 t_exit_2_other_normal(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun() -> receive x -> ok end end),
-    ?line exit(Pid, normal),
-    ?line receive
+    Dog = test_server:timetrap(test_server:seconds(20)),
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun() -> receive x -> ok end end),
+    exit(Pid, normal),
+    receive
 	      {'EXIT', Pid, Reason} ->
-		  ?line test_server:fail({process_died, Reason})
+		  test_server:fail({process_died, Reason})
 	  after 1000 ->
 		  ok
 	  end,
-    ?line case process_info(Pid) of
+    case process_info(Pid) of
 	      undefined ->
 		  test_server:fail(process_died_on_normal);
 	      List when is_list(List) ->
 		  ok
 	  end,
     exit(Pid, kill),
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that we can trap an exit message sent with exit/2 from
 %% the same process.
 self_exit(Config) when is_list(Config) ->
-    ?line start_spawner(),
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line process_flag(trap_exit, true),
-    ?line test_server:do_times(200, fun self_exit/0),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line stop_spawner(),
+    start_spawner(),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    process_flag(trap_exit, true),
+    test_server:do_times(200, fun self_exit/0),
+    test_server:timetrap_cancel(Dog),
+    stop_spawner(),
     ok.
 
 self_exit() ->
-    ?line Garbage = eight_kb(),
-    ?line P = self(),
-    ?line true = exit(P, Garbage),
-    ?line receive
+    Garbage = eight_kb(),
+    P = self(),
+    true = exit(P, Garbage),
+    receive
 	      {'EXIT', P, Garbage} -> ok
 	  end.
 
 %% Tests exit(self(), normal) is equivalent to exit(normal) for a process
 %% that doesn't trap exits.
 normal_suicide_exit(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun() -> exit(self(), normal) end),
-    ?line receive
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun() -> exit(self(), normal) end),
+    receive
 	      {'EXIT', Pid, normal} -> ok;
 	      Other -> test_server:fail({bad_message, Other})
 	  end.
@@ -222,19 +222,19 @@ normal_suicide_exit(Config) when is_list(Config) ->
 %% Tests exit(self(), Term) is equivalent to exit(Term) for a process
 %% that doesn't trap exits.";
 abnormal_suicide_exit(Config) when is_list(Config) ->
-    ?line Garbage = eight_kb(),
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun() -> exit(self(), Garbage) end),
-    ?line receive
+    Garbage = eight_kb(),
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun() -> exit(self(), Garbage) end),
+    receive
 	      {'EXIT', Pid, Garbage} -> ok;
 	      Other -> test_server:fail({bad_message, Other})
 	  end.
 
 %% Tests that exit(self(), die) cannot be catched.
 t_exit_2_catch(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun() -> catch exit(self(), die) end),
-    ?line receive
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun() -> catch exit(self(), die) end),
+    receive
 	      {'EXIT', Pid, normal} ->
 		  test_server:fail(catch_worked);
 	      {'EXIT', Pid, die} ->
@@ -246,29 +246,29 @@ t_exit_2_catch(Config) when is_list(Config) ->
 %% Tests trapping of an 'EXIT' message generated by a bad argument to
 %% the abs/1 bif.  The 'EXIT' message will intentionally be very big.
 trap_exit_badarg(Config) when is_list(Config) ->
-    ?line start_spawner(),
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line process_flag(trap_exit, true),
-    ?line test_server:do_times(10, fun trap_exit_badarg/0),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line stop_spawner(),
+    start_spawner(),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    process_flag(trap_exit, true),
+    test_server:do_times(10, fun trap_exit_badarg/0),
+    test_server:timetrap_cancel(Dog),
+    stop_spawner(),
     ok.
 
 trap_exit_badarg() ->
-    ?line Pid = fun_spawn(fun() -> bad_guy(kb_128()) end),
-    ?line Garbage = kb_128(),
-    ?line receive
+    Pid = fun_spawn(fun() -> bad_guy(kb_128()) end),
+    Garbage = kb_128(),
+    receive
 	      {'EXIT',Pid,{badarg,[{erlang,abs,[Garbage],Loc1},
 				   {?MODULE,bad_guy,1,Loc2}|_]}}
 	      when is_list(Loc1), is_list(Loc2) ->
 		  ok;
 	      Other ->
-		  ?line ok = io:format("Bad EXIT message: ~P", [Other, 30]),
-		  ?line test_server:fail(bad_exit_message)
+		  ok = io:format("Bad EXIT message: ~P", [Other, 30]),
+		  test_server:fail(bad_exit_message)
 	  end.
 
 bad_guy(Arg) ->
-    ?line abs(Arg).
+    abs(Arg).
 
 
 kb_128() ->
@@ -281,11 +281,11 @@ kb_128() ->
 
 eight_kb() ->
     B64 = lists:seq(1, 64),
-    ?line B512 = {<<1>>,B64,<<2,3>>,B64,make_unaligned_sub_binary(<<4,5,6,7,8,9>>),
+    B512 = {<<1>>,B64,<<2,3>>,B64,make_unaligned_sub_binary(<<4,5,6,7,8,9>>),
 		  B64,make_sub_binary([1,2,3,4,5,6]),
 		  B64,make_sub_binary(lists:seq(1, ?heap_binary_size+1)),
 		  B64,B64,B64,B64,big_binary()},
-    ?line lists:duplicate(8, {B512,B512}).
+    lists:duplicate(8, {B512,B512}).
 
 big_binary() ->
     big_binary(10, [42]).
@@ -296,19 +296,19 @@ big_binary(N, Acc) ->
 
 %% Test receiving an EXIT message when spawning a BIF with bad arguments.
 trap_exit_badarg_in_bif(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line process_flag(trap_exit, true),
-    ?line test_server:do_times(10, fun trap_exit_badarg_bif/0),
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    process_flag(trap_exit, true),
+    test_server:do_times(10, fun trap_exit_badarg_bif/0),
+    test_server:timetrap_cancel(Dog),
     ok.
     
 trap_exit_badarg_bif() ->
-    ?line Pid = spawn_link(erlang, node, [1]),
-    ?line receive
+    Pid = spawn_link(erlang, node, [1]),
+    receive
 	      {'EXIT', Pid, {badarg, _}} ->
 		  ok;
 	      Other ->
-		  ?line test_server:fail({unexpected, Other})
+		  test_server:fail({unexpected, Other})
 	  end.
 
 %% The following sequences of events have crasched Beam.
@@ -321,27 +321,27 @@ trap_exit_badarg_bif() ->
 %% 3) The process will crash the next time it executes 'receive'.
 
 exit_and_timeout(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
+    Dog = test_server:timetrap(test_server:seconds(20)),
 
-    ?line process_flag(trap_exit, true),
-    ?line Parent = self(),
-    ?line Low = fun_spawn(fun() -> eat_low(Parent) end),
-    ?line High = fun_spawn(fun() -> eat_high(Low) end),
-    ?line eat_wait_for(Low, High),
+    process_flag(trap_exit, true),
+    Parent = self(),
+    Low = fun_spawn(fun() -> eat_low(Parent) end),
+    High = fun_spawn(fun() -> eat_high(Low) end),
+    eat_wait_for(Low, High),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 
 eat_wait_for(Low, High) ->
-    ?line receive
-	      {'EXIT', Low, {you, are, dead}} ->
-		  ok;
-	      {'EXIT', High, normal} ->
-		  eat_wait_for(Low, High);
-	      Other ->
-		  test_server:fail({bad_message, Other})
-	  end.
+    receive
+	{'EXIT', Low, {you, are, dead}} ->
+	    ok;
+	{'EXIT', High, normal} ->
+	    eat_wait_for(Low, High);
+	Other ->
+	    test_server:fail({bad_message, Other})
+    end.
 
 eat_low(_Parent) ->
     receive
@@ -374,27 +374,27 @@ loop(_, _) ->
 %% Tries to send two different exit messages to a process.
 %% (The second one should be ignored.)
 exit_twice(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
+    Dog = test_server:timetrap(test_server:seconds(20)),
 
-    ?line process_flag(trap_exit, true),
-    ?line Low = fun_spawn(fun etwice_low/0),
-    ?line High = fun_spawn(fun() -> etwice_high(Low) end),
-    ?line etwice_wait_for(Low, High),
+    process_flag(trap_exit, true),
+    Low = fun_spawn(fun etwice_low/0),
+    High = fun_spawn(fun() -> etwice_high(Low) end),
+    etwice_wait_for(Low, High),
 
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:timetrap_cancel(Dog),
     ok.
 
 etwice_wait_for(Low, High) ->
-    ?line receive
-	      {'EXIT', Low, first} ->
-		  ok;
-	      {'EXIT', Low, Other} ->
-		  test_server:fail({wrong_exit_reason, Other});
-	      {'EXIT', High, normal} ->
-		  etwice_wait_for(Low, High);
-	      Other ->
-		  test_server:fail({bad_message, Other})
-	  end.
+    receive
+	{'EXIT', Low, first} ->
+	    ok;
+	{'EXIT', Low, Other} ->
+	    test_server:fail({wrong_exit_reason, Other});
+	{'EXIT', High, normal} ->
+	    etwice_wait_for(Low, High);
+	Other ->
+	    test_server:fail({bad_message, Other})
+    end.
 
 etwice_low() ->
     etwice_low().
@@ -406,15 +406,15 @@ etwice_high(Low) ->
 
 %% Tests the process_info/2 BIF.
 t_process_info(Config) when is_list(Config) ->
-    ?line [] = process_info(self(), registered_name),
-    ?line register(my_name, self()),
-    ?line {registered_name, my_name} = process_info(self(), registered_name),
-    ?line {status, running} = process_info(self(), status),
-    ?line {min_heap_size, 233} = process_info(self(), min_heap_size),
-    ?line {min_bin_vheap_size, 46368} = process_info(self(), min_bin_vheap_size),
-    ?line {current_function,{?MODULE,t_process_info,1}} =
+    [] = process_info(self(), registered_name),
+    register(my_name, self()),
+    {registered_name, my_name} = process_info(self(), registered_name),
+    {status, running} = process_info(self(), status),
+    {min_heap_size, 233} = process_info(self(), min_heap_size),
+    {min_bin_vheap_size,46422} = process_info(self(), min_bin_vheap_size),
+    {current_function,{?MODULE,t_process_info,1}} =
 	process_info(self(), current_function),
-    ?line {current_function,{?MODULE,t_process_info,1}} =
+    {current_function,{?MODULE,t_process_info,1}} =
 	apply(erlang, process_info, [self(),current_function]),
 
     %% current_location and current_stacktrace
@@ -425,9 +425,9 @@ t_process_info(Config) when is_list(Config) ->
     verify_loc(Line2, Res2),
     pi_stacktrace([{?MODULE,t_process_info,1,?LINE}]),
 
-    ?line Gleader = group_leader(),
-    ?line {group_leader, Gleader} = process_info(self(), group_leader),
-    ?line {'EXIT',{badarg,_Info}} = (catch process_info('not_a_pid')),
+    Gleader = group_leader(),
+    {group_leader, Gleader} = process_info(self(), group_leader),
+    {'EXIT',{badarg,_Info}} = (catch process_info('not_a_pid')),
     ok.
 
 pi_stacktrace(Expected0) ->
@@ -509,50 +509,50 @@ process_info_looper(Parent) ->
 %% Tests the process_info/1 BIF on another process with messages.
 process_info_other_msg(Config) when is_list(Config) ->
     Self = self(),
-    ?line Pid = spawn_link(fun() -> other_process(Self) end),
+    Pid = spawn_link(fun() -> other_process(Self) end),
     receive
 	{go_ahead,Pid} -> ok
     end,
 
-    ?line Own = {my,own,message},
+    Own = {my,own,message},
 
-    ?line {messages,[Own]} = process_info(Pid, messages),
+    {messages,[Own]} = process_info(Pid, messages),
     
-    ?line Garbage = kb_128(),
-    ?line MsgA = {a,Garbage},
-    ?line MsgB = {b,Garbage},
-    ?line MsgC = {c,Garbage},
-    ?line MsgD = {d,Garbage},
-    ?line MsgE = {e,Garbage},
-
-    ?line Pid ! MsgA,
-    ?line {messages,[Own,MsgA]} = process_info(Pid, messages),
-    ?line Pid ! MsgB,
-    ?line {messages,[Own,MsgA,MsgB]} = process_info(Pid, messages),
-    ?line Pid ! MsgC,
-    ?line {messages,[Own,MsgA,MsgB,MsgC]} = process_info(Pid, messages),
-    ?line Pid ! MsgD,
-    ?line {messages,[Own,MsgA,MsgB,MsgC,MsgD]} = process_info(Pid, messages),
-    ?line Pid ! MsgE,
-    ?line {messages,[Own,MsgA,MsgB,MsgC,MsgD,MsgE]=All} = process_info(Pid, messages),
-    ?line {memory,BytesOther} = process_info(Pid, memory),
-    ?line {memory,BytesSelf} = process_info(self(), memory),
+    Garbage = kb_128(),
+    MsgA = {a,Garbage},
+    MsgB = {b,Garbage},
+    MsgC = {c,Garbage},
+    MsgD = {d,Garbage},
+    MsgE = {e,Garbage},
+
+    Pid ! MsgA,
+    {messages,[Own,MsgA]} = process_info(Pid, messages),
+    Pid ! MsgB,
+    {messages,[Own,MsgA,MsgB]} = process_info(Pid, messages),
+    Pid ! MsgC,
+    {messages,[Own,MsgA,MsgB,MsgC]} = process_info(Pid, messages),
+    Pid ! MsgD,
+    {messages,[Own,MsgA,MsgB,MsgC,MsgD]} = process_info(Pid, messages),
+    Pid ! MsgE,
+    {messages,[Own,MsgA,MsgB,MsgC,MsgD,MsgE]=All} = process_info(Pid, messages),
+    {memory,BytesOther} = process_info(Pid, memory),
+    {memory,BytesSelf} = process_info(self(), memory),
 
     io:format("Memory ~p: ~p\n", [Pid,BytesOther]),
     io:format("Memory ~p (self): ~p\n", [self(),BytesSelf]),
 
     [Own,MsgA,MsgB,MsgC,MsgD,MsgE] = All,
 
-    ?line Pid ! {self(),empty},
-    ?line receive
+    Pid ! {self(),empty},
+    receive
 	      empty -> ok
 	  end,
-    ?line {messages,[]} = process_info(Pid, messages),
+    {messages,[]} = process_info(Pid, messages),
 
-    ?line {min_heap_size, 233} = process_info(Pid, min_heap_size),
-    ?line {min_bin_vheap_size, 46368} = process_info(Pid, min_bin_vheap_size),
+    {min_heap_size, 233} = process_info(Pid, min_heap_size),
+    {min_bin_vheap_size, 46422} = process_info(Pid, min_bin_vheap_size),
 
-    ?line Pid ! stop,
+    Pid ! stop,
     ok.
 
 process_info_other_dist_msg(Config) when is_list(Config) ->
@@ -560,52 +560,51 @@ process_info_other_dist_msg(Config) when is_list(Config) ->
     %% Check that process_info can handle messages that have not been
     %% decoded yet.
     %%
-    ?line {ok, Node} = start_node(Config),
-    ?line Self = self(),
-    ?line Pid = spawn_link(fun() -> other_process(Self) end),
-    ?line receive {go_ahead,Pid} -> ok end,
+    {ok, Node} = start_node(Config),
+    Self = self(),
+    Pid = spawn_link(fun() -> other_process(Self) end),
+    receive {go_ahead,Pid} -> ok end,
 
-    ?line Own = {my,own,message},
+    Own = {my,own,message},
 
-    ?line {messages,[Own]} = process_info(Pid, messages),
-    ?line Garbage = kb_128(),
-    ?line MsgA = {a,self(),Garbage},
-    ?line MsgB = {b,self(),Garbage},
-    ?line MsgC = {c,self(),Garbage},
-    ?line MsgD = {d,self(),Garbage},
-    ?line MsgE = {e,self(),Garbage},
+    {messages,[Own]} = process_info(Pid, messages),
+    Garbage = kb_128(),
+    MsgA = {a,self(),Garbage},
+    MsgB = {b,self(),Garbage},
+    MsgC = {c,self(),Garbage},
+    MsgD = {d,self(),Garbage},
+    MsgE = {e,self(),Garbage},
 
     %% We don't want the other process to decode messages itself
     %% therefore we suspend it.
-    ?line true =  erlang:suspend_process(Pid),
-    ?line spawn_link(Node, fun () ->
-				   Pid ! MsgA,
-				   Pid ! MsgB,
-				   Pid ! MsgC,
-				   Self ! check_abc
-			   end),
-    ?line receive check_abc -> ok end,
-    ?line [{status,suspended},
-	   {messages,[Own,MsgA,MsgB,MsgC]},
-	   {status,suspended}]= process_info(Pid, [status,messages,status]),
-    ?line spawn_link(Node, fun () ->
-				   Pid ! MsgD,
-				   Pid ! MsgE,
-				   Self ! check_de
-			   end),
-    ?line receive check_de -> ok end,
-    ?line {messages,[Own,MsgA,MsgB,MsgC,MsgD,MsgE]=All}
-	= process_info(Pid, messages),
-    ?line true = erlang:resume_process(Pid),
-    ?line Pid ! {self(), get_all_messages},
-    ?line receive
+    true =  erlang:suspend_process(Pid),
+    spawn_link(Node, fun () ->
+		Pid  ! MsgA,
+		Pid  ! MsgB,
+		Pid  ! MsgC,
+		Self ! check_abc
+	end),
+    receive check_abc -> ok end,
+    [{status,suspended},
+	{messages,[Own,MsgA,MsgB,MsgC]},
+	{status,suspended}]= process_info(Pid, [status,messages,status]),
+    spawn_link(Node, fun () ->
+		Pid  ! MsgD,
+		Pid  ! MsgE,
+		Self ! check_de
+	end),
+    receive check_de -> ok end,
+    {messages,[Own,MsgA,MsgB,MsgC,MsgD,MsgE]=All} = process_info(Pid, messages),
+    true = erlang:resume_process(Pid),
+    Pid ! {self(), get_all_messages},
+    receive
 	      {all_messages, AllMsgs} ->
-		  ?line All = AllMsgs
+		  All = AllMsgs
 	  end,
-    ?line {messages,[]} = process_info(Pid, messages),
-    ?line Pid ! stop,
-    ?line stop_node(Node),
-    ?line ok.
+    {messages,[]} = process_info(Pid, messages),
+    Pid ! stop,
+    stop_node(Node),
+    ok.
     
 
 other_process(Parent) ->
@@ -652,38 +651,36 @@ process_info_2_list(doc) ->
 process_info_2_list(suite) ->
     [];
 process_info_2_list(Config) when is_list(Config) ->
-    ?line Proc = spawn(fun () ->
-			       receive after infinity -> ok end end),
+    Proc = spawn(fun () -> receive after infinity -> ok end end),
     register(process_SUITE_process_info_2_list1, self()),
     register(process_SUITE_process_info_2_list2, Proc),
-    ?line erts_debug:set_internal_state(available_internal_state,true),
-    ?line AllArgs = erts_debug:get_internal_state(process_info_args),
-    ?line A1 = lists:sort(AllArgs) ++ [status] ++ lists:reverse(AllArgs),
+    erts_debug:set_internal_state(available_internal_state,true),
+    AllArgs = erts_debug:get_internal_state(process_info_args),
+    A1 = lists:sort(AllArgs) ++ [status] ++ lists:reverse(AllArgs),
 
     %% Verify that argument is accepted as single atom
-    ?line lists:foreach(fun (A) ->
-				?line {A, _} = process_info(Proc, A),
-				?line {A, _} = process_info(self(), A)
-			end,
-			A1),
+    lists:foreach(fun (A) ->
+		{A, _} = process_info(Proc, A),
+		{A, _} = process_info(self(), A)
+	end, A1),
 
     %% Verify that order is preserved
-    ?line ok = chk_pi_order(process_info(self(), A1), A1),
-    ?line ok = chk_pi_order(process_info(Proc, A1), A1),
+    ok = chk_pi_order(process_info(self(), A1), A1),
+    ok = chk_pi_order(process_info(Proc, A1), A1),
 
     %% Small arg list
-    ?line A2 = [status, stack_size, trap_exit, priority],
-    ?line [{status, _}, {stack_size, _}, {trap_exit, _}, {priority, _}]
+    A2 = [status, stack_size, trap_exit, priority],
+    [{status, _}, {stack_size, _}, {trap_exit, _}, {priority, _}]
 	= process_info(Proc, A2),
-    ?line [{status, _}, {stack_size, _}, {trap_exit, _}, {priority, _}]
+    [{status, _}, {stack_size, _}, {trap_exit, _}, {priority, _}]
 	= process_info(self(), A2),
 
     %% Huge arg list (note values are shared)
-    ?line A3 = lists:duplicate(5000,backtrace),
-    ?line V3 = process_info(Proc, A3),
-    ?line 5000 = length(V3),
-    ?line lists:foreach(fun ({backtrace, _}) -> ok end, V3),
-    ?line ok.
+    A3 = lists:duplicate(5000,backtrace),
+    V3 = process_info(Proc, A3),
+    5000 = length(V3),
+    lists:foreach(fun ({backtrace, _}) -> ok end, V3),
+    ok.
     
 process_info_lock_reschedule(doc) ->
     [];
@@ -692,43 +689,37 @@ process_info_lock_reschedule(suite) ->
 process_info_lock_reschedule(Config) when is_list(Config) ->
     %% We need a process that is running and an item that requires
     %% process_info to take the main process lock.
-    ?line Target1 = spawn_link(fun tok_loop/0),
-    ?line Name1 = process_info_lock_reschedule_running,
-    ?line register(Name1, Target1),
-    ?line Target2 = spawn_link(fun () -> receive after infinity -> ok end end),
-    ?line Name2 = process_info_lock_reschedule_waiting,
-    ?line register(Name2, Target2),
-    ?line PI = fun(_) ->
-		       ?line erlang:yield(),
-		       ?line [{registered_name, Name1}]
-			   = process_info(Target1, [registered_name]),
-		       ?line [{registered_name, Name2}]
-			   = process_info(Target2, [registered_name]),
-		       ?line erlang:yield(),
-		       ?line {registered_name, Name1}
-			   = process_info(Target1, registered_name),
-		       ?line {registered_name, Name2}
-			   = process_info(Target2, registered_name),
-		       ?line erlang:yield(),
-		       ?line [{registered_name, Name1}| _]
-			   = process_info(Target1),
-		       ?line [{registered_name, Name2}| _]
-			   = process_info(Target2)
-	       end,
-    ?line lists:foreach(PI, lists:seq(1,1000)),
+    Target1 = spawn_link(fun tok_loop/0),
+    Name1 = process_info_lock_reschedule_running,
+    register(Name1, Target1),
+    Target2 = spawn_link(fun () -> receive after infinity -> ok end end),
+    Name2 = process_info_lock_reschedule_waiting,
+    register(Name2, Target2),
+    PI = fun(_) ->
+	    erlang:yield(),
+	    [{registered_name, Name1}] = process_info(Target1, [registered_name]),
+	    [{registered_name, Name2}] = process_info(Target2, [registered_name]),
+	    erlang:yield(),
+	    {registered_name, Name1} = process_info(Target1, registered_name),
+	    {registered_name, Name2} = process_info(Target2, registered_name),
+	    erlang:yield(),
+	    [{registered_name, Name1}| _] = process_info(Target1),
+	    [{registered_name, Name2}| _] = process_info(Target2)
+    end,
+    lists:foreach(PI, lists:seq(1,1000)),
     %% Make sure Target1 still is willing to "tok loop"
-    ?line case process_info(Target1, status) of
-	      {status, OkStatus} when OkStatus == runnable;
-				      OkStatus == running;
-				      OkStatus == garbage_collecting ->
-		  ?line unlink(Target1),
-		  ?line unlink(Target2),
-		  ?line exit(Target1, bang),
-		  ?line exit(Target2, bang),
-		  ?line OkStatus;
-	      {status, BadStatus} ->
-		  ?line ?t:fail(BadStatus)
-	  end.
+    case process_info(Target1, status) of
+	{status, OkStatus} when OkStatus == runnable;
+				OkStatus == running;
+				OkStatus == garbage_collecting ->
+	    unlink(Target1),
+	    unlink(Target2),
+	    exit(Target1, bang),
+	    exit(Target2, bang),
+	    OkStatus;
+	{status, BadStatus} ->
+	    ?t:fail(BadStatus)
+    end.
 
 pi_loop(_Name, _Pid, 0) ->
     ok;
@@ -741,50 +732,50 @@ process_info_lock_reschedule2(doc) ->
 process_info_lock_reschedule2(suite) ->
     [];
 process_info_lock_reschedule2(Config) when is_list(Config) ->
-    ?line Parent = self(),
-    ?line Fun = fun () ->
-			receive {go, Name, Pid} -> ok end,
-			pi_loop(Name, Pid, 10000),
-			Parent ! {done, self()},
-			receive after infinity -> ok end
-		end,
-    ?line P1 = spawn_link(Fun),
-    ?line N1 = process_info_lock_reschedule2_1,
-    ?line true = register(N1, P1),
-    ?line P2 = spawn_link(Fun),
-    ?line N2 = process_info_lock_reschedule2_2,
-    ?line true = register(N2, P2),
-    ?line P3 = spawn_link(Fun),
-    ?line N3 = process_info_lock_reschedule2_3,
-    ?line true = register(N3, P3),
-    ?line P4 = spawn_link(Fun),
-    ?line N4 = process_info_lock_reschedule2_4,
-    ?line true = register(N4, P4),
-    ?line P5 = spawn_link(Fun),
-    ?line N5 = process_info_lock_reschedule2_5,
-    ?line true = register(N5, P5),
-    ?line P6 = spawn_link(Fun),
-    ?line N6 = process_info_lock_reschedule2_6,
-    ?line true = register(N6, P6),
-    ?line P1 ! {go, N2, P2},
-    ?line P2 ! {go, N1, P1},
-    ?line P3 ! {go, N1, P1},
-    ?line P4 ! {go, N1, P1},
-    ?line P5 ! {go, N6, P6},
-    ?line P6 ! {go, N5, P5},
-    ?line receive {done, P1} -> ok end,
-    ?line receive {done, P2} -> ok end,
-    ?line receive {done, P3} -> ok end,
-    ?line receive {done, P4} -> ok end,
-    ?line receive {done, P5} -> ok end,
-    ?line receive {done, P6} -> ok end,
-    ?line unlink(P1), exit(P1, bang),
-    ?line unlink(P2), exit(P2, bang),
-    ?line unlink(P3), exit(P3, bang),
-    ?line unlink(P4), exit(P4, bang),
-    ?line unlink(P5), exit(P5, bang),
-    ?line unlink(P6), exit(P6, bang),
-    ?line ok.
+    Parent = self(),
+    Fun = fun () ->
+	    receive {go, Name, Pid} -> ok end,
+	    pi_loop(Name, Pid, 10000),
+	    Parent ! {done, self()},
+	    receive after infinity -> ok end
+    end,
+    P1 = spawn_link(Fun),
+    N1 = process_info_lock_reschedule2_1,
+    true = register(N1, P1),
+    P2 = spawn_link(Fun),
+    N2 = process_info_lock_reschedule2_2,
+    true = register(N2, P2),
+    P3 = spawn_link(Fun),
+    N3 = process_info_lock_reschedule2_3,
+    true = register(N3, P3),
+    P4 = spawn_link(Fun),
+    N4 = process_info_lock_reschedule2_4,
+    true = register(N4, P4),
+    P5 = spawn_link(Fun),
+    N5 = process_info_lock_reschedule2_5,
+    true = register(N5, P5),
+    P6 = spawn_link(Fun),
+    N6 = process_info_lock_reschedule2_6,
+    true = register(N6, P6),
+    P1 ! {go, N2, P2},
+    P2 ! {go, N1, P1},
+    P3 ! {go, N1, P1},
+    P4 ! {go, N1, P1},
+    P5 ! {go, N6, P6},
+    P6 ! {go, N5, P5},
+    receive {done, P1} -> ok end,
+    receive {done, P2} -> ok end,
+    receive {done, P3} -> ok end,
+    receive {done, P4} -> ok end,
+    receive {done, P5} -> ok end,
+    receive {done, P6} -> ok end,
+    unlink(P1), exit(P1, bang),
+    unlink(P2), exit(P2, bang),
+    unlink(P3), exit(P3, bang),
+    unlink(P4), exit(P4, bang),
+    unlink(P5), exit(P5, bang),
+    unlink(P6), exit(P6, bang),
+    ok.
 
 many_args(0,_B,_C,_D,_E,_F,_G,_H,_I,_J) ->
     ok;
@@ -802,120 +793,115 @@ process_info_lock_reschedule3(suite) ->
 process_info_lock_reschedule3(Config) when is_list(Config) ->
     %% We need a process that is running and an item that requires
     %% process_info to take the main process lock.
-    ?line Target1 = spawn_link(fun tok_loop/0),
-    ?line Name1 = process_info_lock_reschedule_running,
-    ?line register(Name1, Target1),
-    ?line Target2 = spawn_link(fun () -> receive after infinity -> ok end end),
-    ?line Name2 = process_info_lock_reschedule_waiting,
-    ?line register(Name2, Target2),
-    ?line PI = fun(N) ->
-		       case N rem 10 of
-			   0 -> erlang:yield();
-			   _ -> ok
-		       end,
-		       ?line do_pi_msg_len({proc, Target1},
-					   {arg, message_queue_len})
-	       end,
-    ?line many_args(100000,1,2,3,4,5,6,7,8,9),
-    ?line lists:foreach(PI, lists:seq(1,1000000)),
+    Target1 = spawn_link(fun tok_loop/0),
+    Name1 = process_info_lock_reschedule_running,
+    register(Name1, Target1),
+    Target2 = spawn_link(fun () -> receive after infinity -> ok end end),
+    Name2 = process_info_lock_reschedule_waiting,
+    register(Name2, Target2),
+    PI = fun(N) ->
+	    case N rem 10 of
+		0 -> erlang:yield();
+		_ -> ok
+	    end,
+	    do_pi_msg_len({proc, Target1},
+		{arg, message_queue_len})
+    end,
+    many_args(100000,1,2,3,4,5,6,7,8,9),
+    lists:foreach(PI, lists:seq(1,1000000)),
     %% Make sure Target1 still is willing to "tok loop"
-    ?line case process_info(Target1, status) of
+    case process_info(Target1, status) of
 	      {status, OkStatus} when OkStatus == runnable;
 				      OkStatus == running;
 				      OkStatus == garbage_collecting ->
-		  ?line unlink(Target1),
-		  ?line unlink(Target2),
-		  ?line exit(Target1, bang),
-		  ?line exit(Target2, bang),
-		  ?line OkStatus;
+		  unlink(Target1),
+		  unlink(Target2),
+		  exit(Target1, bang),
+		  exit(Target2, bang),
+		  OkStatus;
 	      {status, BadStatus} ->
-		  ?line ?t:fail(BadStatus)
+		  ?t:fail(BadStatus)
 	  end.
 
 process_status_exiting(Config) when is_list(Config) ->
     %% Make sure that erts_debug:get_internal_state({process_status,P})
     %% returns exiting if it is in status P_EXITING.
-    ?line erts_debug:set_internal_state(available_internal_state,true),
-    ?line Prio = process_flag(priority, max),
-    ?line P = spawn_opt(fun () -> receive after infinity -> ok end end,
+    erts_debug:set_internal_state(available_internal_state,true),
+    Prio = process_flag(priority, max),
+    P = spawn_opt(fun () -> receive after infinity -> ok end end,
 			[{priority, normal}]),
-    ?line erlang:yield(),
+    erlang:yield(),
     %% The tok_loop processes are here to make it hard for the exiting
     %% process to be scheduled in for exit...
-    ?line TokLoops = lists:map(fun (_) ->
-				       spawn_opt(fun tok_loop/0,
-						 [link,{priority, high}])
-			       end,
-			       lists:seq(1, erlang:system_info(schedulers_online))),
-    ?line exit(P, boom),
-    ?line wait_until(
-	    fun () ->
-		    exiting =:= erts_debug:get_internal_state({process_status,P})
-	    end),
-    ?line lists:foreach(fun (Tok) -> unlink(Tok), exit(Tok,bang) end, TokLoops),
-    ?line process_flag(priority, Prio),
-    ?line ok.
+    TokLoops = lists:map(fun (_) ->
+		spawn_opt(fun tok_loop/0,
+		    [link,{priority, high}])
+	end, lists:seq(1, erlang:system_info(schedulers_online))),
+    exit(P, boom),
+    wait_until(fun() ->
+		exiting =:= erts_debug:get_internal_state({process_status,P})
+	end),
+    lists:foreach(fun (Tok) -> unlink(Tok), exit(Tok,bang) end, TokLoops),
+    process_flag(priority, Prio),
+    ok.
 
 otp_4725(Config) when is_list(Config) ->
-    ?line Tester = self(),
-    ?line Ref1 = make_ref(),
-    ?line Pid1 = spawn_opt(fun () ->
-				   Tester ! {Ref1, process_info(self())},
-				   receive
-				       Ref1 -> bye
-				   end
-			   end,
-			   [link,
-			    {priority, max},
-			    {fullsweep_after, 600}]),
-    ?line receive
-	      {Ref1, ProcInfo1A} ->
-		  ?line ProcInfo1B = process_info(Pid1),
-		  ?line Pid1 ! Ref1,
-		  ?line check_proc_infos(ProcInfo1A, ProcInfo1B)
-	  end,
-    ?line Ref2 = make_ref(),
-    ?line Pid2 = spawn_opt(fun () ->
-				   Tester ! {Ref2, process_info(self())},
-				   receive
-				       Ref2 -> bye
-				   end
-			   end,
-			   []),
-    ?line receive
-	      {Ref2, ProcInfo2A} ->
-		  ?line ProcInfo2B = process_info(Pid2),
-		  ?line Pid2 ! Ref2,
-		  ?line check_proc_infos(ProcInfo2A, ProcInfo2B)
-	  end,
-    ?line ok.
+    Tester = self(),
+    Ref1 = make_ref(),
+    Pid1 = spawn_opt(fun () ->
+		Tester ! {Ref1, process_info(self())},
+		receive
+		    Ref1 -> bye
+		end
+	end, [link, {priority, max}, {fullsweep_after, 600}]),
+    receive
+	{Ref1, ProcInfo1A} ->
+	    ProcInfo1B = process_info(Pid1),
+	    Pid1 ! Ref1,
+	    check_proc_infos(ProcInfo1A, ProcInfo1B)
+    end,
+    Ref2 = make_ref(),
+    Pid2 = spawn_opt(fun () ->
+		Tester ! {Ref2, process_info(self())},
+		receive
+		    Ref2 -> bye
+		end
+	end,
+	[]),
+    receive
+	{Ref2, ProcInfo2A} ->
+	    ProcInfo2B = process_info(Pid2),
+	    Pid2 ! Ref2,
+	    check_proc_infos(ProcInfo2A, ProcInfo2B)
+    end,
+    ok.
 
 check_proc_infos(A, B) ->
-    ?line IC = lists:keysearch(initial_call, 1, A),
-    ?line IC = lists:keysearch(initial_call, 1, B),
+    IC = lists:keysearch(initial_call, 1, A),
+    IC = lists:keysearch(initial_call, 1, B),
 
-    ?line L = lists:keysearch(links, 1, A),
-    ?line L = lists:keysearch(links, 1, B),
+    L = lists:keysearch(links, 1, A),
+    L = lists:keysearch(links, 1, B),
 
-    ?line D = lists:keysearch(dictionary, 1, A),
-    ?line D = lists:keysearch(dictionary, 1, B),
+    D = lists:keysearch(dictionary, 1, A),
+    D = lists:keysearch(dictionary, 1, B),
 
-    ?line TE = lists:keysearch(trap_exit, 1, A),
-    ?line TE = lists:keysearch(trap_exit, 1, B),
+    TE = lists:keysearch(trap_exit, 1, A),
+    TE = lists:keysearch(trap_exit, 1, B),
 
-    ?line EH = lists:keysearch(error_handler, 1, A),
-    ?line EH = lists:keysearch(error_handler, 1, B),
+    EH = lists:keysearch(error_handler, 1, A),
+    EH = lists:keysearch(error_handler, 1, B),
 
-    ?line P = lists:keysearch(priority, 1, A),
-    ?line P = lists:keysearch(priority, 1, B),
+    P = lists:keysearch(priority, 1, A),
+    P = lists:keysearch(priority, 1, B),
 
-    ?line GL = lists:keysearch(group_leader, 1, A),
-    ?line GL = lists:keysearch(group_leader, 1, B),
+    GL = lists:keysearch(group_leader, 1, A),
+    GL = lists:keysearch(group_leader, 1, B),
 
-    ?line GC = lists:keysearch(garbage_collection, 1, A),
-    ?line GC = lists:keysearch(garbage_collection, 1, B),
+    GC = lists:keysearch(garbage_collection, 1, A),
+    GC = lists:keysearch(garbage_collection, 1, B),
 
-    ?line ok.
+    ok.
 
 
 %% Dummies.
@@ -928,18 +914,18 @@ stop_spawner() ->
 
 %% Tests erlang:bump_reductions/1.
 bump_reductions(Config) when is_list(Config) ->
-    ?line erlang:garbage_collect(),
-    ?line receive after 1 -> ok end,		% Clear reductions.
-    ?line {reductions,R1} = process_info(self(), reductions),
-    ?line true = erlang:bump_reductions(100),
-    ?line {reductions,R2} = process_info(self(), reductions),
-    ?line case R2-R1 of
+    erlang:garbage_collect(),
+    receive after 1 -> ok end,		% Clear reductions.
+    {reductions,R1} = process_info(self(), reductions),
+    true = erlang:bump_reductions(100),
+    {reductions,R2} = process_info(self(), reductions),
+    case R2-R1 of
 	      Diff when Diff < 100 ->
-		  ?line ok = io:format("R1 = ~w, R2 = ~w", [R1, R2]),
-		  ?line test_server:fail({small_diff, Diff});
+		  ok = io:format("R1 = ~w, R2 = ~w", [R1, R2]),
+		  test_server:fail({small_diff, Diff});
 	      Diff when Diff > 110 ->
-		  ?line ok = io:format("R1 = ~w, R2 = ~w", [R1, R2]),
-		  ?line test_server:fail({big_diff, Diff});
+		  ok = io:format("R1 = ~w, R2 = ~w", [R1, R2]),
+		  test_server:fail({big_diff, Diff});
 	      Diff ->
 		  io:format("~p\n", [Diff]),
 		  ok
@@ -949,11 +935,11 @@ bump_reductions(Config) when is_list(Config) ->
     bump_big(R2, 16#08000000).
 
 bump_big(Prev, Limit) ->
-    ?line true = erlang:bump_reductions(100000), %Limited to CONTEXT_REDUCTIONS.
-    ?line case process_info(self(), reductions) of
+    true = erlang:bump_reductions(100000), %Limited to CONTEXT_REDUCTIONS.
+    case process_info(self(), reductions) of
 	      {reductions,Big} when is_integer(Big), Big > Limit ->
-		  ?line erlang:garbage_collect(),
-		  ?line io:format("~p\n", [Big]);
+		  erlang:garbage_collect(),
+		  io:format("~p\n", [Big]);
 	      {reductions,R} when is_integer(R), R > Prev ->
 		  bump_big(R, Limit)
 	  end,
@@ -964,34 +950,34 @@ bump_big(Prev, Limit) ->
 low_prio(Config) when is_list(Config) ->
     case erlang:system_info(schedulers_online) of
 	1 ->
-	    ?line ok = low_prio_test(Config);
+	    ok = low_prio_test(Config);
 	_ -> 
-	    ?line erlang:system_flag(multi_scheduling, block),
-	    ?line ok = low_prio_test(Config),
-	    ?line erlang:system_flag(multi_scheduling, unblock),
-	    ?line {comment,
+	    erlang:system_flag(multi_scheduling, block),
+	    ok = low_prio_test(Config),
+	    erlang:system_flag(multi_scheduling, unblock),
+	    {comment,
 		   "Test not written for SMP runtime system. "
 		   "Multi scheduling blocked during test."}
     end.
 
 low_prio_test(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line S = spawn_link(?MODULE, prio_server, [0, 0]),
-    ?line PCs = spawn_prio_clients(S, erlang:system_info(schedulers_online)),
-    ?line timer:sleep(2000),
-    ?line lists:foreach(fun (P) -> exit(P, kill) end, PCs),
-    ?line S ! exit,
-    ?line receive {'EXIT', S, {A, B}} -> check_prio(A, B) end,
+    process_flag(trap_exit, true),
+    S = spawn_link(?MODULE, prio_server, [0, 0]),
+    PCs = spawn_prio_clients(S, erlang:system_info(schedulers_online)),
+    timer:sleep(2000),
+    lists:foreach(fun (P) -> exit(P, kill) end, PCs),
+    S ! exit,
+    receive {'EXIT', S, {A, B}} -> check_prio(A, B) end,
     ok.
 
 check_prio(A, B) ->
-    ?line Prop = A/B,
-    ?line ok = io:format("Low=~p, High=~p, Prop=~p\n", [A, B, Prop]),
+    Prop = A/B,
+    ok = io:format("Low=~p, High=~p, Prop=~p\n", [A, B, Prop]),
 
     %% It isn't 1/8, it's more like 0.3, but let's check that
     %% the low-prio processes get some little chance to run at all.
-    ?line true = (Prop < 1.0),
-    ?line true = (Prop > 1/32).
+    true = (Prop < 1.0),
+    true = (Prop > 1/32).
 
 prio_server(A, B) ->
     receive
@@ -1051,25 +1037,25 @@ yield(Config) when is_list(Config) ->
     end.
 
 yield_test() ->
-    ?line erlang:garbage_collect(),
-    ?line receive after 1 -> ok end,		% Clear reductions.
-    ?line SC = schedcnt(start),
-    ?line {reductions, R1} = process_info(self(), reductions),
-    ?line {ok, true} = call_yield(middle),
-    ?line true = call_yield(final),
-    ?line true = call_yield(),
-    ?line true = apply(erlang, yield, []),
-    ?line {reductions, R2} = process_info(self(), reductions),
-    ?line Schedcnt = schedcnt(stop, SC),
-    ?line case {R2-R1, Schedcnt} of
-	      {Diff, 4} when Diff < 30 ->
-		  ?line ok = io:format("R1 = ~w, R2 = ~w, Schedcnt = ~w", 
-				       [R1, R2, Schedcnt]);
-	      {Diff, _} ->
-		  ?line ok = io:format("R1 = ~w, R2 = ~w, Schedcnt = ~w", 
-				       [R1, R2, Schedcnt]),
-		  ?line test_server:fail({measurement_error, Diff, Schedcnt})
-	  end.
+    erlang:garbage_collect(),
+    receive after 1 -> ok end,		% Clear reductions.
+    SC = schedcnt(start),
+    {reductions, R1} = process_info(self(), reductions),
+    {ok, true} = call_yield(middle),
+    true = call_yield(final),
+    true = call_yield(),
+    true = apply(erlang, yield, []),
+    {reductions, R2} = process_info(self(), reductions),
+    Schedcnt = schedcnt(stop, SC),
+    case {R2-R1, Schedcnt} of
+	{Diff, 4} when Diff < 30 ->
+	    ok = io:format("R1 = ~w, R2 = ~w, Schedcnt = ~w", 
+		[R1, R2, Schedcnt]);
+	{Diff, _} ->
+	    ok = io:format("R1 = ~w, R2 = ~w, Schedcnt = ~w", 
+		[R1, R2, Schedcnt]),
+	    test_server:fail({measurement_error, Diff, Schedcnt})
+    end.
 
 call_yield() ->
     erlang:yield().
@@ -1108,61 +1094,61 @@ schedcnt(stop, {Ref, Pid}) when is_reference(Ref), is_pid(Pid) ->
 yield2(doc) -> [];
 yield2(suite) -> [];
 yield2(Config) when is_list(Config) ->
-    ?line Me = self(),
-    ?line Go = make_ref(),
-    ?line RedDiff = make_ref(),
-    ?line Done = make_ref(),
-    ?line P = spawn(fun () ->
-			    receive Go -> ok end,
-			    {reductions, R1} = process_info(self(), reductions),
-			    {ok, true} = call_yield(middle),
-			    true = call_yield(final),
-			    true = call_yield(),
-			    true = apply(erlang, yield, []),
-			    {reductions, R2} = process_info(self(), reductions),
-			    Me ! {RedDiff, R2 - R1},
-			    exit(Done)
-		    end),
-    ?line erlang:yield(),
-
-    ?line 1 = erlang:trace(P, true, [running, procs, {tracer, self()}]),
-
-    ?line P ! Go,
+    Me = self(),
+    Go = make_ref(),
+    RedDiff = make_ref(),
+    Done = make_ref(),
+    P = spawn(fun () ->
+		receive Go -> ok end,
+		{reductions, R1} = process_info(self(), reductions),
+		{ok, true} = call_yield(middle),
+		true = call_yield(final),
+		true = call_yield(),
+		true = apply(erlang, yield, []),
+		{reductions, R2} = process_info(self(), reductions),
+		Me ! {RedDiff, R2 - R1},
+		exit(Done)
+	end),
+    erlang:yield(),
+
+    1 = erlang:trace(P, true, [running, procs, {tracer, self()}]),
+
+    P ! Go,
 
     %% receive Go -> ok end,
-    ?line {trace, P, in, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
 
     %% {ok, true} = call_yield(middle),
-    ?line {trace, P, out, _} = next_tmsg(P),
-    ?line {trace, P, in, _} = next_tmsg(P),
+    {trace, P, out, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
 
     %% true = call_yield(final),
-    ?line {trace, P, out, _} = next_tmsg(P),
-    ?line {trace, P, in, _} = next_tmsg(P),
+    {trace, P, out, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
 
     %% true = call_yield(),
-    ?line {trace, P, out, _} = next_tmsg(P),
-    ?line {trace, P, in, _} = next_tmsg(P),
+    {trace, P, out, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
 
     %% true = apply(erlang, yield, []),
-    ?line {trace, P, out, _} = next_tmsg(P),
-    ?line {trace, P, in, _} = next_tmsg(P),
+    {trace, P, out, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
 
     %% exit(Done)
-    ?line {trace, P, exit, Done} = next_tmsg(P),
+    {trace, P, exit, Done} = next_tmsg(P),
 
 
-    ?line receive
+    receive
 	      {RedDiff, Reductions} when Reductions < 30, Reductions > 0 ->
 		  io:format("Reductions = ~p~n", [Reductions]),
-		  ?line ok;
+		  ok;
 	      {RedDiff, Reductions} ->
-		  ?line ?t:fail({unexpected_reduction_count, Reductions})
+		  ?t:fail({unexpected_reduction_count, Reductions})
 	  end,
 
-    ?line none = next_tmsg(P),
+    none = next_tmsg(P),
 
-    ?line ok.
+    ok.
 
 next_tmsg(Pid) ->
     receive
@@ -1178,19 +1164,19 @@ next_tmsg(Pid) ->
 bad_register(Config) when is_list(Config) ->
     Name = a_long_and_unused_name,
 
-    ?line {'EXIT',{badarg,_}} = (catch register({bad,name}, self())),
-    ?line fail_register(undefined, self()),
-    ?line fail_register([bad,name], self()),
+    {'EXIT',{badarg,_}} = (catch register({bad,name}, self())),
+    fail_register(undefined, self()),
+    fail_register([bad,name], self()),
 
-    ?line {Dead,Mref} = spawn_monitor(fun() -> true end),
+    {Dead,Mref} = spawn_monitor(fun() -> true end),
     receive
 	{'DOWN',Mref,process,Dead,_} -> ok
     end,
-    ?line fail_register(Name, Dead),
-    ?line fail_register(Name, make_ref()),
-    ?line fail_register(Name, []),
-    ?line fail_register(Name, {bad,process}),
-    ?line fail_register(Name, <<>>),
+    fail_register(Name, Dead),
+    fail_register(Name, make_ref()),
+    fail_register(Name, []),
+    fail_register(Name, {bad,process}),
+    fail_register(Name, <<>>),
     ok.
 
 fail_register(Name, Process) ->
@@ -1201,50 +1187,50 @@ fail_register(Name, Process) ->
 garbage_collect(doc) -> [];
 garbage_collect(suite) -> [];
 garbage_collect(Config) when is_list(Config) ->
-    ?line Prio = process_flag(priority, high),
-    ?line true = erlang:garbage_collect(),
-    ?line TokLoopers = lists:map(fun (_) ->
-					 spawn_opt(fun tok_loop/0,
-						   [{priority, low}, link])
-				 end,
-				 lists:seq(1, 10)),
-    ?line lists:foreach(fun (Pid) ->
-				?line Mon = erlang:monitor(process, Pid),
-				?line DownBefore = receive
-						       {'DOWN', Mon, _, _, _} ->
-							   ?line true
-						   after 0 ->
-							   ?line false
-						   end,
-				?line GC = erlang:garbage_collect(Pid),
-				?line DownAfter = receive
-						      {'DOWN', Mon, _, _, _} ->
-							  ?line true
-						  after 0 ->
-							  ?line false
-						  end,
-				?line true = erlang:demonitor(Mon),
-				?line case {DownBefore, DownAfter} of
-					  {true, _} -> ?line false = GC;
-					  {false, false} -> ?line true = GC;
-					  _ -> ?line GC
-				      end
-			end,
-			processes()),
-    ?line lists:foreach(fun (Pid) ->
-				unlink(Pid),
-				exit(Pid, bang)
-			end, TokLoopers),
-    ?line process_flag(priority, Prio),
-    ?line ok.
+    Prio = process_flag(priority, high),
+    true = erlang:garbage_collect(),
+    
+    TokLoopers = lists:map(fun (_) ->
+		spawn_opt(fun tok_loop/0, [{priority, low}, link])
+	end, lists:seq(1, 10)),
+
+    lists:foreach(fun (Pid) ->
+		Mon = erlang:monitor(process, Pid),
+		DownBefore = receive
+		    {'DOWN', Mon, _, _, _} ->
+			true
+		after 0 ->
+			false
+		end,
+		GC = erlang:garbage_collect(Pid),
+		DownAfter = receive
+		    {'DOWN', Mon, _, _, _} ->
+			true
+		after 0 ->
+			false
+		end,
+		true = erlang:demonitor(Mon),
+		case {DownBefore, DownAfter} of
+		    {true, _} -> false = GC;
+		    {false, false} -> true = GC;
+		    _ -> GC
+		end
+	end, processes()),
+
+    lists:foreach(fun (Pid) ->
+		unlink(Pid),
+		exit(Pid, bang)
+	end, TokLoopers),
+    process_flag(priority, Prio),
+    ok.
 
 process_info_messages(doc) ->
     ["This used to cause the nofrag emulator to dump core"];
 process_info_messages(suite) ->
     [];
 process_info_messages(Config) when is_list(Config) ->
-    ?line process_info_messages_test(),
-    ?line ok.
+    process_info_messages_test(),
+    ok.
 
 process_info_messages_loop(0) -> ok;
 process_info_messages_loop(N) -> process_info_messages_loop(N-1).
@@ -1259,43 +1245,42 @@ process_info_messages_send_my_msgs_to(Rcvr) ->
     end.
 
 process_info_messages_test() ->
-    ?line Go = make_ref(),
-    ?line Done = make_ref(),
-    ?line Rcvr = self(),
-    ?line Rcvr2 = spawn_link(fun () ->
-				     receive {Go, Rcvr} -> ok end,
-				     garbage_collect(),
-				     Rcvr ! {Done, self()}
-			     end),
-    ?line Sndrs = lists:map(
-		    fun (_) ->
-			    spawn_link(fun () ->
-					       Rcvr ! {Go, self()},
-					       receive {Go, Rcvr} -> ok end,
-					       BigData = lists:seq(1, 1000),
-					       Rcvr ! BigData,
-					       Rcvr ! BigData,
-					       Rcvr ! BigData,
-					       Rcvr ! {Done, self()}
-				       end)
-		    end,
-		    lists:seq(1, 10)),
-    ?line lists:foreach(fun (Sndr) -> receive {Go, Sndr} -> ok end end,
+    Go = make_ref(),
+    Done = make_ref(),
+    Rcvr = self(),
+    Rcvr2 = spawn_link(fun () ->
+		receive {Go, Rcvr} -> ok end,
+		garbage_collect(),
+		Rcvr ! {Done, self()}
+	end),
+    Sndrs = lists:map(
+	fun (_) ->
+		spawn_link(fun () ->
+			    Rcvr ! {Go, self()},
+			    receive {Go, Rcvr} -> ok end,
+			    BigData = lists:seq(1, 1000),
+			    Rcvr ! BigData,
+			    Rcvr ! BigData,
+			    Rcvr ! BigData,
+			    Rcvr ! {Done, self()}
+		    end)
+	end, lists:seq(1, 10)),
+    lists:foreach(fun (Sndr) -> receive {Go, Sndr} -> ok end end,
 			Sndrs),
-    ?line garbage_collect(),
-    ?line erlang:yield(),
-    ?line lists:foreach(fun (Sndr) -> Sndr ! {Go, self()} end, Sndrs),
-    ?line process_info_messages_loop(100000000),
-    ?line Msgs = process_info(self(), messages),
-    ?line lists:foreach(fun (Sndr) -> receive {Done, Sndr} -> ok end end,
+    garbage_collect(),
+    erlang:yield(),
+    lists:foreach(fun (Sndr) -> Sndr ! {Go, self()} end, Sndrs),
+    process_info_messages_loop(100000000),
+    Msgs = process_info(self(), messages),
+    lists:foreach(fun (Sndr) -> receive {Done, Sndr} -> ok end end,
 			Sndrs),
-    ?line garbage_collect(),
-    ?line Rcvr2 ! Msgs,
-    ?line process_info_messages_send_my_msgs_to(Rcvr2),
-    ?line Rcvr2 ! {Go, self()},
-    ?line garbage_collect(),
-    ?line receive {Done, Rcvr2} -> ok end,
-    ?line Msgs.
+    garbage_collect(),
+    Rcvr2 ! Msgs,
+    process_info_messages_send_my_msgs_to(Rcvr2),
+    Rcvr2 ! {Go, self()},
+    garbage_collect(),
+    receive {Done, Rcvr2} -> ok end,
+    Msgs.
 
 chk_badarg(Fun) ->
     try Fun(), exit(no_badarg) catch error:badarg -> ok end.
@@ -1305,76 +1290,72 @@ process_flag_badarg(doc) ->
 process_flag_badarg(suite) ->
     [];
 process_flag_badarg(Config) when is_list(Config) ->
-    ?line chk_badarg(fun () -> process_flag(gurka, banan) end),
-    ?line chk_badarg(fun () -> process_flag(trap_exit, gurka) end),
-    ?line chk_badarg(fun () -> process_flag(error_handler, 1) end),
-    ?line chk_badarg(fun () -> process_flag(min_heap_size, gurka) end),
-    ?line chk_badarg(fun () -> process_flag(min_bin_vheap_size, gurka) end),
-    ?line chk_badarg(fun () -> process_flag(min_bin_vheap_size, -1) end),
-    ?line chk_badarg(fun () -> process_flag(priority, 4711) end),
-    ?line chk_badarg(fun () -> process_flag(save_calls, hmmm) end),
-    ?line P= spawn_link(fun () -> receive die -> ok end end),
-    ?line chk_badarg(fun () -> process_flag(P, save_calls, hmmm) end),
-    ?line chk_badarg(fun () -> process_flag(gurka, save_calls, hmmm) end),
-    ?line P ! die,
-    ?line ok.
+    chk_badarg(fun () -> process_flag(gurka, banan) end),
+    chk_badarg(fun () -> process_flag(trap_exit, gurka) end),
+    chk_badarg(fun () -> process_flag(error_handler, 1) end),
+    chk_badarg(fun () -> process_flag(min_heap_size, gurka) end),
+    chk_badarg(fun () -> process_flag(min_bin_vheap_size, gurka) end),
+    chk_badarg(fun () -> process_flag(min_bin_vheap_size, -1) end),
+    chk_badarg(fun () -> process_flag(priority, 4711) end),
+    chk_badarg(fun () -> process_flag(save_calls, hmmm) end),
+    P= spawn_link(fun () -> receive die -> ok end end),
+    chk_badarg(fun () -> process_flag(P, save_calls, hmmm) end),
+    chk_badarg(fun () -> process_flag(gurka, save_calls, hmmm) end),
+    P ! die,
+    ok.
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
 otp_6237(doc) -> [];
 otp_6237(suite) -> [];
 otp_6237(Config) when is_list(Config) ->
-    ?line Slctrs = lists:map(fun (_) ->
-				     spawn_link(fun () ->
-							otp_6237_select_loop()
-						end)
-			     end,
-			     lists:seq(1,5)),
-    ?line lists:foreach(fun (_) -> otp_6237_test() end, lists:seq(1, 100)),
-    ?line lists:foreach(fun (S) -> unlink(S),exit(S, kill) end, Slctrs), 
-    ?line ok.
+    Slctrs = lists:map(fun (_) ->
+		spawn_link(fun () ->
+			    otp_6237_select_loop()
+		    end)
+	end,
+	lists:seq(1,5)),
+    lists:foreach(fun (_) -> otp_6237_test() end, lists:seq(1, 100)),
+    lists:foreach(fun (S) -> unlink(S),exit(S, kill) end, Slctrs), 
+    ok.
 				
 otp_6237_test() ->
-    ?line Parent = self(),
-    ?line Inited = make_ref(),
-    ?line Die = make_ref(),
-    ?line Pid = spawn_link(fun () ->
-				   register(otp_6237,self()),
-				   otp_6237 = ets:new(otp_6237,
-						      [named_table,
-						       ordered_set]),
-				   ets:insert(otp_6237,
-					      [{I,I}
-					       || I <- lists:seq(1, 100)]),
-				   %% Inserting a lot of bif timers
-				   %% increase the possibility that
-				   %% the test will fail when the
-				   %% original cleanup order is used
-				   lists:foreach(
-				     fun (_) ->
-					     erlang:send_after(1000000,
-							       self(),
-							       {a,b,c})
-				     end,
-				     lists:seq(1,1000)),
-				   Parent ! Inited,
-				   receive Die -> bye end
-			   end),
-    ?line receive
-	      Inited -> ?line ok
-	  end,
-    ?line Pid ! Die,
+    Parent = self(),
+    Inited = make_ref(),
+    Die = make_ref(),
+    Pid = spawn_link(fun () ->
+		register(otp_6237,self()),
+		otp_6237 = ets:new(otp_6237,
+		    [named_table,
+			ordered_set]),
+		ets:insert(otp_6237,
+		    [{I,I}
+			|| I <- lists:seq(1, 100)]),
+		%% Inserting a lot of bif timers
+		%% increase the possibility that
+		%% the test will fail when the
+		%% original cleanup order is used
+		lists:foreach( fun (_) ->
+			    erlang:send_after(1000000, self(), {a,b,c})
+		    end, lists:seq(1,1000)),
+		Parent ! Inited,
+		receive Die -> bye end
+	end),
+    receive
+	Inited -> ok
+    end,
+    Pid ! Die,
     otp_6237_whereis_loop().
 
 otp_6237_whereis_loop() ->
-    ?line case whereis(otp_6237) of
+    case whereis(otp_6237) of
 	      undefined ->
-		  ?line otp_6237 = ets:new(otp_6237,
+		  otp_6237 = ets:new(otp_6237,
 					   [named_table,ordered_set]),
-		  ?line ets:delete(otp_6237),
-		  ?line ok;
+		  ets:delete(otp_6237),
+		  ok;
 	      _ ->
-		  ?line otp_6237_whereis_loop()
+		  otp_6237_whereis_loop()
 	  end.
 	     
 otp_6237_select_loop() ->
@@ -1382,7 +1363,6 @@ otp_6237_select_loop() ->
     otp_6237_select_loop().
 
 
-
 -define(NoTestProcs, 10000).
 -record(ptab_list_bif_info, {min_start_reds,
 			     tab_chunks,
@@ -1399,42 +1379,42 @@ processes_large_tab(doc) ->
 processes_large_tab(suite) ->
     [];
 processes_large_tab(Config) when is_list(Config) ->
-    ?line enable_internal_state(),
-    ?line MaxDbgLvl = 20,
-    ?line MinProcTabSize = 2*(1 bsl 15),
-    ?line ProcTabSize0 = 1000000,
-    ?line ProcTabSize1 = case {erlang:system_info(schedulers_online),
-			       erlang:system_info(logical_processors)} of
-			     {Schdlrs, Cpus} when is_integer(Cpus),
-			                          Schdlrs =< Cpus ->
-				 ProcTabSize0;
-			     _ ->
-				 ProcTabSize0 div 4
-			 end,
-    ?line ProcTabSize2 = case erlang:system_info(debug_compiled) of
-		     true -> ProcTabSize1 - 500000;
-		     false -> ProcTabSize1
-		 end,
+    enable_internal_state(),
+    MaxDbgLvl = 20,
+    MinProcTabSize = 2*(1 bsl 15),
+    ProcTabSize0 = 1000000,
+    ProcTabSize1 = case {erlang:system_info(schedulers_online),
+	    erlang:system_info(logical_processors)} of
+	{Schdlrs, Cpus} when is_integer(Cpus),
+	Schdlrs =< Cpus ->
+	    ProcTabSize0;
+	_ ->
+	    ProcTabSize0 div 4
+    end,
+    ProcTabSize2 = case erlang:system_info(debug_compiled) of
+	true -> ProcTabSize1 - 500000;
+	false -> ProcTabSize1
+    end,
     %% With high debug levels this test takes so long time that
     %% the connection times out; therefore, shrink the test on
     %% high debug levels.
-    ?line DbgLvl = case erts_debug:get_internal_state(processes_bif_info) of
+    DbgLvl = case erts_debug:get_internal_state(processes_bif_info) of
 		       #ptab_list_bif_info{debug_level = Lvl} when Lvl > MaxDbgLvl ->
 			   20;
 		       #ptab_list_bif_info{debug_level = Lvl} when Lvl < 0 ->
-			   ?line ?t:fail({debug_level, Lvl});
+			   ?t:fail({debug_level, Lvl});
 		       #ptab_list_bif_info{debug_level = Lvl} ->
 			   Lvl
 		   end,
-    ?line ProcTabSize3 = ProcTabSize2 - (1300000 * DbgLvl div MaxDbgLvl),
-    ?line ProcTabSize = case ProcTabSize3 < MinProcTabSize of
+    ProcTabSize3 = ProcTabSize2 - (1300000 * DbgLvl div MaxDbgLvl),
+    ProcTabSize = case ProcTabSize3 < MinProcTabSize of
 			    true -> MinProcTabSize;
 			    false -> ProcTabSize3
 			end,
-    ?line {ok, LargeNode} = start_node(Config,
+    {ok, LargeNode} = start_node(Config,
 				       "+P " ++ integer_to_list(ProcTabSize)),
-    ?line Res = rpc:call(LargeNode, ?MODULE, processes_bif_test, []),
-    ?line case rpc:call(LargeNode,
+    Res = rpc:call(LargeNode, ?MODULE, processes_bif_test, []),
+    case rpc:call(LargeNode,
 			erts_debug,
 			get_internal_state,
 			[processes_bif_info]) of
@@ -1442,40 +1422,37 @@ processes_large_tab(Config) when is_list(Config) ->
 							    Chunks > 1 -> ok;
 	      PBInfo -> ?t:fail(PBInfo)
 	  end,
-    ?line stop_node(LargeNode),
-    ?line chk_processes_bif_test_res(Res).
+    stop_node(LargeNode),
+    chk_processes_bif_test_res(Res).
 
 processes_default_tab(doc) ->
     [];
 processes_default_tab(suite) ->
     [];
 processes_default_tab(Config) when is_list(Config) ->
-    ?line {ok, DefaultNode} = start_node(Config, ""),
-    ?line Res = rpc:call(DefaultNode, ?MODULE, processes_bif_test, []),
-    ?line stop_node(DefaultNode),
-    ?line chk_processes_bif_test_res(Res).
+    {ok, DefaultNode} = start_node(Config, ""),
+    Res = rpc:call(DefaultNode, ?MODULE, processes_bif_test, []),
+    stop_node(DefaultNode),
+    chk_processes_bif_test_res(Res).
 
 processes_small_tab(doc) ->
     [];
 processes_small_tab(suite) ->
     [];
 processes_small_tab(Config) when is_list(Config) ->
-    ?line {ok, SmallNode} = start_node(Config, "+P 1024"),
-    ?line Res = rpc:call(SmallNode, ?MODULE, processes_bif_test, []),
-    ?line PBInfo = rpc:call(SmallNode,
-			    erts_debug,
-			    get_internal_state,
-			    [processes_bif_info]),
-    ?line stop_node(SmallNode),
-    ?line true = PBInfo#ptab_list_bif_info.tab_chunks < 10,
-    ?line chk_processes_bif_test_res(Res).
+    {ok, SmallNode} = start_node(Config, "+P 1024"),
+    Res    = rpc:call(SmallNode, ?MODULE, processes_bif_test, []),
+    PBInfo = rpc:call(SmallNode, erts_debug, get_internal_state, [processes_bif_info]),
+    stop_node(SmallNode),
+    true = PBInfo#ptab_list_bif_info.tab_chunks < 10,
+    chk_processes_bif_test_res(Res).
 
 processes_this_tab(doc) ->
     [];
 processes_this_tab(suite) ->
     [];
 processes_this_tab(Config) when is_list(Config) ->
-    ?line chk_processes_bif_test_res(processes_bif_test()).
+    chk_processes_bif_test_res(processes_bif_test()).
 
 chk_processes_bif_test_res(ok) -> ok;
 chk_processes_bif_test_res({comment, _} = Comment) -> Comment;
@@ -1575,26 +1552,26 @@ do_processes(WantReds) ->
     processes().
 
 processes_bif_test() ->
-    ?line Tester = self(),
-    ?line enable_internal_state(),
-    ?line PBInfo = erts_debug:get_internal_state(processes_bif_info),
-    ?line print_processes_bif_info(PBInfo),
-    ?line WantReds = PBInfo#ptab_list_bif_info.min_start_reds + 10,
-    ?line WillTrap = case PBInfo of
-			#ptab_list_bif_info{tab_chunks = Chunks} when Chunks < 10 ->
-			    false; %% Skip for small tables
-			#ptab_list_bif_info{tab_chunks = Chunks,
-					    tab_chunks_size = ChunksSize,
-					    tab_indices_per_red = IndiciesPerRed
-					   } ->
-			    Chunks*ChunksSize >= IndiciesPerRed*WantReds
-		    end,
-    ?line Processes = fun () ->
-			      erts_debug:set_internal_state(reds_left,WantReds),
-			      processes()
-		      end,
+    Tester = self(),
+    enable_internal_state(),
+    PBInfo = erts_debug:get_internal_state(processes_bif_info),
+    print_processes_bif_info(PBInfo),
+    WantReds = PBInfo#ptab_list_bif_info.min_start_reds + 10,
+    WillTrap = case PBInfo of
+	#ptab_list_bif_info{tab_chunks = Chunks} when Chunks < 10 ->
+	    false; %% Skip for small tables
+	#ptab_list_bif_info{tab_chunks = Chunks,
+	    tab_chunks_size = ChunksSize,
+	    tab_indices_per_red = IndiciesPerRed
+	} ->
+	    Chunks*ChunksSize >= IndiciesPerRed*WantReds
+    end,
+    Processes = fun () ->
+	    erts_debug:set_internal_state(reds_left,WantReds),
+	    processes()
+    end,
 
-    ?line ok = do_processes_bif_test(WantReds, WillTrap, Processes),
+    ok = do_processes_bif_test(WantReds, WillTrap, Processes),
 
     case WillTrap of
 	false ->
@@ -1602,8 +1579,8 @@ processes_bif_test() ->
 	true ->
 	    %% Do it again with a process suspended while
 	    %% in the processes/0 bif.
-	    ?line erlang:system_flag(multi_scheduling, block),
-	    ?line Suspendee = spawn_link(fun () ->
+	    erlang:system_flag(multi_scheduling, block),
+	    Suspendee = spawn_link(fun () ->
 						 Tester ! {suspend_me, self()},
 						 Tester ! {self(),
 							   done,
@@ -1613,175 +1590,156 @@ processes_bif_test() ->
 							 ok
 						 end
 					 end),
-	    ?line receive {suspend_me, Suspendee} -> ok end,
-	    ?line erlang:suspend_process(Suspendee),
-	    ?line erlang:system_flag(multi_scheduling, unblock),
+	    receive {suspend_me, Suspendee} -> ok end,
+	    erlang:suspend_process(Suspendee),
+	    erlang:system_flag(multi_scheduling, unblock),
 	    
-	    ?line [{status,suspended},
-		   {current_function,{erlang,ptab_list_continue,2}}]
-		= process_info(Suspendee, [status, current_function]),
+	    [{status,suspended},{current_function,{erlang,ptab_list_continue,2}}] =
+		process_info(Suspendee, [status, current_function]),
 
-	    ?line ok = do_processes_bif_test(WantReds, WillTrap, Processes),
+	    ok = do_processes_bif_test(WantReds, WillTrap, Processes),
 	    
-	    ?line erlang:resume_process(Suspendee),
-	    ?line receive {Suspendee, done, _} -> ok end,
-	    ?line unlink(Suspendee),
-	    ?line exit(Suspendee, bang)
+	    erlang:resume_process(Suspendee),
+	    receive {Suspendee, done, _} -> ok end,
+	    unlink(Suspendee),
+	    exit(Suspendee, bang)
     end,
     case get(processes_bif_testcase_comment) of
-	undefined -> ?line ok;
-	Comment -> ?line {comment, Comment}
+	undefined -> ok;
+	Comment -> {comment, Comment}
     end.
     
 do_processes_bif_test(WantReds, DieTest, Processes) ->
-    ?line Tester = self(),
-    ?line SpawnProcesses = fun (Prio) ->
-				   spawn_opt(?MODULE,
-					     do_processes,
-					     [WantReds],
-					     [link, {priority, Prio}])
-			   end,
-    ?line Cleaner = spawn_link(fun () ->
-				       process_flag(trap_exit, true),
-				       Tester ! {cleaner_alive, self()},
-				       processes_bif_cleaner()
-			       end),
-    ?line receive {cleaner_alive, Cleaner} -> ok end,
+    Tester = self(),
+    SpawnProcesses = fun (Prio) ->
+	    spawn_opt(?MODULE, do_processes, [WantReds], [link, {priority, Prio}])
+    end,
+    Cleaner = spawn_link(fun () ->
+		process_flag(trap_exit, true),
+		Tester ! {cleaner_alive, self()},
+		processes_bif_cleaner()
+	end),
+    receive {cleaner_alive, Cleaner} -> ok end,
     try
-	?line DoIt = make_ref(),
-	?line GetGoing = make_ref(),
-	?line {NoTestProcs, TestProcs} = spawn_initial_hangarounds(Cleaner),
-	?line ?t:format("Testing with ~p processes~n", [NoTestProcs]),
-	?line SpawnHangAround = fun () ->
-					spawn(?MODULE,
-					      hangaround,
-					      [Cleaner, new_hangaround])
-				end,
-	?line Killer = spawn_opt(fun () ->
-					 Splt = NoTestProcs div 10,
-					 {TP1, TP23} = lists:split(Splt,
-								   TestProcs),
-					 {TP2, TP3} = lists:split(Splt, TP23),
-					 erlang:system_flag(multi_scheduling,
-							    block),
-					 Tester ! DoIt,
-					 receive GetGoing -> ok end,
-					 erlang:system_flag(multi_scheduling,
-							    unblock),
-					 SpawnProcesses(high),
-					 lists:foreach(
-					   fun (P) ->
-						   SpawnHangAround(),
-						   exit(P, bang)
-					   end,
-					   TP1),
-					 SpawnProcesses(high),
-					 erlang:yield(),
-					 lists:foreach(
-					   fun (P) ->
-						   SpawnHangAround(),
-						   exit(P, bang)
-					   end,
-					   TP2),
-					 SpawnProcesses(high),
-					 lists:foreach(
-					   fun (P) ->
-						   SpawnHangAround(),
-						   exit(P, bang)
-					   end,
-					   TP3)
-				 end,
-				 [{priority, high}, link]),
-	?line receive DoIt -> ok end,
-	?line process_flag(priority, low),
-	?line SpawnProcesses(low),
-	?line erlang:yield(),
-	?line process_flag(priority, normal),
-	?line CorrectProcs0 = erts_debug:get_internal_state(processes),
-	?line Killer ! GetGoing,
-	?line erts_debug:set_internal_state(reds_left, WantReds),
-	?line Procs0 = processes(),
-	?line Procs = lists:sort(Procs0),
-	?line CorrectProcs = lists:sort(CorrectProcs0),
-	?line LengthCorrectProcs = length(CorrectProcs),
-	?line ?t:format("~p = length(CorrectProcs)~n", [LengthCorrectProcs]),
-	?line true = LengthCorrectProcs > NoTestProcs,
-	?line case CorrectProcs =:= Procs of
-		  true ->
-		      ?line ok;
-		  false ->
-		      ?line processes_unexpected_result(CorrectProcs, Procs)
-	      end,
-	?line unlink(Killer),
-	?line exit(Killer, bang)
+	DoIt = make_ref(),
+	GetGoing = make_ref(),
+	{NoTestProcs, TestProcs} = spawn_initial_hangarounds(Cleaner),
+	?t:format("Testing with ~p processes~n", [NoTestProcs]),
+	SpawnHangAround = fun () ->
+		spawn(?MODULE, hangaround, [Cleaner, new_hangaround])
+	end,
+	Killer = spawn_opt(fun () ->
+		    Splt = NoTestProcs div 10,
+		    {TP1, TP23} = lists:split(Splt, TestProcs),
+		    {TP2, TP3} = lists:split(Splt, TP23),
+		    erlang:system_flag(multi_scheduling, block),
+		    Tester ! DoIt,
+		    receive GetGoing -> ok end,
+		    erlang:system_flag(multi_scheduling, unblock),
+		    SpawnProcesses(high),
+		    lists:foreach( fun (P) ->
+				SpawnHangAround(),
+				exit(P, bang)
+			end, TP1),
+		    SpawnProcesses(high),
+		    erlang:yield(),
+		    lists:foreach( fun (P) ->
+				SpawnHangAround(),
+				exit(P, bang)
+			end, TP2),
+		    SpawnProcesses(high),
+		    lists:foreach(
+			fun (P) ->
+				SpawnHangAround(),
+				exit(P, bang)
+			end, TP3)
+	    end, [{priority, high}, link]),
+	receive DoIt -> ok end,
+	process_flag(priority, low),
+	SpawnProcesses(low),
+	erlang:yield(),
+	process_flag(priority, normal),
+	CorrectProcs0 = erts_debug:get_internal_state(processes),
+	Killer ! GetGoing,
+	erts_debug:set_internal_state(reds_left, WantReds),
+	Procs0 = processes(),
+	Procs = lists:sort(Procs0),
+	CorrectProcs = lists:sort(CorrectProcs0),
+	LengthCorrectProcs = length(CorrectProcs),
+	?t:format("~p = length(CorrectProcs)~n", [LengthCorrectProcs]),
+	true = LengthCorrectProcs > NoTestProcs,
+	case CorrectProcs =:= Procs of
+	    true ->
+		ok;
+	    false ->
+		processes_unexpected_result(CorrectProcs, Procs)
+	end,
+	unlink(Killer),
+	exit(Killer, bang)
     after
 	unlink(Cleaner),
         exit(Cleaner, kill),
         %% Wait for the system to recover to a normal state...
 	wait_until_system_recover()
     end,
-    ?line do_processes_bif_die_test(DieTest, Processes),
-    ?line ok.
+    do_processes_bif_die_test(DieTest, Processes),
+    ok.
 
 
 do_processes_bif_die_test(false, _Processes) ->
-    ?line ?t:format("Skipping test killing process executing processes/0~n",[]),
-    ?line ok;
+    ?t:format("Skipping test killing process executing processes/0~n",[]),
+    ok;
 do_processes_bif_die_test(true, Processes) ->
-    ?line do_processes_bif_die_test(5, Processes);
+    do_processes_bif_die_test(5, Processes);
 do_processes_bif_die_test(N, Processes) ->
-    ?line ?t:format("Doing test killing process executing processes/0~n",[]),
+    ?t:format("Doing test killing process executing processes/0~n",[]),
     try
-	?line Tester = self(),
-	?line Oooh_Nooooooo = make_ref(),
-	?line {_, DieWhileDoingMon} = erlang:spawn_monitor(
-					fun () ->
-						Victim = self(),
-						spawn_opt(
-						  fun () ->
-							  exit(Victim, got_him)
-						  end,
-						  [link,
-						   {priority, max}]),
-						Tester ! {Oooh_Nooooooo,
-							  hd(Processes())},
-						exit(ohhhh_nooooo)
-					end),
-	?line receive
-		  {'DOWN', DieWhileDoingMon, _, _, Reason} ->
-		      case Reason of
-			  got_him -> ok;
-			  _ -> throw({kill_in_trap, Reason})
-		      end
-	      end,
-	?line receive
-		  {Oooh_Nooooooo, _} ->
-		      ?line throw({kill_in_trap, 'Oooh_Nooooooo'})
-	      after 0 ->
-		      ?line ok
-	      end,
-	?line PrcsCllrsSeqLen = 2*erlang:system_info(schedulers_online),
-	?line PrcsCllrsSeq = lists:seq(1, PrcsCllrsSeqLen),
-	?line ProcsCallers = lists:map(
-			       fun (_) ->
-				       spawn_link(
-					 fun () ->
-						 Tester ! hd(Processes())
-					 end)
-			       end,
-			       PrcsCllrsSeq),
-	?line erlang:yield(),
+	Tester = self(),
+	Oooh_Nooooooo = make_ref(),
+	{_, DieWhileDoingMon} = erlang:spawn_monitor( fun () ->
+		    Victim = self(),
+		    spawn_opt(
+			fun () ->
+				exit(Victim, got_him)
+			end,
+			[link, {priority, max}]),
+		    Tester ! {Oooh_Nooooooo,
+			hd(Processes())},
+		    exit(ohhhh_nooooo)
+	    end),
+	receive
+	    {'DOWN', DieWhileDoingMon, _, _, Reason} ->
+		case Reason of
+		    got_him -> ok;
+		    _ -> throw({kill_in_trap, Reason})
+		end
+	end,
+	receive
+	    {Oooh_Nooooooo, _} ->
+		throw({kill_in_trap, 'Oooh_Nooooooo'})
+	after 0 ->
+		ok
+	end,
+	PrcsCllrsSeqLen = 2*erlang:system_info(schedulers_online),
+	PrcsCllrsSeq = lists:seq(1, PrcsCllrsSeqLen),
+	ProcsCallers = lists:map( fun (_) ->
+		    spawn_link(
+			fun () ->
+				Tester ! hd(Processes())
+			end)
+	    end, PrcsCllrsSeq),
+	erlang:yield(),
 	{ProcsCallers1, ProcsCallers2} = lists:split(PrcsCllrsSeqLen div 2,
 						     ProcsCallers),
-	?line process_flag(priority, high),
-	?line lists:foreach(
+	process_flag(priority, high),
+	lists:foreach(
 		fun (P) ->
 			unlink(P),
 			exit(P, bang)
 		end,
 		lists:reverse(ProcsCallers2) ++ ProcsCallers1),
-	?line process_flag(priority, normal),
-	?line ok
+	process_flag(priority, normal),
+	ok
     catch
 	throw:{kill_in_trap, R} when N > 0 ->
 	    ?t:format("Failed to kill in trap: ~p~n", [R]),
@@ -1844,23 +1802,23 @@ processes_last_call_trap(doc) ->
 processes_last_call_trap(suite) ->
     [];
 processes_last_call_trap(Config) when is_list(Config) ->
-    ?line enable_internal_state(),
-    ?line Processes = fun () -> processes() end,
-    ?line PBInfo = erts_debug:get_internal_state(processes_bif_info),
-    ?line print_processes_bif_info(PBInfo),
-    ?line WantReds = case PBInfo#ptab_list_bif_info.min_start_reds of
-			 R when R > 10 -> R - 1;
-			 _R -> 9
-		     end,
-    ?line lists:foreach(fun (_) ->
-				?line erts_debug:set_internal_state(reds_left,
-								    WantReds),
-				Processes(),
-				?line erts_debug:set_internal_state(reds_left,
-								    WantReds),
-				my_processes()
-			end,
-			lists:seq(1,100)).
+    enable_internal_state(),
+    Processes = fun () -> processes() end,
+    PBInfo = erts_debug:get_internal_state(processes_bif_info),
+    print_processes_bif_info(PBInfo),
+    WantReds = case PBInfo#ptab_list_bif_info.min_start_reds of
+	R when R > 10 -> R - 1;
+	_R -> 9
+    end,
+    lists:foreach(fun (_) ->
+		erts_debug:set_internal_state(reds_left,
+		    WantReds),
+		Processes(),
+		erts_debug:set_internal_state(reds_left,
+		    WantReds),
+		my_processes()
+	end,
+	lists:seq(1,100)).
     
 my_processes() ->
     processes().
@@ -1870,108 +1828,106 @@ processes_apply_trap(doc) ->
 processes_apply_trap(suite) ->
     [];
 processes_apply_trap(Config) when is_list(Config) ->
-    ?line enable_internal_state(),
-    ?line PBInfo = erts_debug:get_internal_state(processes_bif_info),
-    ?line print_processes_bif_info(PBInfo),
-    ?line WantReds = case PBInfo#ptab_list_bif_info.min_start_reds of
-			 R when R > 10 -> R - 1;
-			 _R -> 9
-		     end,
-    ?line lists:foreach(fun (_) ->
-				?line erts_debug:set_internal_state(reds_left,
-								    WantReds),
-				?line apply(erlang, processes, [])
-			end,
-			lists:seq(1,100)).
+    enable_internal_state(),
+    PBInfo = erts_debug:get_internal_state(processes_bif_info),
+    print_processes_bif_info(PBInfo),
+    WantReds = case PBInfo#ptab_list_bif_info.min_start_reds of
+	R when R > 10 -> R - 1;
+	_R -> 9
+    end,
+    lists:foreach(fun (_) ->
+		erts_debug:set_internal_state(reds_left,
+		    WantReds),
+		apply(erlang, processes, [])
+	end, lists:seq(1,100)).
 
 processes_gc_trap(doc) ->
     [];
 processes_gc_trap(suite) ->
     [];
 processes_gc_trap(Config) when is_list(Config) ->
-    ?line Tester = self(),
-    ?line enable_internal_state(),
-    ?line PBInfo = erts_debug:get_internal_state(processes_bif_info),
-    ?line print_processes_bif_info(PBInfo),
-    ?line WantReds = PBInfo#ptab_list_bif_info.min_start_reds + 10,
-    ?line Processes = fun () ->
-			      erts_debug:set_internal_state(reds_left,WantReds),
-			      processes()
-		      end,
+    Tester = self(),
+    enable_internal_state(),
+    PBInfo = erts_debug:get_internal_state(processes_bif_info),
+    print_processes_bif_info(PBInfo),
+    WantReds = PBInfo#ptab_list_bif_info.min_start_reds + 10,
+    Processes = fun () ->
+	    erts_debug:set_internal_state(reds_left,WantReds),
+	    processes()
+    end,
 
-    ?line erlang:system_flag(multi_scheduling, block),
-    ?line Suspendee = spawn_link(fun () ->
+    erlang:system_flag(multi_scheduling, block),
+    Suspendee = spawn_link(fun () ->
 					 Tester ! {suspend_me, self()},
 					 Tester ! {self(),
 						   done,
 						   hd(Processes())},
 					 receive after infinity -> ok end
 				 end),
-    ?line receive {suspend_me, Suspendee} -> ok end,
-    ?line erlang:suspend_process(Suspendee),
-    ?line erlang:system_flag(multi_scheduling, unblock),
+    receive {suspend_me, Suspendee} -> ok end,
+    erlang:suspend_process(Suspendee),
+    erlang:system_flag(multi_scheduling, unblock),
 	    
-    ?line [{status,suspended}, {current_function,{erlang,ptab_list_continue,2}}]
+    [{status,suspended}, {current_function,{erlang,ptab_list_continue,2}}]
 	= process_info(Suspendee, [status, current_function]),
 
-    ?line erlang:garbage_collect(Suspendee),
-    ?line erlang:garbage_collect(Suspendee),
+    erlang:garbage_collect(Suspendee),
+    erlang:garbage_collect(Suspendee),
 	    
-    ?line erlang:resume_process(Suspendee),
-    ?line receive {Suspendee, done, _} -> ok end,
-    ?line erlang:garbage_collect(Suspendee),
-    ?line erlang:garbage_collect(Suspendee),
+    erlang:resume_process(Suspendee),
+    receive {Suspendee, done, _} -> ok end,
+    erlang:garbage_collect(Suspendee),
+    erlang:garbage_collect(Suspendee),
 
-    ?line unlink(Suspendee),
-    ?line exit(Suspendee, bang),
-    ?line ok.
+    unlink(Suspendee),
+    exit(Suspendee, bang),
+    ok.
 
 process_flag_heap_size(doc) ->
     [];
 process_flag_heap_size(suite) ->
     [];
 process_flag_heap_size(Config) when is_list(Config) ->
-    HSize  = 2584,   % must be gc fib number
-    VHSize = 317811, % must be gc fib number
-    ?line OldHmin = erlang:process_flag(min_heap_size, HSize),
-    ?line {min_heap_size, HSize} = erlang:process_info(self(), min_heap_size),
-    ?line OldVHmin = erlang:process_flag(min_bin_vheap_size, VHSize),
-    ?line {min_bin_vheap_size, VHSize} = erlang:process_info(self(), min_bin_vheap_size),
-    ?line HSize = erlang:process_flag(min_heap_size, OldHmin),
-    ?line VHSize = erlang:process_flag(min_bin_vheap_size, OldVHmin),
-    ?line ok.
+    HSize  = 2586,   % must be gc fib+ number
+    VHSize = 318187, % must be gc fib+ number
+    OldHmin = erlang:process_flag(min_heap_size, HSize),
+    {min_heap_size, HSize} = erlang:process_info(self(), min_heap_size),
+    OldVHmin = erlang:process_flag(min_bin_vheap_size, VHSize),
+    {min_bin_vheap_size, VHSize} = erlang:process_info(self(), min_bin_vheap_size),
+    HSize = erlang:process_flag(min_heap_size, OldHmin),
+    VHSize = erlang:process_flag(min_bin_vheap_size, OldVHmin),
+    ok.
 
 spawn_opt_heap_size(doc) ->
     [];
 spawn_opt_heap_size(suite) ->
     [];
 spawn_opt_heap_size(Config) when is_list(Config) ->
-    HSize  = 987,   % must be gc fib number
-    VHSize = 46368, % must be gc fib number
-    ?line Pid  = spawn_opt(fun () -> receive stop -> ok end end,
+    HSize  = 987,   % must be gc fib+ number
+    VHSize = 46422, % must be gc fib+ number
+    Pid  = spawn_opt(fun () -> receive stop -> ok end end,
 	[{min_heap_size, HSize},{ min_bin_vheap_size, VHSize}]),
-    ?line {min_heap_size, HSize} = process_info(Pid, min_heap_size),
-    ?line {min_bin_vheap_size, VHSize} = process_info(Pid, min_bin_vheap_size),
-    ?line Pid ! stop,
-    ?line ok.
+    {min_heap_size, HSize} = process_info(Pid, min_heap_size),
+    {min_bin_vheap_size, VHSize} = process_info(Pid, min_bin_vheap_size),
+    Pid ! stop,
+    ok.
 
 processes_term_proc_list(doc) ->
     [];
 processes_term_proc_list(suite) ->
     [];
 processes_term_proc_list(Config) when is_list(Config) ->
-    ?line Tester = self(),
-    ?line as_expected = processes_term_proc_list_test(false),
-    ?line {ok, Node} = start_node(Config, "+Mis true"),
-    ?line RT = spawn_link(Node,
-			  fun () ->
-				  receive after 1000 -> ok end,
-				  processes_term_proc_list_test(false),
-				  Tester ! {it_worked, self()}
-			  end),
-    ?line receive {it_worked, RT} -> ok end,
-    ?line stop_node(Node),
-    ?line ok.
+    Tester = self(),
+    as_expected = processes_term_proc_list_test(false),
+    {ok, Node} = start_node(Config, "+Mis true"),
+    RT = spawn_link(Node, fun () ->
+		receive after 1000 -> ok end,
+		processes_term_proc_list_test(false),
+		Tester ! {it_worked, self()}
+	end),
+    receive {it_worked, RT} -> ok end,
+    stop_node(Node),
+    ok.
     
 -define(CHK_TERM_PROC_LIST(MC, XB),
 	chk_term_proc_list(?LINE, MC, XB)).
@@ -1997,35 +1953,34 @@ chk_term_proc_list(Line, MustChk, ExpectBlks) ->
     ok.
 
 processes_term_proc_list_test(MustChk) ->
-    ?line Tester = self(),
-    ?line enable_internal_state(),
-    ?line PBInfo = erts_debug:get_internal_state(processes_bif_info),
-    ?line print_processes_bif_info(PBInfo),
-    ?line WantReds = PBInfo#ptab_list_bif_info.min_start_reds + 10,
-    ?line #ptab_list_bif_info{tab_chunks = Chunks,
-			      tab_chunks_size = ChunksSize,
-			      tab_indices_per_red = IndiciesPerRed
-			     } = PBInfo,
-    ?line true = Chunks > 1,
-    ?line true = Chunks*ChunksSize >= IndiciesPerRed*WantReds,
-    ?line Processes = fun () ->
-			      erts_debug:set_internal_state(reds_left,
-							    WantReds),
-			      processes()
-		      end,
-    ?line Exit = fun (P) ->
-			 unlink(P),
-			 exit(P, bang),
-			 wait_until(
-			   fun () ->
-				   not lists:member(
-					 P,
-					 erts_debug:get_internal_state(
-					   processes))
-			   end)
-		 end,
-    ?line SpawnSuspendProcessesProc
-	= fun () ->
+    Tester = self(),
+    enable_internal_state(),
+    PBInfo = erts_debug:get_internal_state(processes_bif_info),
+    print_processes_bif_info(PBInfo),
+    WantReds = PBInfo#ptab_list_bif_info.min_start_reds + 10,
+    #ptab_list_bif_info{tab_chunks = Chunks,
+	tab_chunks_size = ChunksSize,
+	tab_indices_per_red = IndiciesPerRed
+    } = PBInfo,
+    true = Chunks > 1,
+    true = Chunks*ChunksSize >= IndiciesPerRed*WantReds,
+    Processes = fun () ->
+	    erts_debug:set_internal_state(reds_left,
+		WantReds),
+	    processes()
+    end,
+    Exit = fun (P) ->
+	    unlink(P),
+	    exit(P, bang),
+	    wait_until(
+		fun () ->
+			not lists:member(
+			    P,
+			    erts_debug:get_internal_state(
+				processes))
+		end)
+    end,
+    SpawnSuspendProcessesProc = fun () ->
 		  erlang:system_flag(multi_scheduling, block),
 		  P = spawn_link(fun () ->
 					 Tester ! {suspend_me, self()},
@@ -2042,72 +1997,72 @@ processes_term_proc_list_test(MustChk) ->
 		      = process_info(P, [status, current_function]),
 		  P
 	  end,
-    ?line ResumeProcessesProc = fun (P) ->
+    ResumeProcessesProc = fun (P) ->
 					erlang:resume_process(P),
 					receive {P, done, _} -> ok end
 				end,
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 0),
-    ?line HangAround = fun () -> receive after infinity -> ok end end,
-    ?line HA1 = spawn_link(HangAround),
-    ?line HA2 = spawn_link(HangAround),
-    ?line HA3 = spawn_link(HangAround),
-    ?line S1 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 1),
-    ?line Exit(HA1),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 2),
-    ?line S2 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 3),
-    ?line S3 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 4),
-    ?line Exit(HA2),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 5),
-    ?line S4 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 6),
-    ?line Exit(HA3),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 7),
-    ?line ResumeProcessesProc(S1),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 5),
-    ?line ResumeProcessesProc(S3),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 4),
-    ?line ResumeProcessesProc(S4),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 3),
-    ?line ResumeProcessesProc(S2),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 0),
-    ?line Exit(S1),
-    ?line Exit(S2),
-    ?line Exit(S3),
-    ?line Exit(S4),
-
-
-    ?line HA4 = spawn_link(HangAround),
-    ?line HA5 = spawn_link(HangAround),
-    ?line HA6 = spawn_link(HangAround),
-    ?line S5 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 1),
-    ?line Exit(HA4),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 2),
-    ?line S6 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 3),
-    ?line Exit(HA5),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 4),
-    ?line S7 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 5),
-    ?line Exit(HA6),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 6),
-    ?line S8 = SpawnSuspendProcessesProc(),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 7),
-
-    ?line erlang:system_flag(multi_scheduling, block),
-    ?line Exit(S8),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 7),
-    ?line Exit(S5),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 6),
-    ?line Exit(S7),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 6),
-    ?line Exit(S6),
-    ?line ?CHK_TERM_PROC_LIST(MustChk, 0),
-    ?line erlang:system_flag(multi_scheduling, unblock),
-    ?line as_expected.
+    ?CHK_TERM_PROC_LIST(MustChk, 0),
+    HangAround = fun () -> receive after infinity -> ok end end,
+    HA1 = spawn_link(HangAround),
+    HA2 = spawn_link(HangAround),
+    HA3 = spawn_link(HangAround),
+    S1 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 1),
+    Exit(HA1),
+    ?CHK_TERM_PROC_LIST(MustChk, 2),
+    S2 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 3),
+    S3 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 4),
+    Exit(HA2),
+    ?CHK_TERM_PROC_LIST(MustChk, 5),
+    S4 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 6),
+    Exit(HA3),
+    ?CHK_TERM_PROC_LIST(MustChk, 7),
+    ResumeProcessesProc(S1),
+    ?CHK_TERM_PROC_LIST(MustChk, 5),
+    ResumeProcessesProc(S3),
+    ?CHK_TERM_PROC_LIST(MustChk, 4),
+    ResumeProcessesProc(S4),
+    ?CHK_TERM_PROC_LIST(MustChk, 3),
+    ResumeProcessesProc(S2),
+    ?CHK_TERM_PROC_LIST(MustChk, 0),
+    Exit(S1),
+    Exit(S2),
+    Exit(S3),
+    Exit(S4),
+
+
+    HA4 = spawn_link(HangAround),
+    HA5 = spawn_link(HangAround),
+    HA6 = spawn_link(HangAround),
+    S5 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 1),
+    Exit(HA4),
+    ?CHK_TERM_PROC_LIST(MustChk, 2),
+    S6 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 3),
+    Exit(HA5),
+    ?CHK_TERM_PROC_LIST(MustChk, 4),
+    S7 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 5),
+    Exit(HA6),
+    ?CHK_TERM_PROC_LIST(MustChk, 6),
+    S8 = SpawnSuspendProcessesProc(),
+    ?CHK_TERM_PROC_LIST(MustChk, 7),
+
+    erlang:system_flag(multi_scheduling, block),
+    Exit(S8),
+    ?CHK_TERM_PROC_LIST(MustChk, 7),
+    Exit(S5),
+    ?CHK_TERM_PROC_LIST(MustChk, 6),
+    Exit(S7),
+    ?CHK_TERM_PROC_LIST(MustChk, 6),
+    Exit(S6),
+    ?CHK_TERM_PROC_LIST(MustChk, 0),
+    erlang:system_flag(multi_scheduling, unblock),
+    as_expected.
 
 
 otp_7738_waiting(doc) ->
@@ -2115,88 +2070,88 @@ otp_7738_waiting(doc) ->
 otp_7738_waiting(suite) ->
     [];
 otp_7738_waiting(Config) when is_list(Config) ->
-    ?line otp_7738_test(waiting).
+    otp_7738_test(waiting).
 
 otp_7738_suspended(doc) ->
     [];
 otp_7738_suspended(suite) ->
     [];
 otp_7738_suspended(Config) when is_list(Config) ->
-    ?line otp_7738_test(suspended).
+    otp_7738_test(suspended).
 
 otp_7738_resume(doc) ->
     [];
 otp_7738_resume(suite) ->
     [];
 otp_7738_resume(Config) when is_list(Config) ->
-    ?line otp_7738_test(resume).
+    otp_7738_test(resume).
 
 otp_7738_test(Type) ->
-    ?line T = self(),
-    ?line S = spawn_link(fun () ->
-			   receive
-			       {suspend, Suspendee} ->
-				   erlang:suspend_process(Suspendee),
-				   T ! {suspended, Suspendee},
-				   receive
-				   after 10 ->
-					   erlang:resume_process(Suspendee),
-					   Suspendee ! wake_up
-				   end;
-			       {send, To, Msg} ->
-				   receive after 10 -> ok end,
-				   To ! Msg
-			   end
-			 end),
-    ?line R = spawn_link(fun () ->
-				 X = lists:seq(1, 20000000),
-				 T ! {initialized, self()},
-				 ?line case Type of
-					   _ when Type == suspended;
-						  Type == waiting ->
-					       receive _ -> ok end;
-					   _ when Type == resume ->
-					       Receive = fun (F) ->
-								 receive
-								     _ ->
-									 ok
-								 after 0 ->
-									 F(F)
-								 end
-							 end,
-					       Receive(Receive)
-				       end,
-				 T ! {woke_up, self()},
-				 id(X)
-			 end),
-    ?line receive {initialized, R} -> ok end,
-    ?line receive after 10 -> ok end,
-    ?line case Type of
+    T = self(),
+    S = spawn_link(fun () ->
+		receive
+		    {suspend, Suspendee} ->
+			erlang:suspend_process(Suspendee),
+			T ! {suspended, Suspendee},
+			receive
+			after 10 ->
+				erlang:resume_process(Suspendee),
+				Suspendee ! wake_up
+			end;
+		    {send, To, Msg} ->
+			receive after 10 -> ok end,
+			To ! Msg
+		end
+	end),
+    R = spawn_link(fun () ->
+		X = lists:seq(1, 20000000),
+		T ! {initialized, self()},
+		case Type of
+		    _ when Type == suspended;
+		Type == waiting ->
+		    receive _ -> ok end;
+		_ when Type == resume ->
+		    Receive = fun (F) ->
+			    receive
+				_ ->
+				    ok
+			    after 0 ->
+				    F(F)
+			    end
+		    end,
+		    Receive(Receive)
+	    end,
+	    T ! {woke_up, self()},
+	    id(X)
+    end),
+    receive {initialized, R} -> ok end,
+    receive after 10 -> ok end,
+    case Type of
 	      suspended ->
-		  ?line erlang:suspend_process(R),
-		  ?line S ! {send, R, wake_up};
+		  erlang:suspend_process(R),
+		  S ! {send, R, wake_up};
 	      waiting ->
-		  ?line S ! {send, R, wake_up};
+		  S ! {send, R, wake_up};
 	      resume ->
-		  ?line S ! {suspend, R},
-		  ?line receive {suspended, R} -> ok end
+		  S ! {suspend, R},
+		  receive {suspended, R} -> ok end
 	  end,
-    ?line erlang:garbage_collect(R),
-    ?line case Type of
+    erlang:garbage_collect(R),
+    case Type of
 	      suspended ->
-		  ?line erlang:resume_process(R);
+		  erlang:resume_process(R);
 	      _ ->
-		  ?line ok
+		  ok
 	  end,
-    ?line receive
+    receive
 	      {woke_up, R} ->
-		  ?line ok
+		  ok
 	  after 2000 ->
-		  ?line I = process_info(R, [status, message_queue_len]),
-		  ?line ?t:format("~p~n", [I]),
-		  ?line ?t:fail(no_progress)
+		  I = process_info(R, [status, message_queue_len]),
+		  ?t:format("~p~n", [I]),
+		  ?t:fail(no_progress)
 	  end,
-    ?line ok.
+    ok.
 
 gor(Reds, Stop) ->
     receive
@@ -2210,28 +2165,28 @@ gor(Reds, Stop) ->
     end.
 
 garb_other_running(Config) when is_list(Config) ->
-    ?line Stop = make_ref(),
-    ?line {Pid, Mon} = spawn_monitor(fun () -> gor(0, Stop) end),
-    ?line Reds = lists:foldl(fun (_, OldReds) ->
-				     ?line erlang:garbage_collect(Pid),
-				     ?line receive after 1 -> ok end,
-				     ?line Pid ! {self(), reds},
-				     ?line receive
+    Stop = make_ref(),
+    {Pid, Mon} = spawn_monitor(fun () -> gor(0, Stop) end),
+    Reds = lists:foldl(fun (_, OldReds) ->
+				     erlang:garbage_collect(Pid),
+				     receive after 1 -> ok end,
+				     Pid ! {self(), reds},
+				     receive
 					       {reds, NewReds, Pid} ->
-						   ?line true = (NewReds > OldReds),
-						   ?line NewReds
+						   true = (NewReds > OldReds),
+						   NewReds
 					   end
 			     end,
 			     0,
 			     lists:seq(1, 10000)),
-    ?line receive after 1 -> ok end,
-    ?line Pid ! {self(), Stop},
-    ?line receive
+    receive after 1 -> ok end,
+    Pid ! {self(), Stop},
+    receive
 	      {stopped, Stop, StopReds, Pid} ->
-		  ?line true = (StopReds > Reds)
+		  true = (StopReds > Reds)
 	  end,
-    ?line receive {'DOWN', Mon, process, Pid, normal} -> ok end,
-    ?line ok.
+    receive {'DOWN', Mon, process, Pid, normal} -> ok end,
+    ok.
 
 %% Internal functions
 
@@ -2255,9 +2210,9 @@ start_node(Config) ->
     start_node(Config, "").
 
 start_node(Config, Args) when is_list(Config) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line {A, B, C} = now(),
-    ?line Name = list_to_atom(atom_to_list(?MODULE)
+    Pa = filename:dirname(code:which(?MODULE)),
+    {A, B, C} = now(),
+    Name = list_to_atom(atom_to_list(?MODULE)
 			      ++ "-"
 			      ++ atom_to_list(?config(testcase, Config))
 			      ++ "-"
@@ -2266,7 +2221,7 @@ start_node(Config, Args) when is_list(Config) ->
 			      ++ integer_to_list(B)
 			      ++ "-"
 			      ++ integer_to_list(C)),
-    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
+    ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
 
 stop_node(Node) ->
     ?t:stop_node(Node).
diff --git a/erts/emulator/test/tuple_SUITE.erl b/erts/emulator/test/tuple_SUITE.erl
index bfc3910742..a3b2764a5d 100644
--- a/erts/emulator/test/tuple_SUITE.erl
+++ b/erts/emulator/test/tuple_SUITE.erl
@@ -20,6 +20,7 @@
 -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_insert_element/1, t_delete_element/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]).
@@ -41,6 +42,7 @@ 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,
+     t_insert_element, t_delete_element,
      tuple_with_case, tuple_in_guard].
 
 groups() -> 
@@ -60,40 +62,40 @@ end_per_group(_GroupName, Config) ->
 
 
 build_and_match(Config) when is_list(Config) ->
-    ?line {} = id({}),
-    ?line {1} = id({1}),
-    ?line {1, 2} = id({1, 2}),
-    ?line {1, 2, 3} = id({1, 2, 3}),
-    ?line {1, 2, 3, 4} = id({1, 2, 3, 4}),
-    ?line {1, 2, 3, 4, 5} = id({1, 2, 3, 4, 5}),
-    ?line {1, 2, 3, 4, 5, 6} = id({1, 2, 3, 4, 5, 6}),
-    ?line {1, 2, 3, 4, 5, 6} = id({1, 2, 3, 4, 5, 6}),
-    ?line {1, 2, 3, 4, 5, 6, 7} = id({1, 2, 3, 4, 5, 6, 7}),
-    ?line {1, 2, 3, 4, 5, 6, 7, 8} = id({1, 2, 3, 4, 5, 6, 7, 8}),
+    {} = id({}),
+    {1} = id({1}),
+    {1, 2} = id({1, 2}),
+    {1, 2, 3} = id({1, 2, 3}),
+    {1, 2, 3, 4} = id({1, 2, 3, 4}),
+    {1, 2, 3, 4, 5} = id({1, 2, 3, 4, 5}),
+    {1, 2, 3, 4, 5, 6} = id({1, 2, 3, 4, 5, 6}),
+    {1, 2, 3, 4, 5, 6} = id({1, 2, 3, 4, 5, 6}),
+    {1, 2, 3, 4, 5, 6, 7} = id({1, 2, 3, 4, 5, 6, 7}),
+    {1, 2, 3, 4, 5, 6, 7, 8} = id({1, 2, 3, 4, 5, 6, 7, 8}),
     ok.
 
 %% Tests size(Tuple).
 
 t_size(Config) when is_list(Config) ->
-    ?line 0 = size({}),
-    ?line 1 = size({a}),
-    ?line 1 = size({{a}}),
-    ?line 2 = size({{a}, {b}}),
-    ?line 3 = size({1, 2, 3}),
+    0 = size({}),
+    1 = size({a}),
+    1 = size({{a}}),
+    2 = size({{a}, {b}}),
+    3 = size({1, 2, 3}),
     ok.
 
 t_tuple_size(Config) when is_list(Config) ->
-    ?line 0 = tuple_size(id({})),
-    ?line 1 = tuple_size(id({a})),
-    ?line 1 = tuple_size(id({{a}})),
-    ?line 2 = tuple_size(id({{a},{b}})),
-    ?line 3 = tuple_size(id({1,2,3})),
+    0 = tuple_size(id({})),
+    1 = tuple_size(id({a})),
+    1 = tuple_size(id({{a}})),
+    2 = tuple_size(id({{a},{b}})),
+    3 = tuple_size(id({1,2,3})),
 
     %% Error cases.
-    ?line {'EXIT',{badarg,_}} = (catch tuple_size([])),
-    ?line {'EXIT',{badarg,_}} = (catch tuple_size(<<1,2,3>>)),
-    ?line error = ludicrous_tuple_size({a,b,c}),
-    ?line error = ludicrous_tuple_size([a,b,c]),
+    {'EXIT',{badarg,_}} = (catch tuple_size([])),
+    {'EXIT',{badarg,_}} = (catch tuple_size(<<1,2,3>>)),
+    error = ludicrous_tuple_size({a,b,c}),
+    error = ludicrous_tuple_size([a,b,c]),
     ok.
 
 
@@ -104,44 +106,44 @@ ludicrous_tuple_size(_) -> error.
 %% Tests element/2.
 
 t_element(Config) when is_list(Config) ->
-    ?line a = element(1, {a}),
-    ?line a = element(1, {a, b}),
+    a = element(1, {a}),
+    a = element(1, {a, b}),
 
-    ?line List = lists:seq(1, 4096),
-    ?line Tuple = list_to_tuple(lists:seq(1, 4096)),
-    ?line get_elements(List, Tuple, 1),
+    List = lists:seq(1, 4096),
+    Tuple = list_to_tuple(lists:seq(1, 4096)),
+    get_elements(List, Tuple, 1),
 
-    ?line {'EXIT', {badarg, _}} = (catch element(0, id({a,b}))),
-    ?line {'EXIT', {badarg, _}} = (catch element(3, id({a,b}))),
-    ?line {'EXIT', {badarg, _}} = (catch element(1, id({}))),
-    ?line {'EXIT', {badarg, _}} = (catch element(1, id([a,b]))),
-    ?line {'EXIT', {badarg, _}} = (catch element(1, id(42))),
-    ?line {'EXIT', {badarg, _}} = (catch element(id(1.5), id({a,b}))),
+    {'EXIT', {badarg, _}} = (catch element(0, id({a,b}))),
+    {'EXIT', {badarg, _}} = (catch element(3, id({a,b}))),
+    {'EXIT', {badarg, _}} = (catch element(1, id({}))),
+    {'EXIT', {badarg, _}} = (catch element(1, id([a,b]))),
+    {'EXIT', {badarg, _}} = (catch element(1, id(42))),
+    {'EXIT', {badarg, _}} = (catch element(id(1.5), id({a,b}))),
 
     ok.
 
 get_elements([Element|Rest], Tuple, Pos) ->
-    ?line Element = element(Pos, Tuple),
-    ?line get_elements(Rest, Tuple, Pos+1);
+    Element = element(Pos, Tuple),
+    get_elements(Rest, Tuple, Pos+1);
 get_elements([], _Tuple, _Pos) ->
     ok.
     
 %% Tests set_element/3.
 
 t_setelement(Config) when is_list(Config) ->
-    ?line {x} = setelement(1, id({1}), x),
-    ?line {x,2} = setelement(1, id({1,2}), x),
-    ?line {1,x} = setelement(2, id({1,2}), x),
+    {x} = setelement(1, id({1}), x),
+    {x,2} = setelement(1, id({1,2}), x),
+    {1,x} = setelement(2, id({1,2}), x),
 
-    ?line Tuple = list_to_tuple(lists:duplicate(2048, x)),
-    ?line NewTuple = set_all_elements(Tuple, 1),
-    ?line NewTuple = list_to_tuple(lists:seq(1+7, 2048+7)),
+    Tuple = list_to_tuple(lists:duplicate(2048, x)),
+    NewTuple = set_all_elements(Tuple, 1),
+    NewTuple = list_to_tuple(lists:seq(1+7, 2048+7)),
 
-    ?line {'EXIT', {badarg, _}} = (catch setelement(0, {a, b}, x)),
-    ?line {'EXIT', {badarg, _}} = (catch setelement(3, {a, b}, x)),
-    ?line {'EXIT', {badarg, _}} = (catch setelement(1, {}, x)),
-    ?line {'EXIT', {badarg, _}} = (catch setelement(1, [a, b], x)),
-    ?line {'EXIT', {badarg, _}} = (catch setelement(1.5, {a, b}, x)),
+    {'EXIT', {badarg, _}} = (catch setelement(0, {a, b}, x)),
+    {'EXIT', {badarg, _}} = (catch setelement(3, {a, b}, x)),
+    {'EXIT', {badarg, _}} = (catch setelement(1, {}, x)),
+    {'EXIT', {badarg, _}} = (catch setelement(1, [a, b], x)),
+    {'EXIT', {badarg, _}} = (catch setelement(1.5, {a, b}, x)),
 
     %% Nested setelement with literals.
     AnotherTuple = id({0,0,a,b,c}),
@@ -159,52 +161,68 @@ set_all_elements(Tuple, Pos) when Pos > size(Tuple) ->
 %% Tests list_to_tuple/1.
 
 t_list_to_tuple(Config) when is_list(Config) ->
-    ?line {} = list_to_tuple([]),
-    ?line {a} = list_to_tuple([a]),
-    ?line {a, b} = list_to_tuple([a, b]),
-    ?line {a, b, c} = list_to_tuple([a, b, c]),
-    ?line {a, b, c, d} = list_to_tuple([a, b, c, d]),
-    ?line {a, b, c, d, e} = list_to_tuple([a, b, c, d, e]),
-
-    ?line Size = 4096,
-    ?line Tuple = list_to_tuple(lists:seq(1, Size)),
-    ?line Size = size(Tuple),
-
-    ?line {'EXIT', {badarg, _}} = (catch list_to_tuple(id({a,b}))),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_tuple(id([a|b]))),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_tuple(id([a|b]))),
-
+    {} = list_to_tuple([]),
+    {a} = list_to_tuple([a]),
+    {a, b} = list_to_tuple([a, b]),
+    {a, b, c} = list_to_tuple([a, b, c]),
+    {a, b, c, d} = list_to_tuple([a, b, c, d]),
+    {a, b, c, d, e} = list_to_tuple([a, b, c, d, e]),
+
+    Size  = 4096,
+    Tuple = list_to_tuple(lists:seq(1, Size)),
+    Size  = size(Tuple),
+
+    {'EXIT', {badarg, _}} = (catch list_to_tuple(id({a,b}))),
+    {'EXIT', {badarg, _}} = (catch list_to_tuple(id([a|b]))),
+    {'EXIT', {badarg, _}} = (catch list_to_tuple(id([a|b]))),
+
+    % test upper boundry, 16777215 elements
+    MaxSize  = 1 bsl 24 - 1,
+    MaxTuple = list_to_tuple(lists:seq(1, MaxSize)),
+    MaxSize  = size(MaxTuple),
+
+    {'EXIT', {badarg,_}} = (catch list_to_tuple(lists:seq(1, 1 bsl 24))),
     ok.
 
 %% Tests tuple_to_list/1.
 
 t_tuple_to_list(Config) when is_list(Config) ->
-    ?line [] = tuple_to_list({}),
-    ?line [a] = tuple_to_list({a}),
-    ?line [a, b] = tuple_to_list({a, b}),
-    ?line [a, b, c] = tuple_to_list({a, b, c}),
-    ?line [a, b, c, d] = tuple_to_list({a, b, c, d}),
-    ?line [a, b, c, d] = tuple_to_list({a, b, c, d}),
-
-    ?line Size = 4096,
-    ?line List = lists:seq(1, Size),
-    ?line Tuple = list_to_tuple(List),
-    ?line Size = size(Tuple),
-    ?line List = tuple_to_list(Tuple),
-
-    ?line {'EXIT', {badarg,_}} = (catch tuple_to_list(id(a))),
-    ?line {'EXIT', {badarg,_}} = (catch tuple_to_list(id(42))),
+    [] = tuple_to_list({}),
+    [a] = tuple_to_list({a}),
+    [a, b] = tuple_to_list({a, b}),
+    [a, b, c] = tuple_to_list({a, b, c}),
+    [a, b, c, d] = tuple_to_list({a, b, c, d}),
+    [a, b, c, d] = tuple_to_list({a, b, c, d}),
+
+    Size = 4096,
+    List = lists:seq(1, Size),
+    Tuple = list_to_tuple(List),
+    Size = size(Tuple),
+    List = tuple_to_list(Tuple),
+
+    {'EXIT', {badarg,_}} = (catch tuple_to_list(id(a))),
+    {'EXIT', {badarg,_}} = (catch tuple_to_list(id(42))),
 
     ok.
 
 %% Tests the make_tuple/2 BIF.
 t_make_tuple_2(Config) when is_list(Config) ->
-    ?line t_make_tuple1([]),
-    ?line t_make_tuple1(42),
-    ?line t_make_tuple1(a),
-    ?line t_make_tuple1({}),
-    ?line t_make_tuple1({a}),
-    ?line t_make_tuple1(erlang:make_tuple(400, [])),
+    t_make_tuple1([]),
+    t_make_tuple1(42),
+    t_make_tuple1(a),
+    t_make_tuple1({}),
+    t_make_tuple1({a}),
+    t_make_tuple1(erlang:make_tuple(400, [])),
+
+    % test upper boundry, 16777215 elements
+    t_make_tuple(1 bsl 24 - 1, a),
+    {'EXIT', {badarg,_}} = (catch erlang:make_tuple(1 bsl 24, a)),
+
+    {'EXIT', {badarg,_}} = (catch erlang:make_tuple(-1, a)),
+    % 26 bits is the total header arity room (for now)
+    {'EXIT', {badarg,_}} = (catch erlang:make_tuple(1 bsl 26 + 3, a)),
+    % bignum
+    {'EXIT', {badarg,_}} = (catch erlang:make_tuple(1 bsl 65 + 3, a)),
     ok.
 
 t_make_tuple1(Element) ->
@@ -222,29 +240,82 @@ t_make_tuple(Size, Element) ->
 
 %% Tests the erlang:make_tuple/3 BIF.
 t_make_tuple_3(Config) when is_list(Config) ->
-    ?line {} = erlang:make_tuple(0, def, []),
-    ?line {def} = erlang:make_tuple(1, def, []),
-    ?line {a} = erlang:make_tuple(1, def, [{1,a}]),
-    ?line {a,def,c,def,e} = erlang:make_tuple(5, def, [{5,e},{1,a},{3,c}]),
-    ?line {a,def,c,def,e} = erlang:make_tuple(5, def,
-					      [{1,blurf},{5,e},{3,blurf},
-					       {1,a},{3,c}]),
+    {}    = erlang:make_tuple(0, def, []),
+    {def} = erlang:make_tuple(1, def, []),
+    {a}   = erlang:make_tuple(1, def, [{1,a}]),
+
+    {a,def,c,def,e} = erlang:make_tuple(5, def, [{5,e},{1,a},{3,c}]),
+    {a,def,c,def,e} = erlang:make_tuple(5, def, [{1,blurf},{5,e},{3,blurf},{1,a},{3,c}]),
+    MaxSize  = 1 bsl 16 - 1,
+    MaxTuple = erlang:make_tuple(MaxSize, def, [{1,blurf},{5,e},{3,blurf},{1,a},{3,c}]),
+    MaxSize  = size(MaxTuple),
+
+    %% Error cases.
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(0, def, [{1,a}])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{-1,a}])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{0,a}])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{6,z}])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(a, def, [{6,z}])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{1,a}|b])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [42])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [[a,b,c]])),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, non_list)),
+    {'EXIT',{badarg,_}} = (catch erlang:make_tuple(1 bsl 24, def, [{5,e},{1,a},{3,c}])),
+
+    ok.
+
+%% Tests the erlang:insert_element/3 BIF.
+t_insert_element(Config) when is_list(Config) ->
+    {a}       = erlang:insert_element(1, {}, a),
+    {{b,b},a} = erlang:insert_element(1, {a}, {b,b}),
+    {a,b}     = erlang:insert_element(2, {a}, b),
+    [b,def|_] = tuple_to_list(erlang:insert_element(1, erlang:make_tuple(1 bsl 20, def), b)),
+    [def,b|_] = tuple_to_list(erlang:insert_element(2, erlang:make_tuple(1 bsl 20, def), b)),
+    [def,b|_] = lists:reverse(tuple_to_list(erlang:insert_element(1 bsl 20, erlang:make_tuple(1 bsl 20, def), b))),
+    [b,def|_] = lists:reverse(tuple_to_list(erlang:insert_element((1 bsl 20) + 1, erlang:make_tuple(1 bsl 20, def), b))),
+
+    %% Error cases.
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(1, [], a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(1, a, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(0, {}, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(0, {b,b,b,b,b}, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(-1, {}, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(2, {}, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(6, {b,b,b,b}, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:insert_element(1 bsl 20, {b,b,b,b}, a)),
+    ok.
+
+%% Tests the erlang:delete_element/3 BIF.
+t_delete_element(Config) when is_list(Config) ->
+    {}        = erlang:delete_element(1, {a}),
+    {{b,b},c} = erlang:delete_element(1, {a,{b,b},c}),
+    {a,b}     = erlang:delete_element(2, {a,c,b}),
+    [2,3|_]   = tuple_to_list(erlang:delete_element(1, list_to_tuple(lists:seq(1, 1 bsl 20)))),
+    [1,3|_]   = tuple_to_list(erlang:delete_element(2, list_to_tuple(lists:seq(1, 1 bsl 20)))),
+    [(1 bsl 20) - 1, (1 bsl 20) - 2 |_] = lists:reverse(tuple_to_list(erlang:delete_element(1 bsl 20, list_to_tuple(lists:seq(1, 1 bsl 20))))),
+    [(1 bsl 20), (1 bsl 20) - 2 |_] = lists:reverse(tuple_to_list(erlang:delete_element((1 bsl 20) - 1, list_to_tuple(lists:seq(1, 1 bsl 20))))),
 
     %% Error cases.
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(0, def, [{1,a}])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{-1,a}])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{0,a}])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{6,z}])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(a, def, [{6,z}])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [{1,a}|b])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [42])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, [[a,b,c]])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:make_tuple(5, def, non_list)),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(1, [])),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(1, a)),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(0, {})),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(-1, {})),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(1, {})),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(0, {b,b,b,b,b})),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(5, {b,b,b,b})),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_element(1 bsl 20, {b,c,b,b,b})),
     ok.
 
+
 %% Tests the append_element/2 BIF.
 t_append_element(Config) when is_list(Config) ->
-    t_append_element({}, 2048, 2048).
+    ok = t_append_element({}, 2048, 2048),
+
+    % test upper boundry, 16777215 elements
+    MaxSize  = 1 bsl 24 - 1,
+    MaxTuple = list_to_tuple(lists:seq(1, MaxSize)),
+    {'EXIT',{badarg,_}} = (catch erlang:append_element(MaxTuple, a)),
+    ok.
 
 t_append_element(_Tuple, 0, _High) -> ok;
 t_append_element(Tuple, N, High) ->
@@ -261,7 +332,7 @@ verify_seq([High|T], High, Lower) ->
 %% (This is known to crash earlier versions of BEAM.)
 
 tuple_with_case(Config) when is_list(Config) ->
-    ?line {reply, true} = tuple_with_case(),
+    {reply, true} = tuple_with_case(),
     ok.
 
 tuple_with_case() ->
@@ -280,21 +351,21 @@ foo() -> ignored.
 %% Test to build a tuple in a guard.
 
 tuple_in_guard(Config) when is_list(Config) ->
-    ?line Tuple1 = id({a,b}),
-    ?line Tuple2 = id({a,b,c}),
-    ?line if
-	      Tuple1 == {element(1, Tuple2),element(2, Tuple2)} ->
-		  ok;
-	      true ->
-		  ?line test_server:fail()
-	  end,
-    ?line if
-	      Tuple2 == {element(1, Tuple2),element(2, Tuple2),
-			 element(3, Tuple2)} ->
-		  ok;
-	      true ->
-		  ?line test_server:fail()
-	  end,
+    Tuple1 = id({a,b}),
+    Tuple2 = id({a,b,c}),
+    if
+	Tuple1 == {element(1, Tuple2),element(2, Tuple2)} ->
+	    ok;
+	true ->
+	    test_server:fail()
+    end,
+    if
+	Tuple2 == {element(1, Tuple2),element(2, Tuple2),
+	    element(3, Tuple2)} ->
+	    ok;
+	true ->
+	    test_server:fail()
+    end,
     ok.
 
 %% Use this function to avoid compile-time evaluation of an expression.
diff --git a/erts/emulator/zlib/zlib.mk b/erts/emulator/zlib/zlib.mk
index fa1f159fae..ff5ffa5328 100644
--- a/erts/emulator/zlib/zlib.mk
+++ b/erts/emulator/zlib/zlib.mk
@@ -63,12 +63,12 @@ endif # gcov
 
 ifeq ($(TARGET), win32)
 $(ZLIB_LIBRARY): $(ZLIB_OBJS)
-	$(AR) -out:$@ $(ZLIB_OBJS)
+	$(V_AR) -out:$@ $(ZLIB_OBJS)
 else
 $(ZLIB_LIBRARY): $(ZLIB_OBJS)
-	$(AR) $(ARFLAGS) $@ $(ZLIB_OBJS)
+	$(V_AR) $(ARFLAGS) $@ $(ZLIB_OBJS)
 	-@ ($(RANLIB) $@ || true) 2>/dev/null
 endif
 
 $(ZLIB_OBJDIR)/%.o: zlib/%.c
-	$(CC) -c $(ZLIB_CFLAGS) -o $@ $<
+	$(V_CC) -c $(ZLIB_CFLAGS) -o $@ $<
diff --git a/erts/epmd/src/Makefile.in b/erts/epmd/src/Makefile.in
index 577fc77c13..e94674e6f4 100644
--- a/erts/epmd/src/Makefile.in
+++ b/erts/epmd/src/Makefile.in
@@ -128,13 +128,13 @@ clean:
 #
 
 $(BINDIR)/$(EPMD): $(EPMD_OBJS) $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(EPMD_OBJS) $(LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(EPMD_OBJS) $(LIBS)
 
 $(OBJDIR)/%.o: %.c epmd.h epmd_int.h
-	$(CC) $(CFLAGS) $(EPMD_FLAGS) -o $@ -c $<
+	$(V_CC) $(CFLAGS) $(EPMD_FLAGS) -o $@ -c $<
 
 $(ERTS_LIB):
-	cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
+	$(make_verbose)cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index ea70946346..5c1ce51644 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -17,6 +17,7 @@
 # %CopyrightEnd%
 #
 
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 
 ERTS_LIB_TYPEMARKER=.$(TYPE)
@@ -191,7 +192,7 @@ etc:	$(ENTRY_OBJ) $(INSTALL_PROGS) $(INSTALL_LIBS) $(TEXTFILES) $(INSTALL_TOP_BI
 
 # erlexec needs the erts_internal library...
 $(ERTS_LIB):
-	cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
+	$(V_at)cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
 
 .PHONY: docs
 docs:
@@ -249,23 +250,23 @@ endif
 ifeq ($(TARGET),win32)
 
 $(BINDIR)/$(ERLEXEC): $(OBJDIR)/erlexec.o $(OBJDIR)/win_erlexec.o $(OBJDIR)/init_file.o  $(OBJDIR)/$(ERLRES_OBJ) $(ERTS_LIB)
-	$(LD) -dll $(LDFLAGS) -o $@ $(OBJDIR)/erlexec.o $(OBJDIR)/win_erlexec.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ) $(ERTS_INTERNAL_LIBS)
+	$(V_LD) -dll $(LDFLAGS) -o $@ $(OBJDIR)/erlexec.o $(OBJDIR)/win_erlexec.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ) $(ERTS_INTERNAL_LIBS)
 
 $(BINDIR)/erl@EXEEXT@: $(OBJDIR)/erl.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ)
-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/erl.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ) 
+	$(V_LD) $(LDFLAGS) -o $@ $(OBJDIR)/erl.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ) 
 
 $(BINDIR)/werl@EXEEXT@: $(OBJDIR)/werl.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ)
-	$(LD) $(LDFLAGS) -o $@  $(OBJDIR)/werl.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ) 
+	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/werl.o $(OBJDIR)/init_file.o $(OBJDIR)/$(ERLRES_OBJ) 
 
 $(BINDIR)/start_erl@EXEEXT@: $(OBJDIR)/start_erl.o 
-	$(LD) $(LDFLAGS) -o $@  $(OBJDIR)/start_erl.o
+	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/start_erl.o
 
 $(BINDIR)/Install@EXEEXT@: $(OBJDIR)/Install.o  $(OBJDIR)/init_file.o 
-	$(LD) $(LDFLAGS) -o $@  $(OBJDIR)/Install.o  $(OBJDIR)/init_file.o
+	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/Install.o  $(OBJDIR)/init_file.o
 
 # The service expects to be compiled with $(MT_FLAG) flag.
 $(BINDIR)/erlsrv@EXEEXT@: $(ERLSRV_OBJECTS)
-	$(LD) $(LDFLAGS) $(MT_FLAG) -o $@ $(ERLSRV_OBJECTS)
+	$(V_LD) $(LDFLAGS) $(MT_FLAG) -o $@ $(ERLSRV_OBJECTS)
 
 # To fix a spooky parallel make build problem on Windows there are some
 # false dependencies on the $(MC), $(RC) and .o rules. The theory behind
@@ -280,62 +281,62 @@ $(BINDIR)/erlsrv@EXEEXT@: $(ERLSRV_OBJECTS)
 LOGMESS_GENERATED = $(OBJDIR)/LOGMESS-GENERATED
 $(MC_OUTPUTS): $(LOGMESS_GENERATED)
 $(LOGMESS_GENERATED): $(WINETC)/erlsrv/erlsrv_logmess.mc
-	$(MC) -o $(OBJDIR) $(WINETC)/erlsrv/erlsrv_logmess.mc && \
+	$(V_MC) -o $(OBJDIR) $(WINETC)/erlsrv/erlsrv_logmess.mc && \
 		echo $? >$(LOGMESS_GENERATED)
 
 $(OBJDIR)/$(ERLRES_OBJ): $(WINETC)/erl.rc $(WINETC)/erlang.ico \
 		$(WINETC)/erl_icon.ico $(WINETC)/hrl_icon.ico \
 		$(WINETC)/beam_icon.ico $(LOGMESS_GENERATED)
-	$(RC) -o $@ -I$(WINETC) $(WINETC)/erl.rc
+	$(V_RC) -o $@ -I$(WINETC) $(WINETC)/erl.rc
 
 ifeq ($(USING_VC), yes)
 RC_GENERATED = $(OBJDIR)/erlsrv_logmess.res
 $(RC_GENERATED): $(OBJDIR)/erlsrv_logmess.rc $(OBJDIR)/$(ERLRES_OBJ)
-	$(RC) -o $(OBJDIR)/erlsrv_logmess.res -I$(OBJDIR) $(OBJDIR)/erlsrv_logmess.rc
+	$(V_RC) -o $(OBJDIR)/erlsrv_logmess.res -I$(OBJDIR) $(OBJDIR)/erlsrv_logmess.rc
 else
 RC_GENERATED = $(OBJDIR)/erlsrv_logmess.o
 $(RC_GENERATED): $(OBJDIR)/erlsrv_logmess.res $(OBJDIR)/$(ERLRES_OBJ)
-	$(RC) -o $(OBJDIR)/erlsrv_logmess.o -I$(OBJDIR) $(OBJDIR)/erlsrv_logmess.res
+	$(V_RC) -o $(OBJDIR)/erlsrv_logmess.o -I$(OBJDIR) $(OBJDIR)/erlsrv_logmess.res
 endif
 
 # The service expects to be compiled with $(MT_FLAG) flag.
 $(OBJDIR)/%.o: $(WINETC)/erlsrv/%.c $(ERLSRV_HEADERS) $(RC_GENERATED)
-	$(CC) $(CFLAGS) $(MT_FLAG) -o $@ -c $<
+	$(V_CC) $(CFLAGS) $(MT_FLAG) -o $@ -c $<
 
 $(OBJDIR)/erlsrv_util.o: $(WINETC)/erlsrv/erlsrv_util.c $(ERLSRV_HEADERS) \
 		$(OBJDIR)/erlsrv_logmess.h $(RC_GENERATED)
-	$(CC) $(CFLAGS) -I$(OBJDIR) $(MT_FLAG) -o $@ -c $<
+	$(V_CC) $(CFLAGS) -I$(OBJDIR) $(MT_FLAG) -o $@ -c $<
 
 $(OBJDIR)/werl.o: $(WINETC)/erl.c $(WINETC)/init_file.h $(RC_GENERATED)
-	$(CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
+	$(V_CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
 	-DWIN32_WERL -o $@ -c $(WINETC)/erl.c
 
 $(OBJDIR)/erl.o: $(WINETC)/erl.c $(WINETC)/init_file.h $(RC_GENERATED)
-	$(CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
+	$(V_CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
 	-o $@ -c $(WINETC)/erl.c
 
 $(OBJDIR)/erlexec.o: $(ERLEXECDIR)/erlexec.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
+	$(V_CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
 	-o $@ -c $(ERLEXECDIR)/erlexec.c
 
 $(OBJDIR)/win_erlexec.o: $(WINETC)/win_erlexec.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
+	$(V_CC) $(CFLAGS) -DBUILD_TYPE=\"-$(TYPE)\" -DERL_RUN_SHARED_LIB=1 \
 	-o $@ -c $(WINETC)/win_erlexec.c
 
 $(OBJDIR)/init_file.o: $(WINETC)/init_file.c $(WINETC)/init_file.h $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c $(WINETC)/init_file.c
+	$(V_CC) $(CFLAGS) -o $@ -c $(WINETC)/init_file.c
 
 $(OBJDIR)/Install.o: $(WINETC)/Install.c $(WINETC)/init_file.h $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c $(WINETC)/Install.c
+	$(V_CC) $(CFLAGS) -o $@ -c $(WINETC)/Install.c
 
 $(OBJDIR)/start_erl.o: $(WINETC)/start_erl.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c $(WINETC)/start_erl.c
+	$(V_CC) $(CFLAGS) -o $@ -c $(WINETC)/start_erl.c
 
 $(ENTRY_OBJ): $(ENTRY_SRC) $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c $(ENTRY_SRC)
+	$(V_CC) $(CFLAGS) -o $@ -c $(ENTRY_SRC)
 
 Install.ini:	../$(TARGET)/Install.src ../../vsn.mk $(TARGET)/Makefile
-	sed -e 's;%I_VSN%;$(VSN);' \
+	$(vsn_verbose)sed -e 's;%I_VSN%;$(VSN);' \
 	    -e 's;%I_SYSTEM_VSN%;$(SYSTEM_VSN);' \
           ../$(TARGET)/Install.src > Install.ini
 
@@ -348,99 +349,99 @@ endif
 #---------------------------------------------------------
 
 $(BINDIR)/heart@EXEEXT@: $(OBJDIR)/heart.o $(ENTRY_OBJ)
-	$(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/heart.o \
+	$(V_LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/heart.o \
 		$(RTLIBS) $(ENTRY_OBJ) $(WINDSOCK)
 
 $(OBJDIR)/heart.o: heart.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c heart.c
+	$(V_CC) $(CFLAGS) -o $@ -c heart.c
 
 #
 # Objects & executables
 #
 #$(OBJDIR)/%.o: %.c
-#	$(CC) $(CFLAGS) -o $@ -c $<
+#	$(V_CC) $(CFLAGS) -o $@ -c $<
 #
 #$(OBJDIR)/%.o: ../unix/%.c
-#	$(CC) $(CFLAGS) -o $@ -c $<
+#	$(V_CC) $(CFLAGS) -o $@ -c $<
 #
 #$(BINDIR)/%: $(OBJDIR)/%.o
-#	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $< $(LIBS)
+#	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $< $(LIBS)
 
 $(OBJDIR)/inet_gethost.o: inet_gethost.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c inet_gethost.c
+	$(V_CC) $(CFLAGS) -o $@ -c inet_gethost.c
 
 $(BINDIR)/inet_gethost@EXEEXT@: $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(BINDIR)/run_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o
-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(LIBS)
+	$(V_LD) $(LDFLAGS) -o $@ $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(LIBS)
 
 $(OBJDIR)/run_erl.o: ../unix/run_erl.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c
+	$(V_CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c
 
 $(BINDIR)/to_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o
-	$(LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o
+	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o
 
 $(OBJDIR)/to_erl.o: ../unix/to_erl.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c ../unix/to_erl.c
+	$(V_CC) $(CFLAGS) -o $@ -c ../unix/to_erl.c
 
 $(BINDIR)/dyn_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
-	$(LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
+	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
 
 $(OBJDIR)/dyn_erl.o: ../unix/dyn_erl.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c ../unix/dyn_erl.c
+	$(V_CC) $(CFLAGS) -o $@ -c ../unix/dyn_erl.c
 
 $(OBJDIR)/safe_string.o: ../unix/safe_string.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c ../unix/safe_string.c
+	$(V_CC) $(CFLAGS) -o $@ -c ../unix/safe_string.c
 
 ifneq ($(TARGET),win32)
 $(BINDIR)/$(ERLEXEC): $(OBJDIR)/$(ERLEXEC).o $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/$(ERLEXEC).o $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/$(ERLEXEC).o $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/$(ERLEXEC).o: $(ERLEXECDIR)/$(ERLEXEC).c $(RC_GENERATED)
-	$(CC) -I$(EMUDIR) $(CFLAGS) -o $@ -c $(ERLEXECDIR)/$(ERLEXEC).c
+	$(V_CC) -I$(EMUDIR) $(CFLAGS) -o $@ -c $(ERLEXECDIR)/$(ERLEXEC).c
 endif
 $(BINDIR)/erlc@EXEEXT@: $(OBJDIR)/erlc.o $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/erlc.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/erlc.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/erlc.o: erlc.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c erlc.c
+	$(V_CC) $(CFLAGS) -o $@ -c erlc.c
 
 $(BINDIR)/dialyzer@EXEEXT@: $(OBJDIR)/dialyzer.o $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/dialyzer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/dialyzer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/dialyzer.o: dialyzer.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c dialyzer.c
+	$(V_CC) $(CFLAGS) -o $@ -c dialyzer.c
 
 $(BINDIR)/typer@EXEEXT@: $(OBJDIR)/typer.o $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/typer.o: typer.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c typer.c
+	$(V_CC) $(CFLAGS) -o $@ -c typer.c
 
 $(BINDIR)/escript@EXEEXT@: $(OBJDIR)/escript.o $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/escript.o: escript.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c escript.c
+	$(V_CC) $(CFLAGS) -o $@ -c escript.c
 
 $(BINDIR)/ct_run@EXEEXT@: $(OBJDIR)/ct_run.o $(ERTS_LIB)
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/ct_run.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/ct_run.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/ct_run.o: ct_run.c $(RC_GENERATED)
-	$(CC) $(CFLAGS) -o $@ -c ct_run.c
+	$(V_CC) $(CFLAGS) -o $@ -c ct_run.c
 
 
 
 Install:	../unix/Install.src ../../vsn.mk $(TARGET)/Makefile
-	sed -e 's;%I_VSN%;$(VSN);' \
+	$(vsn_verbose)sed -e 's;%I_VSN%;$(VSN);' \
 	    -e 's;%EMULATOR%;$(EMULATOR);' \
             -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
 	    -e 's;%I_SYSTEM_VSN%;$(SYSTEM_VSN);' \
           ../unix/Install.src > Install
 
 erl.src: ../unix/erl.src.src ../../vsn.mk $(TARGET)/Makefile
-	sed -e 's;%EMULATOR%;$(EMULATOR);' \
+	$(vsn_verbose)sed -e 's;%EMULATOR%;$(EMULATOR);' \
             -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
             -e 's;%VSN%;$(VSN);' \
                   ../unix/erl.src.src > erl.src
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 50c61f50eb..d865164bb0 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -124,6 +124,7 @@ static char *pluss_val_switches[] = {
     "bwt",
     "cl",
     "ct",
+    "tbt",
     "wt",
     "ws",
     "ss",
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 9e80ec6656..3566406bf3 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -264,7 +264,7 @@ append_shebang_args(char* scriptname)
 	static char linebuf[LINEBUFSZ];
 	char* ptr = fgets(linebuf, LINEBUFSZ, fd);
 
-	if (ptr != NULL && linebuf[0] == '#' && linebuf[1] == '!') {
+	if (ptr != NULL) {
 	    /* Try to find args on second or third line */
 	    ptr = fgets(linebuf, LINEBUFSZ, fd);
 	    if (ptr != NULL && linebuf[0] == '%' && linebuf[1] == '%' && linebuf[2] == '!') {
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in
index aed889eaef..88083bfe7d 100644
--- a/erts/lib_src/Makefile.in
+++ b/erts/lib_src/Makefile.in
@@ -17,6 +17,7 @@
 # %CopyrightEnd%
 #
 
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 include ../include/internal/$(TARGET)/ethread.mk
 
@@ -326,6 +327,7 @@ _create_dirs := $(shell mkdir -p $(CREATE_DIRS))
 all: $(OBJ_DIR)/MADE
 
 $(OBJ_DIR)/MADE: $(ETHREAD_LIB) $(ERTS_LIBS) $(ERTS_INTERNAL_LIBS)
+	$(gen_verbose)
 ifeq ($(OMIT_OMIT_FP),yes)
 	@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
 	@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
@@ -335,7 +337,7 @@ ifeq ($(OMIT_OMIT_FP),yes)
 	@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
 	@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
 endif
-	echo  $? > $(OBJ_DIR)/MADE
+	$(V_at)echo $? > $(OBJ_DIR)/MADE
 
 #
 # The libs ...
@@ -345,93 +347,97 @@ AR_OUT=-out:
 AR_FLAGS=
 else
 AR_OUT=
+ifeq ($(V),0)
+AR_FLAGS=rc
+else
 AR_FLAGS=rcv
 endif
+endif
 
 ifndef RANLIB
 RANLIB=true
 endif
 
 $(ETHREAD_LIB): $(ETHREAD_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ETHREAD_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ETHREAD_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_INTERNAL_LIB): $(ERTS_INTERNAL_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_INTERNAL_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_INTERNAL_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_INTERNAL_r_LIB): $(ERTS_INTERNAL_r_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_INTERNAL_r_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_INTERNAL_r_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_MD_LIB): $(ERTS_MD_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MD_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MD_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_MDd_LIB): $(ERTS_MDd_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MDd_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MDd_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_MT_LIB): $(ERTS_MT_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MT_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MT_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_MTd_LIB): $(ERTS_MTd_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MTd_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_MTd_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_r_LIB): $(ERTS_r_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_r_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_r_LIB_OBJS)
+	$(V_RANLIB) $@
 
 $(ERTS_LIB): $(ERTS_LIB_OBJS)
-	$(AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_LIB_OBJS)
-	$(RANLIB) $@
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(ERTS_LIB_OBJS)
+	$(V_RANLIB) $@
 
 #
 # Object files
 #
 
 $(r_OBJ_DIR)/ethr_x86_sse2_asm.o: pthread/ethr_x86_sse2_asm.c
-	$(CC) -msse2 $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) -msse2 $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(r_OBJ_DIR)/%.o: common/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(r_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJ_DIR)/%.o: common/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 # Win32 specific
 
 $(MD_OBJ_DIR)/%.o: common/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MD $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MD $(INCLUDES) -c $< -o $@
 
 $(MD_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MD $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MD $(INCLUDES) -c $< -o $@
 
 $(MDd_OBJ_DIR)/%.o: common/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MDd $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MDd $(INCLUDES) -c $< -o $@
 
 $(MDd_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MDd $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MDd $(INCLUDES) -c $< -o $@
 
 $(MT_OBJ_DIR)/%.o: common/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MT $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MT $(INCLUDES) -c $< -o $@
 
 $(MT_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MT $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MT $(INCLUDES) -c $< -o $@
 
 $(MTd_OBJ_DIR)/%.o: common/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
 
 $(MTd_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
-	$(CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
+	$(V_CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
 
 #
 # Install
@@ -560,73 +566,74 @@ DEPEND_MK=$(OBJ_DIR)/depend.mk
 .PHONY: depend
 depend: $(DEPEND_MK)
 $(DEPEND_MK):
-	@echo "Generating dependency file $(DEPEND_MK)..."
+	$(gen_verbose)
+	$(V_colon)@echo "Generating dependency file $(DEPEND_MK)..."
 	@echo "# Generated dependency rules" > $(DEPEND_MK);
 	@echo "# " >> $(DEPEND_MK);
 ifneq ($(strip $(ETHREAD_LIB_SRC)),)
 	@echo "# ethread lib objects..." >> $(DEPEND_MK);
 ifeq ($(USING_VC),yes)
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ETHREAD_LIB_SRC) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ETHREAD_LIB_SRC) \
 		| $(SED_MD_DEPEND) >> $(DEPEND_MK)
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ETHREAD_LIB_SRC) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ETHREAD_LIB_SRC) \
 		| $(SED_MDd_DEPEND) >> $(DEPEND_MK)
 else
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ETHREAD_LIB_SRC) \
-		| $(SED_r_DEPEND) >> $(DEPEND_MK)
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ETHREAD_LIB_SRC) \
+		| $(SED_r_DEPEND) >$(V_at)> $(DEPEND_MK)
 endif
 endif
 ifneq ($(strip $(ERTS_INTERNAL_LIB_SRCS)),)
 ifneq ($(strip $(ETHREAD_LIB_SRC)),)
 	@echo "# erts_internal_r lib objects..." >> $(DEPEND_MK);
 ifeq ($(USING_VC),yes)
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_MD_DEPEND) >> $(DEPEND_MK)
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_MDd_DEPEND) >> $(DEPEND_MK)
 else
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_r_DEPEND) >> $(DEPEND_MK)
 endif
 endif
 	@echo "# erts_internal lib objects..." >> $(DEPEND_MK);
 ifeq ($(USING_VC),yes)
-	$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_MD_DEPEND) >> $(DEPEND_MK)
-	$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_MDd_DEPEND) >> $(DEPEND_MK)
 else
-	$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_DEPEND) >> $(DEPEND_MK)
 endif
 endif
 ifneq ($(strip $(ERTS_LIB_SRCS)),)
 ifeq ($(USING_VC),yes)
 	@echo "# erts_MD lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
 		| $(SED_MD_DEPEND) >> $(DEPEND_MK)
 	@echo "# erts_MDd lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
 		| $(SED_MDd_DEPEND) >> $(DEPEND_MK)
 	@echo "# erts_MT lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
 		| $(SED_MT_DEPEND) >> $(DEPEND_MK)
 	@echo "# erts_MTd lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
 		| $(SED_MTd_DEPEND) >> $(DEPEND_MK)
 	@echo "# erts_internal_r lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_MD_DEPEND) >> $(DEPEND_MK)
 	@echo "# erts_internal_r.debug lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_INTERNAL_LIB_SRCS) \
 		| $(SED_MDd_DEPEND) >> $(DEPEND_MK)
 else
 ifneq ($(strip $(ETHREAD_LIB_SRC)),)
 	@echo "# erts_r lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(THR_DEFS) $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
 		| $(SED_r_DEPEND) >> $(DEPEND_MK)
 endif
 	@echo "# erts lib objects..." >> $(DEPEND_MK);
-	$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
+	$(V_at)$(DEP_CC) -MM $(DEP_FLAGS) $(ERTS_LIB_SRCS) \
 		| $(SED_DEPEND) >> $(DEPEND_MK)
 endif
 endif
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index eb6b5259b5..344fa3ecc0 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 56ddc7087a..af7adc2d44 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index c647fa5d4e..af06c2a1cb 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 4a34268f06..9710204552 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 6fcf515461..0ba1cb8f73 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 6d6d70920e..b8f71b0c1e 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 071dbb00f5..a1aca09d1d 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 c4487cc5fa..bec1f2cc21 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 d58261a57c..1ac89dd42a 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index b409e39862..e966ac5296 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -79,6 +79,7 @@
 -export([bump_reductions/1, byte_size/1, call_on_load_function/1]).
 -export([cancel_timer/1, check_old_code/1, check_process_code/2, crc32/1]).
 -export([crc32/2, crc32_combine/3, date/0, decode_packet/3]).
+-export([delete_element/2]).
 -export([delete_module/1, demonitor/1, demonitor/2, display/1]).
 -export([display_nl/0, display_string/1, dist_exit/3, erase/0, erase/1]).
 -export([error/1, error/2, exit/1, exit/2, external_size/1]).
@@ -88,6 +89,7 @@
 -export([garbage_collect_message_area/0, get/0, get/1, get_keys/1]).
 -export([get_module_info/1, get_stacktrace/0, group_leader/0]).
 -export([group_leader/2, halt/0, halt/1, halt/2, hash/2, hibernate/3]).
+-export([insert_element/3]).
 -export([integer_to_list/1, iolist_size/1, iolist_to_binary/1]).
 -export([is_alive/0, is_builtin/3, is_process_alive/1, length/1, link/1]).
 -export([list_to_atom/1, list_to_binary/1, list_to_bitstr/1]).
@@ -529,6 +531,14 @@ date() ->
 decode_packet(_Type, _Bin, _Options) ->
     erlang:nif_error(undefined).
 
+%% delete_element/2
+-spec erlang:delete_element(Index, Tuple1) -> Tuple2 when
+      Index  :: pos_integer(),
+      Tuple1 :: tuple(),
+      Tuple2 :: tuple().
+delete_element(_Index, _Tuple1) ->
+    erlang:nif_error(undefined).
+
 %% delete_module/1
 -spec delete_module(Module) -> true | undefined when
       Module :: module().
@@ -820,6 +830,15 @@ hash(_Term, _Range) ->
 hibernate(_Module, _Function, _Args) ->
     erlang:nif_error(undefined).
 
+%% insert_element/3
+-spec erlang:insert_element(Index, Tuple1, Term) -> Tuple2 when
+      Index  :: pos_integer(),
+      Tuple1 :: tuple(),
+      Tuple2 :: tuple(),
+      Term   :: term().
+insert_element(_Index, _Tuple1, _Term) ->
+    erlang:nif_error(undefined).
+
 %% integer_to_list/1
 -spec integer_to_list(Integer) -> string() when
       Integer :: integer().
@@ -1737,7 +1756,7 @@ process_flag(_Flag, _Value) ->
       {group_leader, GroupLeader :: pid()} |
       {heap_size, Size :: non_neg_integer()} |
       {initial_call, mfa()} |
-      {links, Pids :: [pid() | port()]} |
+      {links, PidsAndPorts :: [pid() | port()]} |
       {last_calls, false | (Calls :: [mfa()])} |
       {memory, Size :: non_neg_integer()} |
       {message_que_len, MessageQueueLen :: non_neg_integer()} |
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index eafab1bae4..c412b7faf2 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -27,7 +27,7 @@
 %% Generic file contents operations
 -export([open/2, close/1, datasync/1, sync/1, advise/4, position/2, truncate/1,
 	 write/2, pwrite/2, pwrite/3, read/2, read_line/1, pread/2, pread/3,
-	 copy/3, sendfile/10]).
+	 copy/3, sendfile/10, allocate/3]).
 
 %% Specialized file operations
 -export([open/1, open/3]).
@@ -100,6 +100,7 @@
 -define(FILE_FDATASYNC,        30).
 -define(FILE_ADVISE,           31).
 -define(FILE_SENDFILE,         32).
+-define(FILE_ALLOCATE,         33).
 
 %% Driver responses
 -define(FILE_RESP_OK,          0).
@@ -293,6 +294,11 @@ advise(#file_descriptor{module = ?MODULE, data = {Port, _}},
     end.
 
 %% Returns {error, Reason} | ok.
+allocate(#file_descriptor{module = ?MODULE, data = {Port, _}}, Offset, Length) ->
+    Cmd = <<?FILE_ALLOCATE, Offset:64/signed, Length:64/signed>>,
+    drv_command(Port, Cmd).
+
+%% Returns {error, Reason} | ok.
 write(#file_descriptor{module = ?MODULE, data = {Port, _}}, Bytes) ->
     case drv_command_nt(Port, [?FILE_WRITE,erlang:dt_prepend_vm_tag_data(Bytes)],undefined) of
 	{ok, _Size} ->
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index 608679b016..3bf233cbb6 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -65,28 +65,28 @@ debug opt script: rel $(INSTALL_SCRIPTS) $(RELEASES_SRC)
 rel:	$(REL_SCRIPTS)
 
 RELEASES.src:
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(gen_verbose)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	$(ERL) -noinput +B -eval 'release_handler:create_RELEASES("%ERL_ROOT%", "$(SS_ROOT)", "$(SS_ROOT)/start_sasl.rel", []), halt()')
-	mv RELEASES RELEASES.src
+	$(V_at)mv RELEASES RELEASES.src
 
 $(SS_ROOT)/start_clean.script \
 $(SS_ROOT)/start_clean.boot:	$(SS_ROOT)/start_clean.rel
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(gen_verbose)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	$(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) +no_warn_sasl -o $(SS_ROOT) $< )
 
 $(SS_ROOT)/start_sasl.script \
 $(SS_ROOT)/start_sasl.boot:	$(SS_ROOT)/start_sasl.rel
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(gen_verbose)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	$(ERLC) $(SASL_FLAGS) $(SCRIPT_PATH) -o $(SS_ROOT) $< )
 
 $(SS_ROOT)/start_clean.rel: $(SS_ROOT)/start_clean.rel.src \
 			../vsn.mk \
 			$(LIBPATH)/kernel/vsn.mk \
 			$(LIBPATH)/stdlib/vsn.mk
-	sed -e 's;%SYS_VSN%;$(SYSTEM_VSN);' \
+	$(gen_verbose)sed -e 's;%SYS_VSN%;$(SYSTEM_VSN);' \
             -e 's;%ERTS_VSN%;$(VSN);' \
             -e 's;%KERNEL_VSN%;$(KERNEL_VSN);' \
             -e 's;%STDLIB_VSN%;$(STDLIB_VSN);' \
@@ -97,7 +97,7 @@ $(SS_ROOT)/start_sasl.rel:	$(SS_ROOT)/start_sasl.rel.src \
 			$(LIBPATH)/kernel/vsn.mk \
 			$(LIBPATH)/stdlib/vsn.mk \
 			$(LIBPATH)/sasl/vsn.mk
-	sed -e 's;%SYS_VSN%;$(SYSTEM_VSN);' \
+	$(gen_verbose)sed -e 's;%SYS_VSN%;$(SYSTEM_VSN);' \
             -e 's;%ERTS_VSN%;$(VSN);' \
             -e 's;%KERNEL_VSN%;$(KERNEL_VSN);' \
             -e 's;%STDLIB_VSN%;$(STDLIB_VSN);' \
@@ -113,7 +113,7 @@ $(SS_ROOT)/start_all_example.rel:	$(SS_ROOT)/start_all_example.rel.src \
 			$(LIBPATH)/mnesia/vsn.mk \
 			$(LIBPATH)/snmp/vsn.mk \
 			$(LIBPATH)/inets/vsn.mk
-	sed -e 's;%SYS_VSN%;$(SYSTEM_VSN);' \
+	$(gen_verbose)sed -e 's;%SYS_VSN%;$(SYSTEM_VSN);' \
             -e 's;%ERTS_VSN%;$(VSN);' \
             -e 's;%KERNEL_VSN%;$(KERNEL_VSN);' \
             -e 's;%STDLIB_VSN%;$(STDLIB_VSN);' \
@@ -126,33 +126,33 @@ $(SS_ROOT)/start_all_example.rel:	$(SS_ROOT)/start_all_example.rel.src \
 
 ## Special target used from $(ERL_TOP)/erts/Makefile.
 $(ERL_TOP)/bin/start.script:
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(gen_verbose)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	  $(ERLC) $(SCRIPT_PATH) +no_warn_sasl +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
 
 $(ERL_TOP)/bin/start_sasl.script:
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(gen_verbose)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	  $(ERLC) $(SCRIPT_PATH) +otp_build -o $@ $(SS_ROOT)/start_sasl.rel )
 
 $(ERL_TOP)/bin/start_clean.script:
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(gen_verbose)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	  $(ERLC) $(SCRIPT_PATH) +no_warn_sasl +otp_build -o $@ $(SS_ROOT)/start_clean.rel )
 
 ## Special target used from system/build/Makefile for source code release bootstrap.
 bootstrap_scripts: $(SS_ROOT)/start_clean.rel
-	$(INSTALL_DIR) $(TESTROOT)/bin
-	$(INSTALL_DIR) $(SS_TMP)
-	( cd $(SS_TMP) && \
+	$(V_at)$(INSTALL_DIR) $(TESTROOT)/bin
+	$(V_at)$(INSTALL_DIR) $(SS_TMP)
+	$(V_at)( cd $(SS_TMP) && \
 	  $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
 	    -o $(TESTROOT)/bin/start.script $(SS_ROOT)/start_clean.rel )
-	( cd $(SS_TMP) && \
+	$(V_at)( cd $(SS_TMP) && \
 	  $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
 	    -o $(TESTROOT)/bin/start_clean.script $(SS_ROOT)/start_clean.rel )
 
 clean:
-	$(RM) $(REL_SCRIPTS) $(INSTALL_SCRIPTS)
+	$(V_at)$(RM) $(REL_SCRIPTS) $(INSTALL_SCRIPTS)
 
 docs:
 
@@ -163,14 +163,14 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: script
-	$(INSTALL_DIR) "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)"
+	$(V_at)$(INSTALL_DIR) "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)"
 ifneq ($(findstring win32,$(TARGET)),win32)
-	$(INSTALL_DATA) RELEASES.src "$(RELEASE_PATH)/releases"
+	$(V_at)$(INSTALL_DATA) RELEASES.src "$(RELEASE_PATH)/releases"
 endif
-	$(INSTALL_DATA) $(INSTALL_SCRIPTS) $(REL_SCRIPTS) \
+	$(V_at)$(INSTALL_DATA) $(INSTALL_SCRIPTS) $(REL_SCRIPTS) \
 	   "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)"
-	$(INSTALL_DATA) start_clean.script "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/start.script"
-	$(INSTALL_DATA) start_clean.boot "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/start.boot"
+	$(V_at)$(INSTALL_DATA) start_clean.script "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/start.script"
+	$(V_at)$(INSTALL_DATA) start_clean.boot "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/start.boot"
 
 
 release_docs_spec:
diff --git a/erts/vsn.mk b/erts/vsn.mk
index a13326a02a..a420781e9f 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,6 @@
 # %CopyrightEnd%
 # 
 
-
 VSN = 5.10
 SYSTEM_VSN = R16B
 
diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile
index 06e61b7cc8..c42ce068b4 100644
--- a/lib/appmon/src/Makefile
+++ b/lib/appmon/src/Makefile
@@ -37,13 +37,15 @@ MODULES= \
 	appmon \
 	appmon_a \
 	appmon_dg \
-	appmon_info \
 	appmon_place \
 	appmon_txt \
 	appmon_lb \
 	process_info \
 	appmon_web
 
+#	appmon_info \  Moved to runtime tools where it belongs
+
+
 HRL_FILES= appmon_dg.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
@@ -81,10 +83,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/appmon/src/appmon.app.src b/lib/appmon/src/appmon.app.src
index 2e1aa3ef3b..aa6a08772e 100644
--- a/lib/appmon/src/appmon.app.src
+++ b/lib/appmon/src/appmon.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The 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, appmon,
  [{description, "DEVTOOLS  CXC 138 16"},
   {vsn, "%VSN%"},
-  {modules, [appmon, appmon_a, appmon_dg, appmon_info,
+  {modules, [appmon, appmon_a, appmon_dg, %% appmon_info, moved to runtime tools
 	     appmon_lb, appmon_place, appmon_txt,process_info,appmon_web]},
   {registered,[appmon, appmon_info, appmon_txt,webappmon_server,proc_info]},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index dc926947af..70238335c4 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -94,10 +94,10 @@ docs:
 
 
 $(OBJDIR)/%.o: %.c
-	$(CC) -c $(CFLAGS) -O3 -o $@ $<
+	$(V_CC) -c $(CFLAGS) -O3 -o $@ $<
 
 $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
-	$(LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
+	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index 9a9bb7ec1b..bb3c6a4f0f 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -120,9 +120,7 @@ File3.asn        </pre>
 	  <c>Options</c> is a list with options specific for the asn1
 	  compiler and options that are applied to the Erlang compiler.
 	  The latter are those that not is recognized as asn1 specific.
-	  For <em>preferred option use</em> see <seealso
-	  marker="asn1_ug#preferred option use">Preferred Option Use
-	  section in users guide</seealso>. Available options are:
+	  Available options are:
 	</p>
 	<taglist>
           <tag><c>ber | per | uper</c></tag>
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 3d66583745..03e18c565b 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -54,6 +54,7 @@ CT_MODULES= \
 	asn1ct_constructed_per \
 	asn1ct_constructed_ber_bin_v2 \
 	asn1ct_gen_ber_bin_v2 \
+	asn1ct_imm \
 	asn1ct_value \
 	asn1ct_tok \
 	asn1ct_parser2 \
@@ -135,13 +136,13 @@ info:
 # ----------------------------------------------------
 
 $(EBIN)/asn1ct.$(EMULATOR):asn1ct.erl
-	 $(ERLC) -b$(EMULATOR) -o$(EBIN) $(ERL_COMPILE_FLAGS) -Dvsn=\"$(VSN)\" $<
+	 $(V_ERLC) -b$(EMULATOR) -o$(EBIN) $(ERL_COMPILE_FLAGS) -Dvsn=\"$(VSN)\" $<
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
 # ----------------------------------------------------
@@ -163,11 +164,32 @@ release_spec: opt
 
 release_docs_spec:
 
+#
+# Dependencies
+#
 
-
-
-
-
-
-
-
+$(EBIN)/asn1_app.beam: asn1_app.erl
+$(EBIN)/asn1_db.beam: asn1_db.erl
+$(EBIN)/asn1ct.beam: asn1ct.erl asn1_records.hrl
+$(EBIN)/asn1ct_check.beam: asn1ct_check.erl asn1_records.hrl
+$(EBIN)/asn1ct_constructed_ber_bin_v2.beam: asn1ct_constructed_ber_bin_v2.erl \
+  asn1_records.hrl
+$(EBIN)/asn1ct_constructed_per.beam: asn1ct_constructed_per.erl asn1_records.hrl
+$(EBIN)/asn1ct_gen.beam: asn1ct_gen.erl asn1_records.hrl
+$(EBIN)/asn1ct_gen_ber_bin_v2.beam: asn1ct_gen_ber_bin_v2.erl asn1_records.hrl
+$(EBIN)/asn1ct_gen_per.beam: asn1ct_gen_per.erl asn1_records.hrl
+$(EBIN)/asn1ct_gen_per_rt2ct.beam: asn1ct_gen_per_rt2ct.erl asn1_records.hrl
+$(EBIN)/asn1ct_imm.beam: asn1ct_imm.erl
+$(EBIN)/asn1ct_name.beam: asn1ct_name.erl
+$(EBIN)/asn1ct_parser2.beam: asn1ct_parser2.erl asn1_records.hrl
+$(EBIN)/asn1ct_pretty_format.beam: asn1ct_pretty_format.erl
+$(EBIN)/asn1ct_table.beam: asn1ct_table.erl
+$(EBIN)/asn1ct_tok.beam: asn1ct_tok.erl
+$(EBIN)/asn1ct_value.beam: asn1ct_value.erl asn1_records.hrl
+$(EBIN)/asn1rt.beam: asn1rt.erl
+$(EBIN)/asn1rt_ber_bin.beam: asn1rt_ber_bin.erl asn1_records.hrl
+$(EBIN)/asn1rt_ber_bin_v2.beam: asn1rt_ber_bin_v2.erl
+$(EBIN)/asn1rt_check.beam: asn1rt_check.erl
+$(EBIN)/asn1rt_nif.beam: asn1rt_nif.erl
+$(EBIN)/asn1rt_per_bin_rt2ct.beam: asn1rt_per_bin_rt2ct.erl asn1_records.hrl
+$(EBIN)/asn1rt_uper_bin.beam: asn1rt_uper_bin.erl asn1_records.hrl
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 90882462ac..98877320a0 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -1288,35 +1288,35 @@ pretty2(Module,AbsFile) ->
     {ok,F} = file:open(AbsFile,[write]),
     M = asn1_db:dbget(Module,'MODULE'),
     io:format(F,"%%%%%%%%%%%%%%%%%%%   ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.defid)]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.tagdefault)]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.exports)]),
-    io:format(F,"~s\n",[asn1ct_pretty_format:term(M#module.imports)]),
-    io:format(F,"~s\n\n",[asn1ct_pretty_format:term(M#module.extensiondefault)]),
+    io:format(F,"~s.\n",[asn1ct_pretty_format:term(M#module.defid)]),
+    io:format(F,"~s.\n",[asn1ct_pretty_format:term(M#module.tagdefault)]),
+    io:format(F,"~s.\n",[asn1ct_pretty_format:term(M#module.exports)]),
+    io:format(F,"~s.\n",[asn1ct_pretty_format:term(M#module.imports)]),
+    io:format(F,"~s.\n\n",[asn1ct_pretty_format:term(M#module.extensiondefault)]),
 
     {Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets} = M#module.typeorval,
     io:format(F,"%%%%%%%%%%%%%%%%%%% TYPES in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
+    lists:foreach(fun(T)-> io:format(F,"~s.\n",
 				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
 		  end,Types),
     io:format(F,"%%%%%%%%%%%%%%%%%%% VALUES in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
+    lists:foreach(fun(T)-> io:format(F,"~s.\n",
 				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])
 		  end,Values),
     io:format(F,"%%%%%%%%%%%%%%%%%%% Parameterized Types in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
+    lists:foreach(fun(T)-> io:format(F,"~s.\n",
 				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
 		  end,ParameterizedTypes),
     io:format(F,"%%%%%%%%%%%%%%%%%%% Classes in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
+    lists:foreach(fun(T)-> io:format(F,"~s.\n",
 				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
 		  end,Classes),
     io:format(F,"%%%%%%%%%%%%%%%%%%% Objects in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
+    lists:foreach(fun(T)-> io:format(F,"~s.\n",
 				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
 		  end,Objects),
     io:format(F,"%%%%%%%%%%%%%%%%%%% Object Sets in ~p  %%%%%%%%%%%%%%%%%%%~n",[Module]),
-    lists:foreach(fun(T)-> io:format(F,"~s\n",
+    lists:foreach(fun(T)-> io:format(F,"~s.\n",
 				     [asn1ct_pretty_format:term(asn1_db:dbget(Module,T))])			   
 		  end,ObjectSets).
 start() ->
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index fe1b2e14a8..dd77085c39 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -4340,11 +4340,33 @@ permitted_alphabet_merge([C1|Rest],UorI,Acc) ->
 %% there will be no extension if the last constraint is without extension.
 %% The rootset of all constraints are considered in the "outermoust 
 %% intersection". See section 13.1.2 in Dubuisson.
-constraint_merge(_S,C=[H])when is_tuple(H) ->
+constraint_merge(St, Cs0) ->
+    Cs = constraint_merge_1(St, Cs0),
+    normalize_cs(Cs).
+
+normalize_cs([{'SingleValue',[V]}|Cs]) ->
+    [{'SingleValue',V}|normalize_cs(Cs)];
+normalize_cs([{'SingleValue',[_|_]=L0}|Cs]) ->
+    [H|T] = L = lists:usort(L0),
+    [case is_range(H, T) of
+	 false -> {'SingleValue',L};
+	 true -> {'ValueRange',{H,lists:last(T)}}
+     end|normalize_cs(Cs)];
+normalize_cs([{'ValueRange',{Sv,Sv}}|Cs]) ->
+    [{'SingleValue',Sv}|normalize_cs(Cs)];
+normalize_cs([{'ValueRange',{'MIN','MAX'}}|Cs]) ->
+    normalize_cs(Cs);
+normalize_cs(Other) -> Other.
+
+is_range(Prev, [H|T]) when Prev =:= H - 1 -> is_range(H, T);
+is_range(_, [_|_]) -> false;
+is_range(_, []) -> true.
+
+constraint_merge_1(_S, [H]=C) when is_tuple(H) ->
     C;
-constraint_merge(_S,[]) ->
+constraint_merge_1(_S, []) ->
     [];
-constraint_merge(S,C) ->
+constraint_merge_1(S, C) ->
     %% skip all extension but the last extension
     C1 = filter_extensions(C),
     %% perform all internal level intersections, intersections first
@@ -4367,17 +4389,16 @@ constraint_merge(S,C) ->
     %% get the least common size constraint
     SZs = get_constraints(C3,'SizeConstraint'),
     CombSZ = intersection_of_size(S,SZs),
-    CminusSVs=ordsets:subtract(ordsets:from_list(C3),ordsets:from_list(SVs)),
-    % CminusSVsVRs = ordsets:subtract(ordsets:from_list(CminusSVs),
-% 				    ordsets:from_list(VRs)),
-    RestC = ordsets:subtract(ordsets:from_list(CminusSVs),
-			     ordsets:from_list(SZs)),
+    RestC = ordsets:subtract(ordsets:from_list(C3),
+			     ordsets:from_list(SZs ++ VRs ++ SVs)),
     %% get the least common combined constraint. That is the union of each
-    %% deep costraint and merge of single value and value range constraints
-    NewCs = combine_constraints(S,CombSV,CombVR,CombSZ++RestC),
-    [X||X <- lists:flatten(NewCs),
-	X /= intersection,
-	X /= union].
+    %% deep constraint and merge of single value and value range constraints.
+    %% FIXME: Removing 'intersection' from the flattened list essentially
+    %% means that intersections are converted to unions!
+    Cs = combine_constraints(S, CombSV, CombVR, CombSZ++RestC),
+    [X || X <- lists:flatten(Cs),
+	  X =/= intersection,
+	  X =/= union].
 
 %% constraint_union(S,C) takes a list of constraints as input and
 %% merge them to a union. Unions are performed when two
@@ -4407,16 +4428,16 @@ constraint_union(_S,C) ->
 
 constraint_union1(S,[A={'ValueRange',_},union,B={'ValueRange',_}|Rest],Acc) ->
     AunionB = constraint_union_vr([A,B]),
-    constraint_union1(S,Rest,Acc ++ AunionB);
+    constraint_union1(S, AunionB++Rest, Acc);
 constraint_union1(S,[A={'SingleValue',_},union,B={'SingleValue',_}|Rest],Acc) ->
     AunionB = constraint_union_sv(S,[A,B]),
     constraint_union1(S,Rest,Acc ++ AunionB);
 constraint_union1(S,[A={'SingleValue',_},union,B={'ValueRange',_}|Rest],Acc) ->
     AunionB = union_sv_vr(S,A,B),
-    constraint_union1(S,Rest,Acc ++ AunionB);
+    constraint_union1(S, AunionB++Rest, Acc);
 constraint_union1(S,[A={'ValueRange',_},union,B={'SingleValue',_}|Rest],Acc) ->
     AunionB = union_sv_vr(S,B,A),
-    constraint_union1(S,Rest,Acc ++ AunionB);
+    constraint_union1(S, AunionB++Rest, Acc);
 constraint_union1(S,[union|Rest],Acc) -> %skip when unsupported constraints
     constraint_union1(S,Rest,Acc);
 constraint_union1(S,[A|Rest],Acc) ->
@@ -4449,15 +4470,8 @@ constraint_union_vr(VR) ->
 	   ({_,{A1,_B1}},{_,{A2,_B2}}) when is_integer(A1),is_integer(A2),A1<A2 -> true;
 	   ({_,{A,B1}},{_,{A,B2}}) when B1=<B2->true;
 	   (_,_)->false end,
-    % sort and remove duplicates
-    SortedVR = lists:sort(Fun,VR),
-    RemoveDup = fun([],_) ->[];
-		   ([H],_) -> [H];
-		   ([H,H|T],F) -> F([H|T],F);
-		   ([H|T],F) -> [H|F(T,F)]
-		end,
-    
-    constraint_union_vr(RemoveDup(SortedVR,RemoveDup),[]).
+    SortedVR = lists:usort(Fun,VR),
+    constraint_union_vr(SortedVR, []).
 
 constraint_union_vr([],Acc) ->
     lists:reverse(Acc);
@@ -4467,8 +4481,8 @@ constraint_union_vr([{_,{Lb,Ub2}}|Rest],[{_,{Lb,_Ub1}}|Acc]) -> %Ub2 > Ub1
     constraint_union_vr(Rest,[{'ValueRange',{Lb,Ub2}}|Acc]);
 constraint_union_vr([{_,{_,Ub}}|Rest],A=[{_,{_,Ub}}|_Acc]) ->
     constraint_union_vr(Rest,A);
-constraint_union_vr([{_,{Lb2,Ub2}}|Rest],[{_,{Lb1,Ub1}}|Acc]) when Lb2=<Ub1,
-								   Ub2>Ub1->
+constraint_union_vr([{_,{Lb2,Ub2}}|Rest], [{_,{Lb1,Ub1}}|Acc])
+  when Ub1 =< Lb2, Ub1 < Ub2 ->
     constraint_union_vr(Rest,[{'ValueRange',{Lb1,Ub2}}|Acc]);
 constraint_union_vr([{_,{_,Ub2}}|Rest],A=[{_,{_,Ub1}}|_Acc]) when Ub2=<Ub1->
     constraint_union_vr(Rest,A);
@@ -4589,9 +4603,11 @@ constraint_intersection(_S,C) ->
 
 constraint_intersection1(S,[A,intersection,B|Rest],Acc) ->
     AisecB = c_intersect(S,A,B),
-    constraint_intersection1(S,Rest,AisecB++Acc);
+    constraint_intersection1(S, AisecB++Rest, Acc);
 constraint_intersection1(S,[A|Rest],Acc) ->
     constraint_intersection1(S,Rest,[A|Acc]);
+constraint_intersection1(_, [], [C]) ->
+    C;
 constraint_intersection1(_,[],Acc) ->
     lists:reverse(Acc).
 
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index e4e0e064e8..27070be966 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -76,9 +76,7 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
     case {Optionals = optionals(to_textual_order(CompList)),CompList,
 	  is_optimized(Erule)} of
 	{[],EmptyCL,_} when EmptyCL == {[],[],[]};EmptyCL == {[],[]};EmptyCL == [] -> 
-	    emit(["%%Variable setting just to eliminate ",
-		  "compiler warning for unused vars!",nl,
-		  "_Val = ",{curr,val},",",nl]);
+	    ok;
 	{[],_,_} ->
 	    emit([{next,val}," = ",{curr,val},",",nl]);
 	{_,_,true} ->
@@ -110,7 +108,10 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 				emit([
 				      {next,val}," = case [X || X <- [",Elements,
 				      "],X =/= asn1_NOVALUE] of",nl,
-				      "[] -> ",{curr,val},";",nl,
+				      "[] -> setelement(",
+				      {asis,ExtActualGroupPos+1},",",
+				      {curr,val},",",
+				      "asn1_NOVALUE);",nl,
 				      "_ -> setelement(",{asis,ExtActualGroupPos+1},",",
 				      {curr,val},",",
 				      "{extaddgroup,", Elements,"})",nl,
@@ -219,9 +220,74 @@ gen_decode_set(Erules,Typename,D) ->
 gen_decode_sequence(Erules,Typename,D) ->
     gen_decode_constructed(Erules,Typename,D).
 
-gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
+gen_decode_constructed(Erule, Typename, #type{}=D) ->
+    Imm0 = gen_dec_constructed_imm(Erule, Typename, #type{}=D),
+    Imm = opt_imm(Imm0),
     asn1ct_name:start(),
     asn1ct_name:clear(),
+    emit_gen_dec_imm(Imm),
+    emit([".",nl,nl]).
+
+opt_imm(Imm0) ->
+    {Imm,_} = opt_imm_1(Imm0, unknown, []),
+    Imm.
+
+opt_imm_1([{imm,Imm0,F}|T], Al0, Acc) ->
+    {Imm,Al} = asn1ct_imm:optimize_alignment(Imm0, Al0),
+    opt_imm_1(T, Al, [{imm,Imm,F}|Acc]);
+opt_imm_1([ignore|T], Al, Acc) ->
+    opt_imm_1(T, Al, Acc);
+opt_imm_1([{ignore,_}=H|T], Al, Acc) ->
+    opt_imm_1(T, Al, [H|Acc]);
+opt_imm_1([{safe,ignore}|T], Al, Acc) ->
+    opt_imm_1(T, Al, Acc);
+opt_imm_1([{safe,_}=H|T], Al, Acc) ->
+    opt_imm_1(T, Al, [H|Acc]);
+opt_imm_1([{group,G0}|T], Al0, Acc) ->
+    {G,Al} = opt_imm_1(G0, Al0, []),
+    opt_imm_1(T, Al, [{group,G}|Acc]);
+opt_imm_1([Emit|T], _, Acc) when is_function(Emit, 1) ->
+    opt_imm_1(T, unknown, [Emit|Acc]);
+opt_imm_1([], Al, Acc) ->
+    {lists:reverse(Acc),Al}.
+
+emit_gen_dec_imm(L) ->
+    emit_gen_dec_imm(L, "", []).
+
+emit_gen_dec_imm([{ignore,Fun}|T], Sep, St0) ->
+    St = Fun(St0),
+    emit_gen_dec_imm(T, Sep, St);
+emit_gen_dec_imm([{group,L}|T], Sep, St0) ->
+    emit(Sep),
+    St = emit_gen_dec_imm_group(L, St0),
+    emit_gen_dec_imm(T, [com,nl], St);
+emit_gen_dec_imm([{imm,Imm,Emit}|T], Sep, St0) ->
+    emit(Sep),
+    St = Emit(Imm, St0),
+    emit_gen_dec_imm(T, [com,nl], St);
+emit_gen_dec_imm([{safe,Item}|T], Sep, St) ->
+    emit_gen_dec_imm([Item|T], Sep, St);
+emit_gen_dec_imm([Emit|T], Sep, St0) ->
+    emit(Sep),
+    St = Emit(St0),
+    emit_gen_dec_imm(T, [com,nl], St);
+emit_gen_dec_imm([], _, _) -> ok.
+
+emit_gen_dec_imm_group([H|T], St0) ->
+    St = emit_gen_dec_group_item(H, St0),
+    emit_gen_dec_imm_group(T, St);
+emit_gen_dec_imm_group([], St) -> St.
+
+emit_gen_dec_group_item({ignore,Fun}, St) ->
+    Fun(St);
+emit_gen_dec_group_item({imm,Imm,Fun}, St) ->
+    Fun(Imm, St);
+emit_gen_dec_group_item({safe,Item}, St) ->
+    emit_gen_dec_group_item(Item, St);
+emit_gen_dec_group_item(Emit, St) ->
+    Emit(St).
+
+gen_dec_constructed_imm(Erule, Typename, #type{}=D) ->
     {CompList,TableConsInfo} = 
 	case D#type.def of
 	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
@@ -231,27 +297,19 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 		{CL,TCI} % the textual order is already taken care of
 	end,
     Ext = extensible_dec(CompList),
-    MaybeComma1 = case Ext of
-		      {ext,_Pos,_NumExt} -> 
-			  gen_dec_extension_value("Bytes"),
-			  {",",nl};
-		      _ -> 
-			  ""
-		  end,
+    EmitExt = case Ext of
+		  {ext,_Pos,_NumExt} ->
+		      gen_dec_extension_value();
+		  _ -> ignore
+	      end,
     Optionals = optionals(CompList),
-    MaybeComma2 = case Optionals of
-		      [] -> MaybeComma1;
-		      _ -> 
-			  Bcurr = asn1ct_name:curr(bytes),
-			  Bnext = asn1ct_name:next(bytes),
-			  emit(MaybeComma1),
-			  GetoptCall = "} = ?RT_PER:getoptionals2(",
-			  emit({"{Opt,",{var,Bnext},GetoptCall,
-				{var,Bcurr},",",{asis,length(Optionals)},")"}),
-			  asn1ct_name:new(bytes),
-			  ", "    
-		  end,
-    {DecObjInf,UniqueFName,ValueIndex} = 
+    EmitOpt = case Optionals of
+		  [] ->
+		      ignore;
+		  [_|_] ->
+		      gen_dec_optionals(Optionals)
+	      end,
+    ObjSetInfo =
 	case TableConsInfo of
 %%	    {ObjectSet,AttrN,N,UniqueFieldName} ->%% N is index of attribute that determines constraint
 	    #simpletableattributes{objectsetname=ObjectSet,
@@ -283,13 +341,19 @@ 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)),
-    case asn1ct_name:all(term) of
-	[] -> emit(MaybeComma2); % no components at all
-	_ -> emit({com,nl})
-    end,
+    {DecObjInf,_,_} = ObjSetInfo,
+    EmitComp = gen_dec_components_call(Erule, Typename, CompList,
+				       DecObjInf, Ext, length(Optionals)),
+    EmitRest = fun({AccTerm,AccBytes}) ->
+		       gen_dec_constructed_imm_2(Typename, CompList,
+						 ObjSetInfo,
+						 AccTerm, AccBytes)
+	       end,
+    [EmitExt,EmitOpt|EmitComp++[{safe,EmitRest}]].
+
+gen_dec_constructed_imm_2(Typename, CompList,
+			  ObjSetInfo, AccTerm, AccBytes) ->
+    {_,UniqueFName,ValueIndex} = ObjSetInfo,
     case {AccTerm,AccBytes} of
 	{[],[]} ->
 	    ok;
@@ -331,8 +395,7 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 	    mkvlist(textual_order(to_encoding_order(CompList),asn1ct_name:all(term))),
 	    emit("},")
     end,
-    emit({{curr,bytes},"}"}),
-    emit({".",nl,nl}).
+    emit({{curr,bytes},"}"}).
 
 textual_order([#'ComponentType'{textual_order=undefined}|_],TermList) ->
     TermList;
@@ -514,10 +577,10 @@ gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 	    _ ->
 		""
 	end,
-    gen_decode_length(SizeConstraint,
-		      is_optimized(Erules)),
-    emit({"'dec_",asn1ct_gen:list2name(Typename),
-	      "_components'(Num, Bytes1, telltype",ObjFun,", []).",nl}),
+    {Num,Buf} = gen_decode_length(SizeConstraint, Erules),
+    emit([",",nl,
+	  "'dec_",asn1ct_gen:list2name(Typename),
+	  "_components'(",Num,", ",Buf,ObjFun,", []).",nl,nl]),
     NewComponentType =
 	case ComponentType#type.def of
 	    {'ENUMERATED',_,Component}->
@@ -526,40 +589,13 @@ gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 	end,
     gen_decode_sof_components(Erules,Typename,SeqOrSetOf,NewComponentType).
 
-%% Logic copied from asn1_per_bin_rt2ct:decode_constrained_number
-gen_decode_length({Lb,Ub},true) when Ub =< 65535, Lb >= 0 ->
-    Range = Ub - Lb + 1,
-    Call = if
-	       Range  == 1 ->
-		   "{0,Bytes}";
-	       Range  == 2 ->
-		   "?RT_PER:getbits(Bytes,1)";
-	       Range  =< 4 ->
-		   "?RT_PER:getbits(Bytes,2)";
-	       Range  =< 8 ->
-		   "?RT_PER:getbits(Bytes,3)";
-	       Range  =< 16 ->
-		   "?RT_PER:getbits(Bytes,4)";
-	       Range  =< 32 ->
-		   "?RT_PER:getbits(Bytes,5)";
-	       Range  =< 64 ->
-		   "?RT_PER:getbits(Bytes,6)";
-	       Range  =< 128 ->
-		   "?RT_PER:getbits(Bytes,7)";
-	       Range  =< 255 ->
-		   "?RT_PER:getbits(Bytes,8)";
-	       Range  =< 256 ->
-		   "?RT_PER:getoctets(Bytes,1)";
-	       Range  =< 65536 ->
-		   "?RT_PER:getoctets(Bytes,2)";
-	       true ->
-		   ["exit({not_supported,{integer_range,",Range,"}}"]
-	   end,
-    emit({nl,"{Val,Remain} = ",Call,",",nl}),
-    emit({nl,"{Num,Bytes1} = {Val+",Lb,",Remain},",nl});
-gen_decode_length(SizeConstraint,_) ->
-    emit({nl,"{Num,Bytes1} = ?RT_PER:decode_length(Bytes,",
-	  {asis,SizeConstraint},"),",nl}).
+is_aligned(per) -> true;
+is_aligned(uper) -> false.
+
+gen_decode_length(Constraint, Erule) ->
+    emit(["%% Length with constraint ",{asis,Constraint},nl]),
+    Imm = asn1ct_imm:per_dec_length(Constraint, true, is_aligned(Erule)),
+    asn1ct_imm:dec_slim_cg(Imm, "Bytes").
 
 gen_encode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
     {ObjFun,ObjFun_Var} =
@@ -611,10 +647,10 @@ gen_decode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
 		{"",""}
 	end,
     emit({"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(0, Bytes, _",ObjFun_Var,", Acc) ->",nl,
+	  "_components'(0, Bytes",ObjFun_Var,", Acc) ->",nl,
 	  indent(3),"{lists:reverse(Acc), Bytes};",nl}),
     emit({"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(Num, Bytes, _",ObjFun,", Acc) ->",nl}),
+	  "_components'(Num, Bytes",ObjFun,", Acc) ->",nl}),
     emit({indent(3),"{Term,Remain} = "}),
     Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
 						       Cont#type.def),
@@ -643,7 +679,7 @@ gen_decode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
 	    emit({"'dec_",Conttype,"'(Bytes,telltype),",nl})
     end,
     emit({indent(3),"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(Num-1, Remain, telltype",ObjFun,", [Term|Acc]).",nl}). 
+	  "_components'(Num-1, Remain",ObjFun,", [Term|Acc]).",nl}).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -714,10 +750,25 @@ extgrouppos([_|T],ActualPos,VirtualPos,Len,Acc) ->
     extgrouppos(T,ActualPos,VirtualPos,Len+1,Acc).
 
 
-
-gen_dec_extension_value(_) ->
-    emit({"{Ext,",{next,bytes},"} = ?RT_PER:getext(",{curr,bytes},")"}),
-    asn1ct_name:new(bytes).
+gen_dec_extension_value() ->
+    Imm0 = {get_bits,1,[1]},
+    E = fun(Imm, _) ->
+		emit(["{Ext,",{next,bytes},"} = "]),
+		BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		asn1ct_imm:dec_code_gen(Imm, BytesVar),
+		asn1ct_name:new(bytes)
+	end,
+    {imm,Imm0,E}.
+
+gen_dec_optionals(Optionals) ->
+    Imm0 = {get_bits,length(Optionals),[1]},
+    E = fun(Imm, _) ->
+		BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		emit(["{Opt,",{next,bytes},"} = "]),
+		asn1ct_imm:dec_code_gen(Imm, BytesVar),
+		asn1ct_name:new(bytes)
+    end,
+    {imm,Imm0,E}.
 
 gen_fixoptionals([{Pos,Def}|R]) ->
     asn1ct_name:new(fixopt),
@@ -1031,53 +1082,80 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
 	    emit("))");
 	_ -> true
     end.
-gen_dec_components_call(Erule,TopType,{Root,ExtList},MaybeComma,
+
+gen_dec_components_call(Erule, TopType, {Root,ExtList},
+			DecInfObj, Ext, NumberOfOptionals) ->
+    gen_dec_components_call(Erule,TopType,{Root,ExtList,[]},
+			    DecInfObj,Ext,NumberOfOptionals);
+gen_dec_components_call(Erule,TopType,CL={Root1,ExtList,Root2},
 			DecInfObj,Ext,NumberOfOptionals) ->
-    gen_dec_components_call(Erule,TopType,{Root,ExtList,[]},MaybeComma,DecInfObj,Ext,NumberOfOptionals);
-gen_dec_components_call(Erule,TopType,CL={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++Root2, 1, OptTable, 
-				 MaybeComma,DecInfObj,noext,[],[],
-				 NumberOfOptionals),
-    emit([",",nl,"{Extensions,",{next,bytes},"} = "]),
-    emit(["?RT_PER:getextension(Ext,",{curr,bytes},"),",nl]),
-    asn1ct_name:new(bytes),
+    Init = {ignore,fun(_) -> {[],[]} end},
+    {EmitRoot,Tpos} =
+	gen_dec_comp_calls(Root1++Root2, Erule, TopType, OptTable,
+			   DecInfObj, noext, NumberOfOptionals,
+			   1, []),
+    EmitGetExt = gen_dec_get_extension(Erule),
     {extgrouppos,ExtGroupPosLen}  = extgroup_pos_and_length(CL),
-    NewExtList = wrap_extensionAdditionGroups(ExtList,ExtGroupPosLen),
-    {_Epos,AccTermE,AccBytesE} = 
-	gen_dec_components_call1(Erule,TopType,NewExtList,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),
-    {AccTerm++AccTermE,AccBytes++AccBytesE};
-
-gen_dec_components_call(Erule,TopType,CompList,MaybeComma,DecInfObj,
-			Ext,NumberOfOptionals) ->
+    NewExtList = wrap_extensionAdditionGroups(ExtList, ExtGroupPosLen),
+    {EmitExts,_} = gen_dec_comp_calls(NewExtList, Erule, TopType, OptTable,
+				      DecInfObj, Ext, NumberOfOptionals,
+				      Tpos, []),
+    NumExtsToSkip = ext_length(ExtList),
+    Finish =
+	fun(St) ->
+		emit([{next,bytes},"= ?RT_PER:skipextensions(",{curr,bytes},",",
+		      NumExtsToSkip+1,",Extensions)"]),
+		asn1ct_name:new(bytes),
+		St
+	end,
+    [Init] ++ EmitRoot ++ [EmitGetExt|EmitExts] ++ [Finish];
+gen_dec_components_call(Erule, TopType, CompList, DecInfObj,
+			Ext, NumberOfOptionals) ->
     %% The type has no extensionmarker
     OptTable = create_optionality_table(CompList),
-    {_,AccTerm,AccBytes} =
-	gen_dec_components_call1(Erule,TopType, CompList, 1, OptTable,
-				 MaybeComma,DecInfObj,Ext,[],[],
-				 NumberOfOptionals),
-    {AccTerm,AccBytes}.
-
-
-gen_dec_components_call1(Erule,TopType,
-			 [C=#'ComponentType'{name=Cname,typespec=Type,prop=Prop,textual_order=TextPos}|Rest],
-			 Tpos,OptTable,MaybeComma,DecInfObj,Ext,AccTerm,AccBytes,NumberOfOptionals) ->
+    Init = {ignore,fun(_) -> {[],[]} end},
+    {Cs,_} = gen_dec_comp_calls(CompList, Erule, TopType, OptTable,
+				DecInfObj, Ext, NumberOfOptionals,
+				1, []),
+    [Init|Cs].
+
+gen_dec_get_extension(Erule) ->
+    Imm0 = asn1ct_imm:per_dec_extension_map(is_aligned(Erule)),
+    E = fun(Imm, St) ->
+		emit([nl,"%% Extensions",
+		      nl,
+		      "{Extensions,",{next,bytes},"} = ",
+		      "case Ext of",nl,
+		      "0 -> {<<>>,",{curr,bytes},"};",nl,
+		      "1 ->",nl]),
+		BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		{Dst,DstBuf} = asn1ct_imm:dec_slim_cg(Imm, BytesVar),
+		emit([com,nl,
+		      "{",Dst,",",DstBuf,"}",nl,
+		      "end"]),
+		asn1ct_name:new(bytes),
+		St
+	end,
+    {imm,Imm0,E}.
+
+gen_dec_comp_calls([C|Cs], Erule, TopType, OptTable, DecInfObj,
+		   Ext, NumberOfOptionals, Tpos, Acc) ->
+    L = gen_dec_comp_call(C, Erule, TopType, Tpos, OptTable, DecInfObj,
+			  Ext, NumberOfOptionals),
+    gen_dec_comp_calls(Cs, Erule, TopType, OptTable, DecInfObj,
+		       Ext, NumberOfOptionals, Tpos+1, [L|Acc]);
+gen_dec_comp_calls([], _, _, _, _, _, _, Tpos, Acc) ->
+    {lists:append(lists:reverse(Acc)),Tpos}.
+
+gen_dec_comp_call(Comp, Erule, TopType, Tpos, OptTable, DecInfObj,
+		  Ext, NumberOfOptionals) ->
+    #'ComponentType'{typespec=Type,prop=Prop,textual_order=TextPos} = Comp,
     Pos = case Ext of
 	      noext -> Tpos;
 	      {ext,Epos,_Enum} -> Tpos - Epos + 1
 	  end,
-    emit(MaybeComma),
     InnerType = 
 	case Type#type.def of
 	    #'ObjectClassFieldType'{type=InType} ->
@@ -1086,109 +1164,128 @@ gen_dec_components_call1(Erule,TopType,
 		asn1ct_gen:get_inner(Def)
 	end,
 
-    case InnerType of
-	#'Externaltypereference'{type=T} ->
-	    emit({nl,"%%  attribute number ",TextPos," with type ",
-		  T,nl});
-	IT when is_tuple(IT) ->
-	    emit({nl,"%%  attribute number ",TextPos," with type ",
-		  element(2,IT),nl});
-	_ ->
-	    emit({nl,"%% attribute number ",TextPos," with type ",
-		  InnerType,nl})
-    end,
-
-    IsMandatoryAndPredefinedTableC =
-	fun(noext,mandatory,{"got objfun through args","ObjFun"}) ->
-		true;
-	   (_,_,{"got objfun through args","ObjFun"}) ->
-		false;
-	   (_,_,_) ->
-		true
-	end,
-    case {InnerType,IsMandatoryAndPredefinedTableC(Ext,Prop,DecInfObj)} of
-%%	{typefield,_} when Ext == noext, Prop == mandatory ->
-	{{typefield,_},true}  ->
-	    %% DecInfObj /= {"got objfun through args","ObjFun"} |
-	    %% (DecInfObj == {"got objfun through args","ObjFun"} &
-	    %% Ext == noext & Prop == mandatory)
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
+    DispType = case InnerType of
+		   #'Externaltypereference'{type=T} -> T;
+		   IT when is_tuple(IT) -> element(2,IT);
+		   _ -> InnerType
+	       end,
+    Comment = fun(St) ->
+		      emit([nl,"%% attribute number ",TextPos,
+			    " with type ",DispType,nl]),
+		      St
+	      end,
+
+    Preamble =
+	case {InnerType,is_mandatory_predef_tab_c(Ext, Prop, DecInfObj)} of
+	    {{typefield,_},true}  ->
+		%% DecInfObj /= {"got objfun through args","ObjFun"} |
+		%% (DecInfObj == {"got objfun through args","ObjFun"} &
+		%% Ext == noext & Prop == mandatory)
+		fun(St) ->
+			asn1ct_name:new(term),
+			asn1ct_name:new(tmpterm),
+			emit(["{",{curr,tmpterm},", ",{next,bytes},"} = "]),
+			St
+		end;
 	%%{objectfield,_,_} when Ext == noext, Prop == mandatory ->
-	{{objectfield,_,_},true} ->
-	    asn1ct_name:new(term),
-	    asn1ct_name:new(tmpterm),
-	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
+	    {{objectfield,_,_},true} ->
+		fun(St) ->
+			asn1ct_name:new(term),
+			asn1ct_name:new(tmpterm),
+			emit(["{",{curr,tmpterm},", ",{next,bytes},"} = "]),
+			St
+		end;
 	_ ->
 	    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
-	{noext,mandatory,_} -> ok; % generate nothing
-	{noext,_,_} -> %% OPTIONAL or DEFAULT
-	    OptPos = get_optionality_pos(TextPos,OptTable),
-	    Element = io_lib:format("Opt band (1 bsl ~w)",[NumberOfOptionals - OptPos]),
-	    emit(["case ",Element," of",nl]),
-	    emit(["  _Opt",TextPos," when _Opt",TextPos," > 0 ->"]);
-	{_,_,false} -> %% extension element, not bitstring
-	    emit(["case Extensions of",nl]),
-	    emit(["  _ when size(Extensions) >= ",Pos,",element(",Pos,",Extensions) == 1 ->",nl]);
-	_ ->
-	    emit(["case Extensions of",nl]),
-	    emit(["  <<_:",Pos-1,",1:1,_/bitstring>> when bit_size(Extensions) >= ",Pos," ->",nl])
-    end,
-    put(component_type,{true,C}),
-    {TermVar,BytesVar} = gen_dec_line(Erule,TopType,Cname,Type,Tpos,DecInfObj,Ext,Prop),
-    erase(component_type),
-    case {Ext,Prop} of
-	{noext,mandatory} -> true; % generate nothing
-	{noext,_} ->
-	    emit([";",nl,"0 ->"]),
-	    emit(["{"]),
-	    gen_dec_component_no_val(Ext,Prop),
-	    emit({",",{curr,bytes},"}",nl}),
-	    emit([nl,"end"]);
-	_ ->
-	    emit([";",nl,"_  ->",nl]),
-	    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({"}"});
+		    fun(St) ->
+			    emit(["{{_,"]),
+			    emit_extaddgroupTerms(term,ExtGroupCompList1),
+			    emit(["}"]),
+			    emit([",",{next,bytes},"} = "]),
+			    St
+		    end;
 		_ ->
-		    gen_dec_component_no_val(Ext,Prop)
-	    end,
-	    emit({",",{curr,bytes},"}",nl}),
-	    emit([nl,"end"])
-    end,    
-    asn1ct_name:new(bytes),
-    case Rest of
-	[] ->
-	    {Tpos+1,AccTerm++TermVar,AccBytes++BytesVar};
-	_ ->
-	    emit({com,nl}),
-	    gen_dec_components_call1(Erule,TopType,Rest,Tpos+1,OptTable,
-				     "",DecInfObj,Ext, AccTerm++TermVar,
-				     AccBytes++BytesVar,NumberOfOptionals)
-    end;
+		    fun(St) ->
+			    asn1ct_name:new(term),
+			    emit(["{",{curr,term}]),
+			    emit([",",{next,bytes},"} = "]),
+			    St
+		    end
+	    end
+	end,
 
-gen_dec_components_call1(_,_TopType,[],Pos,_OptTable,_,_,_,AccTerm,AccBytes,_NumberOfOptionals) ->
-    {Pos,AccTerm,AccBytes}.
+    OptOrDef =
+	case {Ext,Prop} of
+	    {noext,mandatory} ->
+		ignore;
+	    {noext,_} -> %% OPTIONAL or DEFAULT
+		OptPos = get_optionality_pos(TextPos, OptTable),
+		Element = io_lib:format("Opt band (1 bsl ~w)",
+					[NumberOfOptionals - OptPos]),
+		fun(St) ->
+			emit(["case ",Element," of",nl]),
+			emit(["  _Opt",TextPos," when _Opt",TextPos," > 0 ->"]),
+			St
+		end;
+	    {{ext,_,_},_} ->			%Extension
+		fun(St) ->
+			emit(["case Extensions of",nl,
+			      "  <<_:",Pos-1,",1:1,_/bitstring>> ->",nl]),
+			St
+		end
+	end,
+    Lines = gen_dec_line_imm(Erule, TopType, Comp, Tpos, DecInfObj, Ext),
+    Postamble =
+	case {Ext,Prop} of
+	    {noext,mandatory} ->
+		ignore;
+	    {noext,_} ->
+		fun(St) ->
+			emit([";",nl,"0 ->"]),
+			emit(["{"]),
+			gen_dec_component_no_val(Ext,Prop),
+			emit({",",{curr,bytes},"}",nl}),
+			emit([nl,"end"]),
+			St
+		end;
+	    _ ->
+		fun(St) ->
+			emit([";",nl,"_  ->",nl]),
+			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"]),
+			St
+		end
+	end,
+    AdvBuffer = {ignore,fun(St) ->
+				asn1ct_name:new(bytes),
+				St
+			end},
+    [{group,[{safe,Comment},{safe,Preamble},
+	     {safe,OptOrDef}|Lines]++
+      [{safe,Postamble},{safe,AdvBuffer}]}].
+
+is_mandatory_predef_tab_c(noext, mandatory,
+			  {"got objfun through args","ObjFun"}) ->
+    true;
+is_mandatory_predef_tab_c(_, _, {"got objfun through args","ObjFun"}) ->
+    false;
+is_mandatory_predef_tab_c(_,_,_) ->
+    true.
 
 gen_dec_extaddGroup_no_val(Ext,[#'ComponentType'{prop=Prop}])->
     gen_dec_component_no_val(Ext,Prop),
@@ -1208,8 +1305,14 @@ gen_dec_component_no_val({ext,_,_},mandatory) ->
     emit({"asn1_NOVALUE"}).
     
 
-gen_dec_line(Erule,TopType,Cname,Type,Pos,DecInfObj,Ext,Prop)  ->
-    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
+gen_dec_line(Erule, TopType, Comp, Pos, DecInfObj, Ext) ->
+    Imm0 = gen_dec_line_imm(Erule, TopType, Comp, Pos, DecInfObj, Ext),
+    Init = {ignore,fun(_) -> {[],[]} end},
+    Imm = [{group,[Init|Imm0]}],
+    emit_gen_dec_imm(Imm).
+
+gen_dec_line_imm(Erule, TopType, Comp, Pos, DecInfObj, Ext) ->
+    #'ComponentType'{name=Cname,typespec=Type} = Comp,
     Atype = 
 	case Type of
 	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
@@ -1218,175 +1321,241 @@ gen_dec_line(Erule,TopType,Cname,Type,Pos,DecInfObj,Ext,Prop)  ->
 		asn1ct_gen:get_inner(Type#type.def)
 	end,
 
-    BytesVar0 = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-    BytesVar = case Ext of
-		   {ext,Ep,_} when Pos >= Ep ->
-		       emit(["begin",nl,"{TmpVal",Pos,",Trem",Pos,
-			     "}=?RT_PER:decode_open_type(",
-			     {curr,bytes},",[]),",nl,
-			     "{TmpValx",Pos,",_}="]),
-		       io_lib:format("TmpVal~p",[Pos]);
-		   _ -> BytesVar0
-	       end,
-    SaveBytes = 
-	case Atype of
-	    {typefield,_} ->
+    Pre = gen_dec_line_open_type(Erule, Ext, Pos),
+    Decode = gen_dec_line_special(Erule, Atype, TopType, Comp, DecInfObj, Ext),
+    Post =
+	fun({SaveBytes,Finish}) ->
+		{AccTerm,AccBytes} = Finish(),
+		#'ComponentType'{name=Cname} = Comp,
 		case DecInfObj of
-		    false -> % This is in a choice with typefield components
-			{Name,RestFieldNames} = 
-			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
-
-			asn1ct_name:new(tmpterm),
-			asn1ct_name:new(reason),
-			emit([indent(2),"{",{curr,tmpterm},", ",{next,bytes},
-			      "} = ?RT_PER:decode_open_type(",{curr,bytes},
-			      ", []),",nl]),
-			emit([indent(2),"case (catch ObjFun(",
-			      {asis,Name},",",{curr,tmpterm},",telltype,",
-			      {asis,RestFieldNames},")) of", nl]),
-			emit([indent(4),"{'EXIT',",{curr,reason},"} ->",nl]),
-			emit([indent(6),"exit({'Type not ",
-			      "compatible with table constraint', ",
-			      {curr,reason},"});",nl]),
-			asn1ct_name:new(tmpterm),
-			emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
-			emit([indent(6),"{",{asis,Cname},", {",{curr,tmpterm},", ",
-			      {next,bytes},"}}",nl]),
-			emit([indent(2),"end"]),
-			[];
-		    {"got objfun through args","ObjFun"} ->
-			%% this is when the generated code gots the
-			%% objfun though arguments on function
-			%% invocation.
-			if
-			    Ext == noext andalso Prop == mandatory ->
-				ok;
-			    true ->
-				asn1ct_name:new(tmpterm),
-				asn1ct_name:new(tmpbytes),
-				emit([nl,"    {",{curr,tmpterm},", ",{curr,tmpbytes},"} ="])
-			end,
-			{Name,RestFieldNames} = 
-			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
-			emit(["?RT_PER:decode_open_type(",{curr,bytes},
-			      ", []),",nl]),
-			if
-			   Ext == noext andalso Prop == mandatory -> 
-				emit([{curr,term}," =",nl,"      "]);
-			    true ->
-				emit(["     {"])
-			end,
-			emit(["case (catch ObjFun(",{asis,Name},",",
-			      {curr,tmpterm},",telltype,",
-			      {asis,RestFieldNames},")) of", nl]),
-			emit(["    {'EXIT',",{curr,reason},"} ->",nl]),
-			emit([indent(6),"exit({'Type not ",
-			      "compatible with table constraint', ",
-			      {curr,reason},"});",nl]),
-			asn1ct_name:new(tmpterm),
-			emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
-			emit([indent(6),{curr,tmpterm},nl]),
-			emit([indent(2),"end"]),
-			if
-			    Ext == noext andalso Prop == mandatory ->
-				ok;
-			    true ->
-				emit([",",nl,{curr,tmpbytes},"}"])
-			end,
-			[];
-		    _ ->
-			emit(["?RT_PER:decode_open_type(",{curr,bytes},
-			      ", [])"]),
-			RefedFieldName = 
-			    (Type#type.def)#'ObjectClassFieldType'.fieldname,
-
-			[{Cname,RefedFieldName,
-			  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-			  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-			  get_components_prop()}]
-		end;
-	    {objectfield,PrimFieldName1,PFNList} ->
-		emit(["?RT_PER:decode_open_type(",{curr,bytes},", [])"]),
-		[{Cname,{PrimFieldName1,PFNList},
-		  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-		  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-		  get_components_prop()}];
-	    _ ->
-		CurrMod = get(currmod),
-		case asn1ct_gen:type(Atype) of
-		    #'Externaltypereference'{module=CurrMod,type=EType} ->
-			emit({"'dec_",EType,"'(",BytesVar,",telltype)"});
-		    #'Externaltypereference'{module=Mod,type=EType} ->
-			emit({"'",Mod,"':'dec_",EType,"'(",BytesVar,
-			      ",telltype)"});
-		    {primitive,bif} ->
-			case Atype of
-			   {fixedtypevaluefield,_,Btype} ->
-				Ctgenmod:gen_dec_prim(Erule,Btype,
-						      BytesVar);
-			    _ ->
-				Ctgenmod:gen_dec_prim(Erule,Type,
-						      BytesVar)
-			end;
-		    'ASN1_OPEN_TYPE' ->
-			case Type#type.def of
-			    #'ObjectClassFieldType'{type=OpenType} ->
-				Ctgenmod:gen_dec_prim(Erule,#type{def=OpenType},
-						      BytesVar);
-			    _ ->
-				Ctgenmod:gen_dec_prim(Erule,Type,
-						      BytesVar)
-			end;
-		    #typereference{val=Dname} ->
-			emit({"'dec_",Dname,"'(",BytesVar,",telltype)"});
-		    {notype,_} ->
-			emit({"'dec_",Atype,"'(",BytesVar,",telltype)"});
-		    {constructed,bif} ->
-			NewTypename = [Cname|TopType],
-			case Type#type.tablecinf of
-			    [{objfun,_}|_R] ->
-				emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-				      "'(",BytesVar,", telltype, ObjFun)"});
-			    _ ->
-				emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-				      "'(",BytesVar,", telltype)"})
-			end
-		end,
-		case DecInfObj of
-		    {Cname,{_,OSet,UniqueFName,ValIndex}} ->
-			Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-			ValueMatch = value_match(ValIndex,Term),
-			{ObjSetMod,ObjSetName} =
-			    case OSet of
-				{M,O} -> {{asis,M},O};
-				_ -> {"?MODULE",OSet}
+		    {Cname,ObjSet} ->
+			ObjSetRef =
+			    case ObjSet of
+				{deep,OSName,_,_} ->
+				    OSName;
+				_ -> ObjSet
 			    end,
-			emit({",",nl,"ObjFun = ",ObjSetMod,
-			      ":'getdec_",ObjSetName,"'(",
-			      {asis,UniqueFName},", ",ValueMatch,")"});
+			{AccTerm++[{ObjSetRef,Cname,
+				    asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
+			 AccBytes++SaveBytes};
 		    _ ->
-			ok
-		end,
-		[]
+			{AccTerm,AccBytes++SaveBytes}
+		end
 	end,
-    case Ext of 
-	{ext,Ep2,_} when Pos >= Ep2 ->
-	    emit([", {TmpValx",Pos,",Trem",Pos,"}",nl,"end"]);
-	_ -> true
-    end,
-    %% Prepare return value
+    [Pre,Decode,{safe,Post}].
+
+gen_dec_line_open_type(Erule, {ext,Ep,_}, Pos) when Pos >= Ep ->
+    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
+    {safe,fun(St) ->
+		  emit(["begin",nl]),
+		  BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		  {Dst,DstBuf} = asn1ct_imm:dec_slim_cg(Imm, BytesVar),
+		  emit([",",nl,"{TmpValx",Pos,",_} = "]),
+		  {Dst,
+		   fun() ->
+			   emit([",",nl,
+				 "{TmpValx",Pos,",",DstBuf,"}",nl,
+				 "end"]),
+			   St
+		   end}
+	  end};
+gen_dec_line_open_type(_, _, _) ->
+    {safe,fun(St) ->
+		  {asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		   fun() -> St end}
+	  end}.
+
+gen_dec_line_special(Erule, {typefield,_}, _TopType, Comp,
+		     DecInfObj, Ext) ->
+    #'ComponentType'{name=Cname,typespec=Type,prop=Prop} = Comp,
+    fun({_BytesVar,PrevSt}) ->
+	    case DecInfObj of
+		false -> % This is in a choice with typefield components
+		    {Name,RestFieldNames} =
+			(Type#type.def)#'ObjectClassFieldType'.fieldname,
+
+		    asn1ct_name:new(reason),
+		    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
+		    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		    {TmpTerm,TempBuf} = asn1ct_imm:dec_slim_cg(Imm, BytesVar),
+		    emit([com,nl,
+			  {next,bytes}," = ",TempBuf,com,nl,
+			  indent(2),"case (catch ObjFun(",
+			  {asis,Name},",",TmpTerm,",telltype,",
+			  {asis,RestFieldNames},")) of", nl]),
+		    emit([indent(4),"{'EXIT',",{curr,reason},"} ->",nl]),
+		    emit([indent(6),"exit({'Type not ",
+			  "compatible with table constraint', ",
+			  {curr,reason},"});",nl]),
+		    asn1ct_name:new(tmpterm),
+		    emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
+		    emit([indent(6),"{",{asis,Cname},", {",{curr,tmpterm},", ",
+			  {next,bytes},"}}",nl]),
+		    emit([indent(2),"end"]),
+		    {[],PrevSt};
+		{"got objfun through args","ObjFun"} ->
+		    %% this is when the generated code gots the
+		    %% objfun though arguments on function
+		    %% invocation.
+		    if
+			Ext == noext andalso Prop == mandatory ->
+			    ok;
+			true ->
+			    asn1ct_name:new(tmpterm),
+			    asn1ct_name:new(tmpbytes),
+			    emit([nl,"    {",{curr,tmpterm},", ",{curr,tmpbytes},"} ="])
+		    end,
+		    {Name,RestFieldNames} =
+			(Type#type.def)#'ObjectClassFieldType'.fieldname,
+		    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
+		    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		    asn1ct_imm:dec_code_gen(Imm, BytesVar),
+		    emit([com,nl]),
+		    if
+			Ext == noext andalso Prop == mandatory ->
+			    emit([{curr,term}," =",nl,"      "]);
+			true ->
+			    emit(["     {"])
+		    end,
+		    emit(["case (catch ObjFun(",{asis,Name},",",
+			  {curr,tmpterm},",telltype,",
+			  {asis,RestFieldNames},")) of", nl]),
+		    emit(["    {'EXIT',",{curr,reason},"} ->",nl]),
+		    emit([indent(6),"exit({'Type not ",
+			  "compatible with table constraint', ",
+			  {curr,reason},"});",nl]),
+		    asn1ct_name:new(tmpterm),
+		    emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
+		    emit([indent(6),{curr,tmpterm},nl]),
+		    emit([indent(2),"end"]),
+		    if
+			Ext == noext andalso Prop == mandatory ->
+			    ok;
+			true ->
+			    emit([",",nl,{curr,tmpbytes},"}"])
+		    end,
+		    {[],PrevSt};
+		_ ->
+		    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
+		    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+		    asn1ct_imm:dec_code_gen(Imm, BytesVar),
+		    RefedFieldName =
+			(Type#type.def)#'ObjectClassFieldType'.fieldname,
+
+		    {[{Cname,RefedFieldName,
+		       asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+		       asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
+		       Prop}],PrevSt}
+	    end
+    end;
+gen_dec_line_special(Erule, {objectfield,PrimFieldName1,PFNList}, _TopType,
+		     Comp, _DecInfObj, _Ext) ->
+    fun({_BytesVar,PrevSt}) ->
+	    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
+	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+	    asn1ct_imm:dec_code_gen(Imm, BytesVar),
+	    #'ComponentType'{name=Cname,prop=Prop} = Comp,
+	    SaveBytes = [{Cname,{PrimFieldName1,PFNList},
+			  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+			  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
+			  Prop}],
+	    {SaveBytes,PrevSt}
+    end;
+gen_dec_line_special(Erule, Atype, TopType, Comp, DecInfObj, _Ext) ->
+    case gen_dec_line_other(Erule, Atype, TopType, Comp) of
+	Fun when is_function(Fun, 1) ->
+	    fun({BytesVar,PrevSt}) ->
+		    Fun(BytesVar),
+		    gen_dec_line_dec_inf(Comp, DecInfObj),
+		    {[],PrevSt}
+	    end;
+	Imm0 ->
+	    {imm,Imm0,
+	     fun(Imm, {BytesVar,PrevSt}) ->
+		     asn1ct_imm:dec_code_gen(Imm, BytesVar),
+		     gen_dec_line_dec_inf(Comp, DecInfObj),
+		     {[],PrevSt}
+	     end}
+    end.
+
+gen_dec_line_dec_inf(Comp, DecInfObj) ->
+    #'ComponentType'{name=Cname} = Comp,
     case DecInfObj of
-	{Cname,ObjSet} ->
-	    ObjSetRef =
-		case ObjSet of
-		    {deep,OSName,_,_} ->
-			OSName;
-		    _ -> ObjSet
+	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
+	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+	    ValueMatch = value_match(ValIndex,Term),
+	    {ObjSetMod,ObjSetName} =
+		case OSet of
+		    {M,O} -> {{asis,M},O};
+		    _ -> {"?MODULE",OSet}
 		end,
-	    {[{ObjSetRef,Cname,asn1ct_gen:mk_var(asn1ct_name:curr(term))}],
-	     SaveBytes};
+	    emit({",",nl,"ObjFun = ",ObjSetMod,
+		  ":'getdec_",ObjSetName,"'(",
+		  {asis,UniqueFName},", ",ValueMatch,")"});
 	_ ->
-	    {[],SaveBytes}
+	    ok
+    end.
+
+gen_dec_line_other(Erule, Atype, TopType, Comp) ->
+    #'ComponentType'{name=Cname,typespec=Type} = Comp,
+    CurrMod = get(currmod),
+    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
+    case asn1ct_gen:type(Atype) of
+	#'Externaltypereference'{module=CurrMod,type=EType} ->
+	    fun(BytesVar) ->
+		    emit({"'dec_",EType,"'(",BytesVar,",telltype)"})
+	    end;
+	#'Externaltypereference'{module=Mod,type=EType} ->
+	    fun(BytesVar) ->
+		    emit({"'",Mod,"':'dec_",EType,"'(",BytesVar,
+			  ",telltype)"})
+	    end;
+	{primitive,bif} ->
+	    case Atype of
+		{fixedtypevaluefield,_,Btype} ->
+		    gen_dec_prim(Ctgenmod, Erule, Btype);
+		_ ->
+		    gen_dec_prim(Ctgenmod, Erule, Type)
+	    end;
+	'ASN1_OPEN_TYPE' ->
+	    case Type#type.def of
+		#'ObjectClassFieldType'{type=OpenType} ->
+		    gen_dec_prim(Ctgenmod, Erule, #type{def=OpenType});
+		_ ->
+		    gen_dec_prim(Ctgenmod, Erule, Type)
+	    end;
+	#typereference{val=Dname} ->
+	    fun(BytesVar) ->
+		    emit({"'dec_",Dname,"'(",BytesVar,",telltype)"})
+	    end;
+	{notype,_} ->
+	    fun(BytesVar) ->
+		    emit({"'dec_",Atype,"'(",BytesVar,",telltype)"})
+	    end;
+	{constructed,bif} ->
+	    NewTypename = [Cname|TopType],
+	    case Type#type.tablecinf of
+		[{objfun,_}|_R] ->
+		    fun(BytesVar) ->
+			    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
+				  "'(",BytesVar,", telltype, ObjFun)"})
+		    end;
+		_ ->
+		    fun(BytesVar) ->
+			    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
+				  "'(",BytesVar,", telltype)"})
+		    end
+	    end
+    end.
+
+gen_dec_prim(Ctgenmod, Erule, Type) ->
+    case asn1ct_gen_per:gen_dec_imm(Erule, Type) of
+	no ->
+	    fun(BytesVar) ->
+		    Ctgenmod:gen_dec_prim(Erule, Type, BytesVar)
+	    end;
+	Imm ->
+	    Imm
     end.
 
 gen_enc_choice(Erule,TopType,CompList,Ext) ->
@@ -1507,20 +1676,15 @@ gen_dec_choice1(Erule,TopType,CompList,{ext,ExtPos,ExtNum}) ->
 	  length(CompList)-ExtNum,",Ext ),",nl}),
     emit({"{Cname,{Val,NewBytes}} = case Choice + Ext*",ExtPos-1," of",nl}),
     gen_dec_choice2(Erule,TopType,CompList,{ext,ExtPos,ExtNum}),
-    case Erule of
-	per ->
-	    emit([";",nl,"_ -> {asn1_ExtAlt,",nl,
-		  "      fun() -> ",nl,
-		  "          {XTerm,XBytes} = ?RT_PER:decode_open_type(",
-		  {curr,bytes},",[]),",nl,
-		  "          {binary_to_list(XTerm),XBytes}",nl,
-		  "      end()}"]);
-	_ ->
-	    emit([";",nl,"_ -> {asn1_ExtAlt, ?RT_PER:decode_open_type(",
-		  {curr,bytes},",[])}"])
-    end,
-    emit({nl,"end,",nl}),
-    emit({nl,"{{Cname,Val},NewBytes}"}).
+    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
+    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
+    emit([";",nl,
+	  "_ ->",nl]),
+    {TmpTerm,TmpBuf} = asn1ct_imm:dec_slim_cg(Imm, BytesVar),
+    emit([com,nl,
+	  "{asn1_ExtAlt,{",TmpTerm,com,TmpBuf,"}}",nl,
+	  "end,",nl,nl,
+	  "{{Cname,Val},NewBytes}"]).
 
 
 gen_dec_choice2(Erule,TopType,L,Ext) ->
@@ -1640,18 +1804,12 @@ wrap_extensionAdditionGroups([],_,Acc,_,_) ->
     lists:reverse(Acc).
 
 
-wrap_gen_dec_line(Erule,C,TopType,Cname,Type,Pos,DIO,Ext) ->
+wrap_gen_dec_line(Erule,C,TopType,_Cname,_Type,Pos,DIO,Ext) ->
     put(component_type,{true,C}),
-    gen_dec_line(Erule,TopType,Cname,Type,Pos,DIO,Ext,mandatory),
+    gen_dec_line(Erule, TopType, C#'ComponentType'{prop=mandatory},
+		 Pos, DIO, Ext),
     erase(component_type).
 
-get_components_prop() ->
-    case get(component_type) of
-	undefined ->
-	    mandatory;
-	{true,#'ComponentType'{prop=Prop}} -> Prop
-    end.
-
 			  
 value_match(Index,Value) when is_atom(Value) ->
     value_match(Index,atom_to_list(Value));
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index b0990e92cf..57b12ce186 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1405,7 +1405,7 @@ gen_head(Erules,Mod,Hrl) ->
     emit({"%% Purpose: encoder and decoder to the types in mod ",Mod,nl,nl}),
     emit({"-module('",Mod,"').",nl}),
     put(currmod,Mod),
-    %emit({"-compile(export_all).",nl}),
+    emit({"-compile(nowarn_unused_vars).",nl}),
     case {Hrl,lists:member(inline,get(encoding_options))} of
 	{0,_} -> true;
 	{_,true} -> true;
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index 00c3dd98b2..664dfc2086 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -114,16 +114,6 @@ gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
 		_ -> % embedded type with constructed name
 		    true
 	    end,
-	    case lists:member(InnerType,['SET','SEQUENCE']) of
-		true -> 
-		    true;
-		_ ->
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}, TagIn",ObjFun,") ->",nl]),
-		    emit(["   'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn",ObjFun,");",nl,nl])
-	    end,
 	    emit(["'enc_",asn1ct_gen:list2name(Typename),
 		  "'(Val, TagIn",ObjFun,") ->",nl,"   "]),
 	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
@@ -157,15 +147,6 @@ gen_encode_user(Erules,D) when is_record(D,typedef) ->
 	  "'(Val",") ->",nl]),
     emit(["    'enc_",asn1ct_gen:list2name(Typename),
 	  "'(Val, ", {asis,lists:reverse(Tag)},").",nl,nl]),
-
-    case lists:member(InnerType,['SET','SEQUENCE']) of
-	true -> 
-	    true;
-	_ ->
-	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
-	    emit({"   'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn);",nl,nl})
-    end,
     emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val, TagIn) ->",nl}),
     CurrentMod = get(currmod),
     case asn1ct_gen:type(InnerType) of
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 3e100fc833..af19edb908 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -25,6 +25,7 @@
 -include("asn1_records.hrl").
 %-compile(export_all).
 
+-export([gen_dec_imm/2]).
 -export([pgen/4,gen_dec_prim/3,gen_encode_prim/4]).
 -export([gen_obj_code/3,gen_objectset_code/2]).
 -export([gen_decode/2, gen_decode/3]).
@@ -78,18 +79,6 @@ gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
 	end,
     case asn1ct_gen:type(InnerType) of
 	{constructed,bif} ->
-	    case InnerType of
-		'SET' ->
-		    true;
-		'SEQUENCE' ->
-		    true;
-		_ ->
-		    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}",ObjFun,") ->",nl}),
-		    emit({"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val",ObjFun,");",nl,nl})
-	    end,
 	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val",ObjFun,
 		  ") ->",nl}),
 	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
@@ -146,10 +135,12 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
     case D#type.def of
 	'INTEGER' ->
 	    emit({"?RT_PER:encode_integer(", %fel
-		  {asis,effective_constraint(integer,Constraint)},",",Value,")"});
+		  {asis,asn1ct_imm:effective_constraint(integer,Constraint)},
+		  ",",Value,")"});
 	{'INTEGER',NamedNumberList} ->
 	    emit({"?RT_PER:encode_integer(",
-		  {asis,effective_constraint(integer,Constraint)},",",Value,",",
+		  {asis,asn1ct_imm:effective_constraint(integer,Constraint)},
+		  ",",Value,",",
 		  {asis,NamedNumberList},")"});
 	{'ENUMERATED',{Nlist1,Nlist2}} ->
 	    NewList = lists:concat([[{0,X}||{X,_} <- Nlist1],['EXT_MARK'],[{1,X}||{X,_} <- Nlist2]]),
@@ -184,7 +175,7 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 		  {asis,Constraint},",",Value,",",
 		  {asis,NamedNumberList},")"});
 	'NULL' ->
-	    emit({"?RT_PER:encode_null(",Value,")"});
+	    emit("[]");
 	'OBJECT IDENTIFIER' ->
 	    emit({"?RT_PER:encode_object_identifier(",Value,")"});
 	'RELATIVE-OID' ->
@@ -295,107 +286,16 @@ emit_enc_enumerated_case(_Per,C, {0,EnumName}, Count) ->
 emit_enc_enumerated_case(_Erule, C, EnumName, Count) ->
     emit(["'",EnumName,"' -> ?RT_PER:encode_integer(",{asis,C},", ",Count,")"]).
 
-%% effective_constraint(Type,C)
-%% Type = atom()
-%% C = [C1,...]
-%% C1 = {'SingleValue',SV} | {'ValueRange',VR} | {atom(),term()}
-%% SV = integer() | [integer(),...]
-%% VR = {Lb,Ub}
-%% Lb = 'MIN' | integer()
-%% Ub = 'MAX' | integer()
-%% Returns a single value if C only has a single value constraint, and no
-%% value range constraints, that constrains to a single value, otherwise 
-%% returns a value range that has the lower bound set to the lowest value 
-%% of all single values and lower bound values in C and the upper bound to
-%% the greatest value.
-effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
-    [C]; %% [C|effective_constraint(integer,Rest)]; XXX what is possible ???
-effective_constraint(integer,C) ->
-    SVs = get_constraints(C,'SingleValue'),
-    SV = effective_constr('SingleValue',SVs),
-    VRs = get_constraints(C,'ValueRange'),
-    VR = effective_constr('ValueRange',VRs),
-    greatest_common_range(SV,VR).
-
-effective_constr(_,[]) ->
-    [];
-effective_constr('SingleValue',List) ->
-    SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    %% Sort and remove duplicates before generating SingleValue or ValueRange
-    %% In case of ValueRange, also check for 'MIN and 'MAX'
-    case lists:usort(SVList) of
-	[N] ->
-	    [{'SingleValue',N}];
-	L when is_list(L) ->
-	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
-    end;
-effective_constr('ValueRange',List) ->
-    LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
-    UBs = lists:map(fun({_,{_,Ub}})-> Ub end,List),
-    Lb = least_Lb(LBs),
-    [{'ValueRange',{Lb,lists:max(UBs)}}].
-
-greatest_common_range([],VR) ->
-    VR;
-greatest_common_range(SV,[]) ->
-    SV;
-greatest_common_range(SV,VR) ->
-    greatest_common_range2(mk_vr(SV),mk_vr(VR)).
-greatest_common_range2({_,Int},{'MIN',Ub}) when is_integer(Int),
-						       Int > Ub ->
-    [{'ValueRange',{'MIN',Int}}];
-greatest_common_range2({_,Int},{Lb,Ub}) when is_integer(Int),
-						    Int < Lb ->
-    [{'ValueRange',{Int,Ub}}];
-greatest_common_range2({_,Int},VR={_Lb,_Ub}) when is_integer(Int) ->
-    [{'ValueRange',VR}];
-greatest_common_range2({_,L},{Lb,Ub}) when is_list(L) ->
-    Min = least_Lb([Lb|L]),
-    Max = greatest_Ub([Ub|L]),
-    [{'ValueRange',{Min,Max}}];
-greatest_common_range2({Lb1,Ub1},{Lb2,Ub2}) ->
-    Min = least_Lb([Lb1,Lb2]),
-    Max = greatest_Ub([Ub1,Ub2]),
-    [{'ValueRange',{Min,Max}}].
-
-mk_vr([{Type,I}]) when is_atom(Type), is_integer(I) ->
-    {I,I};
-mk_vr([{Type,{Lb,Ub}}]) when is_atom(Type) ->
-    {Lb,Ub};
-mk_vr(Other) ->
-    Other.
-
-least_Lb(L) ->
-    case lists:member('MIN',L) of
-	true -> 'MIN';
-	_ -> lists:min(L)
-    end.
-
-greatest_Ub(L) ->
-    case lists:member('MAX',L) of
-	true -> 'MAX';
-	_ -> lists:max(L)
-    end.
-
-
-get_constraints(L=[{Key,_}],Key) ->
-    L;
-get_constraints([],_) ->
-    [];
-get_constraints(C,Key) ->
-    {value,L} = keysearch_allwithkey(Key,1,C,[]),
-    L.
-
-keysearch_allwithkey(Key,Ix,C,Acc) ->
-    case lists:keysearch(Key,Ix,C) of
-	false ->
-	    {value,Acc};
-	{value,T} ->
-	    RestC = lists:delete(T,C),
-	    keysearch_allwithkey(Key,Ix,RestC,[T|Acc])
+get_constraint([{Key,V}], Key) ->
+    V;
+get_constraint([], _) ->
+    no;
+get_constraint(C, Key) ->
+    case lists:keyfind(Key, 1, C) of
+	false -> no;
+	{Key,V} -> V
     end.
 
-
 %% Object code generating for encoding and decoding
 %% ------------------------------------------------
 
@@ -1031,7 +931,6 @@ gen_objset_dec(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
 	      _NthObj) ->
     emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
     emit({indent(3),"fun(Attr1, Bytes, _,_) ->",nl}),
-%%    emit({indent(6),"?RT_PER:decode_open_type(Bytes,[])",nl}),
     emit({indent(6),"{Bytes,Attr1}",nl}),
     emit({indent(3),"end.",nl,nl}),
     ok;
@@ -1047,76 +946,42 @@ emit_default_getdec(ObjSetName,UniqueName) ->
     emit([indent(2), "fun(C,V,_,_) -> exit({{component,C},{value,V},{unique_name_and_value,",{asis,UniqueName},",ErrV}}) end"]).
 
 
-gen_inlined_dec_funs(Fields,[{typefield,Name,_}|Rest],
-		    ObjSetName,NthObj) ->
-    CurrMod = get(currmod),
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when is_record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when is_record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,#'Externaltypereference'{module=CurrMod,type=T}}} ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    emit([indent(12),"'dec_",T,"'(Val, telltype)"]),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-	{value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    emit([indent(12),"'",M,"':'dec_",T,"'(Val, telltype)"]),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-	false ->
-	    emit([indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl,
-		  indent(9),{asis,Name}," ->{Val,Type}"]),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,[],_,NthObj) ->
+gen_inlined_dec_funs(Fields, List, ObjSetName, NthObj0) ->
+    emit([indent(3),"fun(Type, Val, _, _) ->",nl,
+	  indent(6),"case Type of",nl]),
+    NthObj = gen_inlined_dec_funs1(Fields, List, ObjSetName, "", NthObj0),
+    emit([nl,indent(6),"end",nl,
+	  indent(3),"end"]),
     NthObj.
 
-gen_inlined_dec_funs1(Fields,[{typefield,Name,_}|Rest],
-		      ObjSetName,NthObj) ->
+gen_inlined_dec_funs1(Fields, [{typefield,Name,_}|Rest],
+		      ObjSetName, Sep0, NthObj) ->
     CurrentMod = get(currmod),
     InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=case lists:keysearch(Name,1,Fields) of
-	  {value,{_,Type}} when is_record(Type,type) ->
-	      emit({";",nl}),
-	      emit_inner_of_decfun(Type,InternalDefFunName);
-	  {value,{_,Type}} when is_record(Type,typedef) ->
-	      emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-	      emit_inner_of_decfun(Type,InternalDefFunName);
-	  {value,{_,#'Externaltypereference'{module=CurrentMod,type=T}}} ->
-	      emit([";",nl,indent(9),{asis,Name}," ->",nl]),
-	      emit([indent(12),"'dec_",T,"'(Val,telltype)"]),
-	      0;
-	  {value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-	      emit([";",nl,indent(9),{asis,Name}," ->",nl]),
-	      emit([indent(12),"'",M,"'",":'dec_",T,"'(Val,telltype)"]),
-	      0;
-	  false ->
-	      emit([";",nl,
-		    indent(9),{asis,Name}," ->{Val,Type}"]),
-	      0
-      end,
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,[],_,NthObj) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    NthObj.
+    emit(Sep0),
+    Sep = [";",nl],
+    N = case lists:keyfind(Name, 1, Fields) of
+	    {_,#type{}=Type} ->
+		emit_inner_of_decfun(Type, InternalDefFunName);
+	    {_,#typedef{}=Type} ->
+		emit([indent(9),{asis,Name}," ->",nl]),
+		emit_inner_of_decfun(Type, InternalDefFunName);
+	    {_,#'Externaltypereference'{module=CurrentMod,type=T}} ->
+		emit([indent(9),{asis,Name}," ->",nl,
+		      indent(12),"'dec_",T,"'(Val,telltype)"]),
+		0;
+	    {_,#'Externaltypereference'{module=M,type=T}} ->
+		emit([indent(9),{asis,Name}," ->",nl,
+		      indent(12),"'",M,"':'dec_",T,"'(Val,telltype)"]),
+		0;
+	    false ->
+		emit([indent(9),{asis,Name}," -> {Val,Type}"]),
+		0
+	end,
+    gen_inlined_dec_funs1(Fields, Rest, ObjSetName, Sep, NthObj+N);
+gen_inlined_dec_funs1(Fields, [_|Rest], ObjSetName, Sep, NthObj) ->
+    gen_inlined_dec_funs1(Fields, Rest, ObjSetName, Sep, NthObj);
+gen_inlined_dec_funs1(_, [], _, _, NthObj) -> NthObj.
 
 emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},
 		     InternalDefFunName) ->
@@ -1228,19 +1093,47 @@ gen_decode_user(Erules,D) when is_record(D,typedef) ->
 	    exit({error,{asn1,{unknown,Other}}})
     end.
 
+gen_dec_imm(Erule, #type{def=Name,constraint=C}) ->
+    Aligned = case Erule of
+		  uper -> false;
+		  per -> true
+	      end,
+    gen_dec_imm_1(Name, C, Aligned).
+
+gen_dec_imm_1('ASN1_OPEN_TYPE', Constraint, Aligned) ->
+    imm_decode_open_type(Constraint, Aligned);
+gen_dec_imm_1('ANY', _Constraint, Aligned) ->
+    imm_decode_open_type([], Aligned);
+gen_dec_imm_1('BOOLEAN', _Constr, _Aligned) ->
+    asn1ct_imm:per_dec_boolean();
+gen_dec_imm_1({'ENUMERATED',{Base,Ext}}, _Constr, Aligned) ->
+    asn1ct_imm:per_dec_enumerated(Base, Ext, Aligned);
+gen_dec_imm_1({'ENUMERATED',NamedNumberList}, _Constr, Aligned) ->
+    asn1ct_imm:per_dec_enumerated(NamedNumberList, Aligned);
+gen_dec_imm_1('INTEGER', Constr, Aligned) ->
+    asn1ct_imm:per_dec_integer(Constr, Aligned);
+gen_dec_imm_1({'INTEGER',NamedNumberList}, Constraint, Aligned) ->
+    asn1ct_imm:per_dec_named_integer(Constraint,
+				     NamedNumberList,
+				     Aligned);
+gen_dec_imm_1('OCTET STRING', Constraint, Aligned) ->
+    SzConstr = get_constraint(Constraint, 'SizeConstraint'),
+    Imm = asn1ct_imm:per_dec_octet_string(SzConstr, Aligned),
+    {convert,binary_to_list,Imm};
+gen_dec_imm_1(_, _, _) -> no.
+
+gen_dec_prim(Erule, Type, BytesVar) ->
+    case gen_dec_imm(Erule, Type) of
+	no ->
+	    gen_dec_prim_1(Erule, Type, BytesVar);
+	Imm ->
+	    asn1ct_imm:dec_code_gen(Imm, BytesVar)
+    end.
 
-gen_dec_prim(Erules,Att,BytesVar) ->
-    Typename = Att#type.def,
-    Constraint = Att#type.constraint,
+gen_dec_prim_1(Erule,
+	       #type{def=Typename,constraint=Constraint}=Att,
+	       BytesVar) ->
     case Typename of
-	'INTEGER' ->
-	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-		  {asis,effective_constraint(integer,Constraint)},")"});
-	{'INTEGER',NamedNumberList} ->
-	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-		  {asis,effective_constraint(integer,Constraint)},",",
-		  {asis,NamedNumberList},")"});
-
 	'REAL' ->
 	    emit({"?RT_PER:decode_real(",BytesVar,")"});
 	
@@ -1256,8 +1149,7 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 			  {asis,NamedNumberList},")"})
 	    end;
 	'NULL' ->
-	    emit({"?RT_PER:decode_null(",
-		  BytesVar,")"});
+	    emit({"{'NULL',",BytesVar,"}"});
 	'OBJECT IDENTIFIER' ->
 	    emit({"?RT_PER:decode_object_identifier(",
 		  BytesVar,")"});
@@ -1267,24 +1159,6 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 	'ObjectDescriptor' ->
 	    emit({"?RT_PER:decode_ObjectDescriptor(",
 		  BytesVar,")"});
-	{'ENUMERATED',{NamedNumberList1,NamedNumberList2}} ->
-	    NewTup = {list_to_tuple([X||{X,_} <- NamedNumberList1]),
-		      list_to_tuple([X||{X,_} <- NamedNumberList2])},
-	    NewC = [{'ValueRange',{0,size(element(1,NewTup))-1}}],
-	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-		  {asis,NewC},",",
-		  {asis,NewTup},")"});
-	{'ENUMERATED',NamedNumberList} ->
-	    NewTup = list_to_tuple([X||{X,_} <- NamedNumberList]),
-	    NewC = [{'ValueRange',{0,size(NewTup)-1}}],
-	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-		  {asis,NewC},",",
-		  {asis,NewTup},")"});
-	'BOOLEAN'->
-	    emit({"?RT_PER:decode_boolean(",BytesVar,")"});
-	'OCTET STRING' ->
-	    emit({"?RT_PER:decode_octet_string(",BytesVar,",",
-		  {asis,Constraint},")"});
 	'NumericString' ->
 	    emit({"?RT_PER:decode_NumericString(",BytesVar,",",
 		  {asis,Constraint},")"});
@@ -1322,42 +1196,12 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 		  ",",{asis,Constraint},")"});
 	'UTF8String' ->
 	    emit({"?RT_PER:decode_UTF8String(",BytesVar,")"});
-	'ANY' ->
-	    case Erules of
-		per ->
-		    emit(["fun() -> {XTerm,YTermXBytes} = ?RT_PER:decode_open_type(",BytesVar,",",{asis,Constraint}, "), {binary_to_list(XTerm),XBytes} end ()"]);
-		_ ->
-		    emit(["?RT_PER:decode_open_type(",BytesVar,",", 
-			  {asis,Constraint}, ")"])
-	    end;
-	'ASN1_OPEN_TYPE' ->
-	    case Constraint of
-		[#'Externaltypereference'{type=Tname}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		[#type{def=#'Externaltypereference'{type=Tname}}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		_ ->
-		    case Erules of
-			per ->
-			    emit(["fun() -> {XTerm,XBytes} = ?RT_PER:decode_open_type(",BytesVar,", []), {binary_to_list(XTerm),XBytes} end()"]);
-			_ ->
-			    emit(["?RT_PER:decode_open_type(",BytesVar,",[])"])
-		    end
-	    end;
 	#'ObjectClassFieldType'{} ->
-		case asn1ct_gen:get_inner(Att#type.def) of
+		case asn1ct_gen:get_inner(Typename) of
 		    {fixedtypevaluefield,_,InnerType} -> 
-			gen_dec_prim(Erules,InnerType,BytesVar);
+			gen_dec_prim(Erule, InnerType, BytesVar);
 		    T ->
-			gen_dec_prim(Erules,Att#type{def=T},BytesVar)
+			gen_dec_prim(Erule, Att#type{def=T}, BytesVar)
 		end;
 	Other ->
 	    exit({'cant decode' ,Other})
@@ -1417,3 +1261,22 @@ extaddgroup2sequence([C|T],ExtNum,Acc) ->
     extaddgroup2sequence(T,ExtNum,[C|Acc]);
 extaddgroup2sequence([],_,Acc) ->
     lists:reverse(Acc).
+
+imm_decode_open_type([#'Externaltypereference'{type=Tname}], Aligned) ->
+    imm_dec_open_type_1(Tname, Aligned);
+imm_decode_open_type([#type{def=#'Externaltypereference'{type=Tname}}],
+		     Aligned) ->
+    imm_dec_open_type_1(Tname, Aligned);
+imm_decode_open_type(_, Aligned) ->
+    asn1ct_imm:per_dec_open_type(Aligned).
+
+imm_dec_open_type_1(Type, Aligned) ->
+    D = fun(OpenType, Buf) ->
+		asn1ct_name:new(tmpval),
+		emit(["begin",nl,
+		      "{",{curr,tmpval},",_} = ",
+		      "dec_",Type,"(",OpenType,", mandatory),",nl,
+		      "{",{curr,tmpval},com,Buf,"}",nl,
+		      "end"])
+	end,
+    {call,D,asn1ct_imm:per_dec_open_type(Aligned)}.
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
index 16eec92847..4f4563833f 100644
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
@@ -69,18 +69,6 @@ gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
 	end,
     case asn1ct_gen:type(InnerType) of
 	{constructed,bif} ->
-	    case InnerType of
-		'SET' ->
-		    true;
-		'SEQUENCE' ->
-		    true;
-		_ ->
-		    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'({'",asn1ct_gen:list2name(Typename),
-			  "',Val}",ObjFun,") ->",nl}),
-		    emit({"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val",ObjFun,");",nl,nl})
-	    end,
 	    emit({"'enc_",asn1ct_gen:list2name(Typename),"'(Val",ObjFun,
 		  ") ->",nl}),
 	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
@@ -176,7 +164,7 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 			  {asis,NamedNumberList},")"})
 	    end;
 	'NULL' ->
-	    emit({"?RT_PER:encode_null(",Value,")"});
+	    emit("[]");
 	'OBJECT IDENTIFIER' ->
 	    emit({"?RT_PER:encode_object_identifier(",Value,")"});
 	'RELATIVE-OID' ->
@@ -417,50 +405,50 @@ emit_enc_octet_string(_Erules,Constraint,Value) ->
 	    asn1ct_name:new(tmpval),
 	    emit({"  begin",nl}),
 	    emit({"    [",{curr,tmpval},"] = ",Value,",",nl}),
-	    emit({"    [10,8,",{curr,tmpval},"]",nl}),
+	    emit(["    [[10,8],",{curr,tmpval},"]",nl]),
 	    emit("  end");
 	2 ->
 	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-	    emit({"    [",{curr,tmpval},",",{next,tmpval},"] = ",
-		  Value,",",nl}),
-	    emit({"    [[10,8,",{curr,tmpval},"],[10,8,",
-		  {next,tmpval},"]]",nl}),
-	    emit("  end"),
-	    asn1ct_name:new(tmpval);
-	Sv when is_integer(Sv),Sv =< 256  ->
+	    emit(["  begin",nl,
+		  "    ",{curr,tmpval}," = ",Value,",",nl,
+		  "    case length(",{curr,tmpval},") of",nl,
+		  "      2 ->",nl,
+		  "        [[45,16,2]|",{curr,tmpval},"];",nl,
+		  "      _ ->",nl,
+		  "        exit({error,{value_out_of_bounds,",
+		  {curr,tmpval},"}})",nl,
+		  "    end",nl,
+		  "  end"]);
+	Sv when is_integer(Sv), Sv < 256  ->
 	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-	    emit({"    case length(",Value,") of",nl}),
-	    emit(["      ",{curr,tmpval}," when ",{curr,tmpval}," == ",Sv," ->"]),
-	    emit([" [2,20,",{curr,tmpval},",",Value,"];",nl]),
-	    emit({"      _ -> exit({error,{value_out_of_bounds,",
-		  Value,"}})", nl,"    end",nl}),
-	    emit("  end");
+	    asn1ct_name:new(tmplen),
+	    emit(["  begin",nl,
+		  "    ",{curr,tmpval}," = ",Value,",",nl,
+		  "    case length(",{curr,tmpval},") of",nl,
+		  "      ",Sv,"=",{curr,tmplen}," ->",nl,
+		  "       [20,",{curr,tmplen},"|",{curr,tmpval},"];",nl,
+		  "      _ ->",nl,
+		  "       exit({error,{value_out_of_bounds,",
+		  {curr,tmpval},"}})",nl,
+		  "    end",nl,
+		  "  end"]);
 	Sv when is_integer(Sv),Sv =< 65535  ->
 	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-	    emit({"    case length(",Value,") of",nl}),
-	    emit(["      ",{curr,tmpval}," when ",{curr,tmpval}," == ",Sv," ->"]),
-	    emit([" [2,21,",{curr,tmpval},",",Value,"];",nl]),
-	    emit({"      _ -> exit({error,{value_out_of_bounds,",
-		  Value,"}})",nl,"    end",nl}),
-	    emit("  end");
+	    asn1ct_name:new(tmplen),
+	    emit(["  begin",nl,
+		  "    ",{curr,tmpval}," = ",Value,",",nl,
+		  "    case length(",{curr,tmpval},") of",nl,
+		  "      ",Sv,"=",{curr,tmplen}," ->",nl,
+		  "        [<<21,",{curr,tmplen},":16>>|",Value,"];",nl,
+		  "      _ ->",nl,
+		  "        exit({error,{value_out_of_bounds,",
+		  {curr,tmpval},"}})",nl,
+		  "    end",nl,
+		  "  end"]);
 	C ->
 	    emit({"  ?RT_PER:encode_octet_string(",{asis,C},",false,",Value,")",nl})
     end.
 
-emit_dec_octet_string(Constraint,BytesVar) ->
-    case get_constraint(Constraint,'SizeConstraint') of
-	0 ->
-	    emit({"  {[],",BytesVar,"}",nl});
-	{_,0} ->
-	    emit({"  {[],",BytesVar,"}",nl});
-	C ->
-	    emit({"  ?RT_PER:decode_octet_string(",BytesVar,",",
-		  {asis,C},",false)",nl})
-    end.
-
 emit_enc_integer_case(Value) ->
     case get(component_type) of
 	{true,#'ComponentType'{prop=Prop}} ->
@@ -624,23 +612,6 @@ get_constraint(C,Key) ->
 	    V
     end.
 
-get_constraints(L=[{Key,_}],Key) ->
-    L;
-get_constraints([],_) ->
-    [];
-get_constraints(C,Key) ->
-    {value,L} = keysearch_allwithkey(Key,1,C,[]),
-    L.
-
-keysearch_allwithkey(Key,Ix,C,Acc) ->
-    case lists:keysearch(Key,Ix,C) of
-	false ->
-	    {value,Acc};
-	{value,T} ->
-	    RestC = lists:delete(T,C),
-	    keysearch_allwithkey(Key,Ix,RestC,[T|Acc])
-    end.
-
 %% effective_constraint(Type,C)
 %% Type = atom()
 %% C = [C1,...]
@@ -657,69 +628,9 @@ keysearch_allwithkey(Key,Ix,C,Acc) ->
 effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
     [C]; %% [C|effective_constraint(integer,Rest)]; XXX what is possible ???
 effective_constraint(integer,C) ->
-    SVs = get_constraints(C,'SingleValue'),
-    SV = effective_constr('SingleValue',SVs),
-    VRs = get_constraints(C,'ValueRange'),
-    VR = effective_constr('ValueRange',VRs),
-    CRange = greatest_common_range(SV,VR),
-    pre_encode(integer,CRange);
+    pre_encode(integer, asn1ct_imm:effective_constraint(integer, C));
 effective_constraint(bitstring,C) ->
-    get_constraint(C,'SizeConstraint').
-
-effective_constr(_,[]) ->
-    [];
-effective_constr('SingleValue',List) ->
-    SVList = lists:flatten(lists:map(fun(X)->element(2,X)end,List)),
-    %% Sort and remove duplicates before generating SingleValue or ValueRange
-    %% In case of ValueRange, also check for 'MIN and 'MAX'
-    case lists:usort(SVList) of
-	[N] ->
-	    [{'SingleValue',N}];
-	L when is_list(L) ->
-	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
-    end;
-effective_constr('ValueRange',List) ->
-    LBs = lists:map(fun({_,{Lb,_}})-> Lb end,List),
-    UBs = lists:map(fun({_,{_,Ub}})-> Ub end,List),
-    Lb = least_Lb(LBs),
-    [{'ValueRange',{Lb,lists:max(UBs)}}].
-
-greatest_common_range([],VR) ->
-    VR;
-greatest_common_range(SV,[]) ->
-    SV;
-greatest_common_range([{_,Int}],[{_,{'MIN',Ub}}]) when is_integer(Int),
-						       Int > Ub ->
-    [{'ValueRange',{'MIN',Int}}];
-greatest_common_range([{_,Int}],[{_,{Lb,Ub}}]) when is_integer(Int),
-						    Int < Lb ->
-    [{'ValueRange',{Int,Ub}}];
-greatest_common_range([{_,Int}],VR=[{_,{_Lb,_Ub}}]) when is_integer(Int) ->
-    VR;
-greatest_common_range([{_,L}],[{_,{Lb,Ub}}]) when is_list(L) ->
-    Min = least_Lb([Lb|L]),
-    Max = greatest_Ub([Ub|L]),
-    [{'ValueRange',{Min,Max}}];
-greatest_common_range([{_,{Lb1,Ub1}}],[{_,{Lb2,Ub2}}]) ->
-    Min = least_Lb([Lb1,Lb2]),
-    Max = greatest_Ub([Ub1,Ub2]),
-    [{'ValueRange',{Min,Max}}].
-    
-
-least_Lb(L) ->
-    case lists:member('MIN',L) of
-	true -> 'MIN';
-	_ -> lists:min(L)
-    end.
-
-greatest_Ub(L) ->
-    case lists:member('MAX',L) of
-	true -> 'MAX';
-	_ -> lists:max(L)
-    end.
-
-
-
+    asn1ct_imm:effective_constraint(bitstring, C).
 
 pre_encode(integer,[]) ->
     [];
@@ -1380,7 +1291,6 @@ gen_objset_dec(ObjSetName,_,['EXTENSIONMARK'],_ClName,_ClFields,
 	       _NthObj) ->
     emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
     emit({indent(3),"fun(Attr1, Bytes, _, _) ->",nl}),
-    %%    emit({indent(6),"?RT_PER:decode_open_type(Bytes,[])",nl}),
     emit({indent(6),"{Bytes,Attr1}",nl}),
     emit({indent(3),"end.",nl,nl}),
     ok;
@@ -1396,77 +1306,42 @@ emit_default_getdec(ObjSetName,UniqueName) ->
     emit([indent(2), "fun(C,V,_,_) -> exit({{component,C},{value,V},{unique_name_and_value,",{asis,UniqueName},",ErrV}}) end"]).
 
 
-gen_inlined_dec_funs(Fields,[{typefield,Name,_}|Rest],
-		     ObjSetName,NthObj) ->
-    CurrMod = get(currmod),
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when is_record(Type,type) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,Type}} when is_record(Type,typedef) ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    N=emit_inner_of_decfun(Type,InternalDefFunName),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-	{value,{_,#'Externaltypereference'{module=CurrMod,type=T}}} ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    emit([indent(12),"'dec_",T,"'(Val, telltype)"]),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-	{value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-	    emit({indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl}),
-	    emit({indent(9),{asis,Name}," ->",nl}),
-	    emit([indent(12),"'",M,"':'dec_",T,"'(Val, telltype)"]),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-	false ->
-	    emit([indent(3),"fun(Type, Val, _, _) ->",nl,
-		  indent(6),"case Type of",nl,
-		  indent(9),{asis,Name}," -> {Val,Type}"]),
-	    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj)
-    end;
-gen_inlined_dec_funs(Fields,[_|Rest],ObjSetName,NthObj) ->
-    gen_inlined_dec_funs(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs(_,[],_,NthObj) ->
+gen_inlined_dec_funs(Fields, List, ObjSetName, NthObj0) ->
+    emit([indent(3),"fun(Type, Val, _, _) ->",nl,
+	  indent(6),"case Type of",nl]),
+    NthObj = gen_inlined_dec_funs1(Fields, List, ObjSetName, "", NthObj0),
+    emit([nl,indent(6),"end",nl,
+	  indent(3),"end"]),
     NthObj.
 
-gen_inlined_dec_funs1(Fields,[{typefield,Name,_}|Rest],
-		     ObjSetName,NthObj) ->
+gen_inlined_dec_funs1(Fields, [{typefield,Name,_}|Rest],
+		      ObjSetName, Sep0, NthObj) ->
     CurrentMod = get(currmod),
     InternalDefFunName = [NthObj,Name,ObjSetName],
-    N=
-    case lists:keysearch(Name,1,Fields) of
-	{value,{_,Type}} when is_record(Type,type) ->
-	    emit({";",nl}),
-	    emit_inner_of_decfun(Type,InternalDefFunName);
-	{value,{_,Type}} when is_record(Type,typedef) ->
-	    emit({";",nl,indent(9),{asis,Name}," ->",nl}),
-	    emit_inner_of_decfun(Type,InternalDefFunName);
-	{value,{_,#'Externaltypereference'{module=CurrentMod,type=T}}} ->
-	    emit([";",nl,indent(9),{asis,Name}," ->",nl]),
-	    emit([indent(12),"'dec_",T,"'(Val,telltype)"]),
-	    0;
-	{value,{_,#'Externaltypereference'{module=M,type=T}}} ->
-	    emit([";",nl,indent(9),{asis,Name}," ->",nl]),
-	    emit([indent(12),"'",M,"':'dec_",T,"'(Val,telltype)"]),
-	    0;
-	false ->
-	    emit([";",nl,
-		  indent(9),{asis,Name}," -> {Val,Type}"]),
-	    0
-    end,
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj+N);
-gen_inlined_dec_funs1(Fields,[_|Rest],ObjSetName,NthObj)->
-    gen_inlined_dec_funs1(Fields,Rest,ObjSetName,NthObj);
-gen_inlined_dec_funs1(_,[],_,NthObj) ->
-    emit({nl,indent(6),"end",nl}),
-    emit({indent(3),"end"}),
-    NthObj.
+    emit(Sep0),
+    Sep = [";",nl],
+    N = case lists:keyfind(Name, 1, Fields) of
+	    {_,#type{}=Type} ->
+		emit_inner_of_decfun(Type, InternalDefFunName);
+	    {_,#typedef{}=Type} ->
+		emit([indent(9),{asis,Name}," ->",nl]),
+		emit_inner_of_decfun(Type, InternalDefFunName);
+	    {_,#'Externaltypereference'{module=CurrentMod,type=T}} ->
+		emit([indent(9),{asis,Name}," ->",nl,
+		      indent(12),"'dec_",T,"'(Val,telltype)"]),
+		0;
+	    {_,#'Externaltypereference'{module=M,type=T}} ->
+		emit([indent(9),{asis,Name}," ->",nl,
+		      indent(12),"'",M,"':'dec_",T,"'(Val,telltype)"]),
+		0;
+	    false ->
+		emit([indent(9),{asis,Name}," -> {Val,Type}"]),
+		0
+	end,
+    gen_inlined_dec_funs1(Fields, Rest, ObjSetName, Sep, NthObj+N);
+gen_inlined_dec_funs1(Fields, [_|Rest], ObjSetName, Sep, NthObj) ->
+    gen_inlined_dec_funs1(Fields, Rest, ObjSetName, Sep, NthObj);
+gen_inlined_dec_funs1(_, [], _, _, NthObj) -> NthObj.
 
 emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},
 		     InternalDefFunName) ->
@@ -1586,17 +1461,9 @@ gen_dec_prim(Erules,Att,BytesVar) ->
     Constraint = Att#type.constraint,
     case Typename of
 	'INTEGER' ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    emit_dec_integer(EffectiveConstr,BytesVar);
-% 	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-% 		  {asis,EffectiveConstr},")"});
-	{'INTEGER',NamedNumberList} ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    emit_dec_integer(EffectiveConstr,BytesVar,NamedNumberList);
-% 	    emit({"?RT_PER:decode_integer(",BytesVar,",",
-% 		  {asis,EffectiveConstr},",",
-% 		  {asis,NamedNumberList},")"});
-
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
+	{'INTEGER',_NamedNumberList} ->
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
 	'REAL' ->
 	    emit(["?RT_PER:decode_real(",BytesVar,")"]);
 
@@ -1612,8 +1479,7 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 			  {asis,NamedNumberList},")"})
 	    end;
 	'NULL' ->
-	    emit({"?RT_PER:decode_null(",
-		  BytesVar,")"});
+	    emit({"{'NULL',",BytesVar,"}"});
 	'OBJECT IDENTIFIER' ->
 	    emit({"?RT_PER:decode_object_identifier(",
 		  BytesVar,")"});
@@ -1623,23 +1489,13 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 	'ObjectDescriptor' ->
 	    emit({"?RT_PER:decode_ObjectDescriptor(",
 		  BytesVar,")"});
-	{'ENUMERATED',{NamedNumberList1,NamedNumberList2}} ->
-	    NewTup = {list_to_tuple([X||{X,_} <- NamedNumberList1]),
-		      list_to_tuple([X||{X,_} <- NamedNumberList2])},
-	    NewC = [{'ValueRange',{0,size(element(1,NewTup))-1}}],
-	    emit({"?RT_PER:decode_enumerated(",BytesVar,",",
-		  {asis,NewC},",",
-		  {asis,NewTup},")"});
-	{'ENUMERATED',NamedNumberList} ->
-	    NewNNL = [X||{X,_} <- NamedNumberList],
-	    NewC = effective_constraint(integer,
-					[{'ValueRange',{0,length(NewNNL)-1}}]),
-	    emit_dec_enumerated(BytesVar,NewC,NewNNL);
+	{'ENUMERATED',_} ->
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
 	'BOOLEAN'->
-	    emit({"?RT_PER:decode_boolean(",BytesVar,")"});
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
 
 	'OCTET STRING' ->
-	    emit_dec_octet_string(Constraint,BytesVar);
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
 
 	'NumericString' ->
 	    emit_dec_known_multiplier_string('NumericString',
@@ -1686,25 +1542,9 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 	'UTF8String' ->
 	    emit({"?RT_PER:decode_UTF8String(",BytesVar,")"});
 	'ANY' ->
-	    emit(["?RT_PER:decode_open_type(",BytesVar,",", 
-		  {asis,Constraint}, ")"]); 
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
 	'ASN1_OPEN_TYPE' ->
-	    case Constraint of
-		[#'Externaltypereference'{type=Tname}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		[#type{def=#'Externaltypereference'{type=Tname}}] ->
-		    emit(["fun(FBytes) ->",nl,
-			  "   {XTerm,XBytes} = "]),
-		    emit(["?RT_PER:decode_open_type(FBytes,[]),",nl]),
-		    emit(["   {YTerm,_} = dec_",Tname,"(XTerm,mandatory),",nl]),
-		    emit(["   {YTerm,XBytes} end(",BytesVar,")"]);
-		_ ->
-		    emit(["?RT_PER:decode_open_type(",BytesVar,",[])"])
-	    end;
+	    asn1ct_gen_per:gen_dec_prim(Erules, Att, BytesVar);
 	#'ObjectClassFieldType'{} ->
 		case asn1ct_gen:get_inner(Att#type.def) of
 		    {fixedtypevaluefield,_,InnerType} -> 
@@ -1716,88 +1556,6 @@ gen_dec_prim(Erules,Att,BytesVar) ->
 	    exit({'cant decode' ,Other})
     end.
 
-
-emit_dec_integer(C,BytesVar,NNL) ->
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(buffer),
-    Tmpterm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-    Buffer = asn1ct_gen:mk_var(asn1ct_name:curr(buffer)),
-    emit({" begin {",{curr,tmpterm},",",{curr,buffer},"} = ",nl}),
-    emit_dec_integer(C,BytesVar),
-    emit({",",nl," case ",Tmpterm," of",nl}),
-    lists:map(fun({Name,Int})->emit({"   ",Int," -> {",{asis,Name},",",
-				     Buffer,"};",nl});
-		 (_)-> exit({error,{asn1,{"error in named number list",NNL}}})
-	      end,
-	      NNL),
-    emit({"   _ -> {",Tmpterm,",",Buffer,"}",nl}),
-    emit({" end",nl}), % end of case
-    emit(" end"). % end of begin
-
-emit_dec_integer([{'SingleValue',Int}],BytesVar) when is_integer(Int) -> 
-    emit(["{",Int,",",BytesVar,"}"]);
-emit_dec_integer([{_,{Lb,_Ub},_Range,{BitsOrOctets,N}}],BytesVar) ->
-    GetBorO = 
-	case BitsOrOctets of
-	    bits -> "getbits";
-	    _ -> "getoctets"
-	end,
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(tmpremain),
-    emit({"  begin",nl,"    {",{curr,tmpterm},",",{curr,tmpremain},"}=",
-	  "?RT_PER:",GetBorO,"(",BytesVar,",",N,"),",nl}),
-    emit({"    {",{curr,tmpterm},"+",Lb,",",{curr,tmpremain},"}",nl,
-	  "  end"});
-emit_dec_integer([{_,{'MIN',_}}],BytesVar) ->
-    emit({"?RT_PER:decode_unconstrained_number(",BytesVar,")"});
-emit_dec_integer([{_,{Lb,'MAX'}}],BytesVar) ->
-    emit({"?RT_PER:decode_semi_constrained_number(",BytesVar,",",Lb,")"});
-emit_dec_integer([{'ValueRange',VR={Lb,Ub}}],BytesVar) ->
-    Range = Ub-Lb+1,
-     emit({"?RT_PER:decode_constrained_number(",BytesVar,",",
-	   {asis,VR},",",Range,")"});
-emit_dec_integer(C=[{Rc,_}],BytesVar) when is_tuple(Rc) ->
-    emit({"?RT_PER:decode_integer(",BytesVar,",",{asis,C},")"});
-emit_dec_integer(_,BytesVar) ->
-    emit({"?RT_PER:decode_unconstrained_number(",BytesVar,")"}).
-    
-
-emit_dec_enumerated(BytesVar,C,NamedNumberList) ->
-    emit_dec_enumerated_begin(),% emits a begin if component
-    asn1ct_name:new(tmpterm),
-    Tmpterm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-    asn1ct_name:new(tmpremain),
-    Tmpremain = asn1ct_gen:mk_var(asn1ct_name:curr(tmpremain)),
-    emit({"    {",{curr,tmpterm},",",{curr,tmpremain},"} =",nl}),
-    emit_dec_integer(C,BytesVar),
-    emit({",",nl,"    case ",Tmpterm," of "}),
-
-    Cases=lists:flatten(dec_enumerated_cases(NamedNumberList,Tmpremain,0)),
-    emit({Cases++"_->exit({error,{asn1,{decode_enumerated,{",Tmpterm,
-	  ",",{asis,NamedNumberList},"}}}}) end",nl}),
-    emit_dec_enumerated_end().
-	     
-emit_dec_enumerated_begin() ->
-    case get(component_type) of
-	{true,_} ->
-	    emit({"  begin",nl});
-	_ -> ok
-    end.
-
-emit_dec_enumerated_end() ->
-    case get(component_type) of
-	{true,_} ->
-	    emit("  end");
-	_ -> ok
-    end.
-
-
-dec_enumerated_cases([Name|Rest],Tmpremain,No) ->
-    io_lib:format("~w->{~w,~s};",[No,Name,Tmpremain])++
-	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
diff --git a/lib/asn1/src/asn1ct_imm.erl b/lib/asn1/src/asn1ct_imm.erl
new file mode 100644
index 0000000000..34bb0b8714
--- /dev/null
+++ b/lib/asn1/src/asn1ct_imm.erl
@@ -0,0 +1,626 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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(asn1ct_imm).
+-export([per_dec_boolean/0,per_dec_enumerated/2,per_dec_enumerated/3,
+	 per_dec_extension_map/1,
+	 per_dec_integer/2,per_dec_length/3,per_dec_named_integer/3,
+	 per_dec_octet_string/2,per_dec_open_type/1]).
+-export([optimize_alignment/1,optimize_alignment/2,
+	 dec_slim_cg/2,dec_code_gen/2]).
+-export([effective_constraint/2]).
+-import(asn1ct_gen, [emit/1]).
+
+-record(st, {var,
+	     base}).
+
+dec_slim_cg(Imm0, BytesVar) ->
+    {Imm,_} = optimize_alignment(Imm0),
+    asn1ct_name:new(v),
+    [H|T] = atom_to_list(asn1ct_name:curr(v)) ++ "@",
+    VarBase = [H-($a-$A)|T],
+    St0 = #st{var=0,base=VarBase},
+    {Res,Pre,_} = flatten(Imm, BytesVar, St0),
+    dcg_list_outside(Pre),
+    Res.
+
+dec_code_gen(Imm, BytesVar) ->
+    emit(["begin",nl]),
+    {Dst,DstBuf} = dec_slim_cg(Imm, BytesVar),
+    emit([",",nl,
+	  "{",Dst,",",DstBuf,"}",nl,
+	  "end"]),
+    ok.
+
+optimize_alignment(Imm) ->
+    opt_al(Imm, unknown).
+
+optimize_alignment(Imm, Al) ->
+    opt_al(Imm, Al).
+
+
+per_dec_boolean() ->
+    {map,{get_bits,1,[1]},[{0,false},{1,true}]}.
+
+per_dec_enumerated(NamedList0, Aligned) ->
+    Constraint = [{'ValueRange',{0,length(NamedList0)-1}}],
+    NamedList = per_dec_enumerated_fix_list(NamedList0, [enum_error], 0),
+    Int = per_dec_integer(Constraint, Aligned),
+    {map,Int,NamedList}.
+
+per_dec_enumerated(BaseNamedList, NamedListExt0, Aligned) ->
+    Base = per_dec_enumerated(BaseNamedList, Aligned),
+    NamedListExt = per_dec_enumerated_fix_list(NamedListExt0,
+					       [enum_default], 0),
+    Ext = {map,per_dec_normally_small_number(Aligned),NamedListExt},
+    bit_case(Base, Ext).
+
+per_dec_extension_map(Aligned) ->
+    Len = {add,per_dec_normally_small_number(Aligned),1},
+    {get_bits,Len,[1,bitstring]}.
+
+per_dec_integer(Constraint0, Aligned) ->
+    Constraint = effective_constraint(integer, Constraint0),
+    per_dec_integer_1(Constraint, Aligned).
+
+per_dec_length(SingleValue, _, _Aligned) when is_integer(SingleValue) ->
+    {value,SingleValue};
+per_dec_length({S,S}, _, _Aligned) when is_integer(S) ->
+    {value,S};
+per_dec_length({{_,_}=Constr,_}, AllowZero, Aligned) ->
+    bit_case(per_dec_length(Constr, AllowZero, Aligned),
+	     per_dec_length(undefined, AllowZero, Aligned));
+per_dec_length({Lb,Ub}, _AllowZero, Aligned) when is_integer(Lb),
+						  is_integer(Lb),
+						  Ub =< 65535 ->
+    per_dec_constrained(Lb, Ub, Aligned);
+per_dec_length({_,_}, AllowZero, Aligned) ->
+    decode_unconstrained_length(AllowZero, Aligned);
+per_dec_length(undefined, AllowZero, Aligned) ->
+    decode_unconstrained_length(AllowZero, Aligned).
+
+per_dec_named_integer(Constraint, NamedList0, Aligned) ->
+    Int = per_dec_integer(Constraint, Aligned),
+    NamedList = [{K,V} || {V,K} <- NamedList0] ++ [integer_default],
+    {map,Int,NamedList}.
+
+per_dec_octet_string(Constraint, Aligned) ->
+    dec_string(Constraint, 8, Aligned).
+
+per_dec_open_type(Aligned) ->
+    {get_bits,decode_unconstrained_length(true, Aligned),
+     [8,binary,{align,Aligned}]}.
+
+
+%%%
+%%% Local functions.
+%%%
+
+dec_string(Sv, U, _Aligned) when is_integer(Sv), U*Sv =< 16 ->
+    {get_bits,Sv,[U,binary]};
+dec_string(Sv, U, Aligned) when is_integer(Sv), Sv < 16#10000 ->
+    {get_bits,Sv,[U,binary,{align,Aligned}]};
+dec_string(C, U, Aligned) when is_list(C) ->
+    dec_string({hd(C),lists:max(C)}, U, Aligned);
+dec_string({Sv,Sv}, U, Aligned) ->
+    dec_string(Sv, U, Aligned);
+dec_string({{_,_}=C,_}, U, Aligned) ->
+    bit_case(dec_string(C, U, Aligned),
+	     dec_string(no, U, Aligned));
+dec_string({Lb,Ub}, U, Aligned) when Ub < 16#10000 ->
+    Len = per_dec_constrained(Lb, Ub, Aligned),
+    {get_bits,Len,[U,binary,{align,Aligned}]};
+dec_string(_, U, Aligned) ->
+    Al = [{align,Aligned}],
+    DecRest = fun(V, Buf) ->
+		      emit(["?RT_PER:decode_fragmented(",V,", ",
+			    Buf,", ",U,")"])
+	      end,
+    {'case',[{test,{get_bits,1,[1|Al]},0,
+	      {value,{get_bits,
+		      {get_bits,7,[1]},
+		      [U,binary]}}},
+	     {test,{get_bits,1,[1|Al]},1,
+	      {test,{get_bits,1,[1]},0,
+	       {value,{get_bits,
+		       {get_bits,14,[1]},
+		       [U,binary]}}}},
+	     {test,{get_bits,1,[1|Al]},1,
+	      {test,{get_bits,1,[1]},1,
+	       {value,{call,DecRest,{get_bits,6,[1]}}}}}]}.
+
+per_dec_enumerated_fix_list([{V,_}|T], Tail, N) ->
+    [{N,V}|per_dec_enumerated_fix_list(T, Tail, N+1)];
+per_dec_enumerated_fix_list([], Tail, _) -> Tail.
+
+per_dec_integer_1([{'SingleValue',Value}], _Aligned) ->
+    {value,Value};
+per_dec_integer_1([{'ValueRange',{Lb,'MAX'}}], Aligned) when is_integer(Lb) ->
+    per_dec_unconstrained(Aligned);
+per_dec_integer_1([{'ValueRange',{Lb,Ub}}], Aligned) when is_integer(Lb),
+						    is_integer(Ub) ->
+    per_dec_constrained(Lb, Ub, Aligned);
+per_dec_integer_1([{{_,_}=Constr0,_}], Aligned) ->
+    Constr = effective_constraint(integer, [Constr0]),
+    bit_case(per_dec_integer(Constr, Aligned),
+	     per_dec_unconstrained(Aligned));
+per_dec_integer_1([], Aligned) ->
+    per_dec_unconstrained(Aligned).
+
+per_dec_unconstrained(Aligned) ->
+    {get_bits,decode_unconstrained_length(false, Aligned),[8,signed]}.
+
+per_dec_constrained(Lb, Ub, false) ->
+    Range = Ub - Lb + 1,
+    Get = {get_bits,uper_num_bits(Range),[1]},
+    add_lb(Lb, Get);
+per_dec_constrained(Lb, Ub, true) ->
+    Range = Ub - Lb + 1,
+    Get = if
+	      Range =< 255 ->
+		  {get_bits,per_num_bits(Range),[1,unsigned]};
+	      Range == 256 ->
+		  {get_bits,1,[8,unsigned,{align,true}]};
+	      Range =< 65536 ->
+		  {get_bits,2,[8,unsigned,{align,true}]};
+	      true ->
+		  RangeOctLen = byte_size(binary:encode_unsigned(Range - 1)),
+		  {get_bits,per_dec_length({1,RangeOctLen}, false, true),
+		   [8,unsigned,{align,true}]}
+	  end,
+    add_lb(Lb, Get).
+
+add_lb(0, Get) -> Get;
+add_lb(Lb, Get) -> {add,Get,Lb}.
+
+per_dec_normally_small_number(Aligned) ->
+    Small = {get_bits,6,[1]},
+    Unlimited = per_decode_semi_constrained(0, Aligned),
+    bit_case(Small, Unlimited).
+
+per_decode_semi_constrained(Lb, Aligned) ->
+    add_lb(Lb, {get_bits,decode_unconstrained_length(false, Aligned),[8]}).
+
+bit_case(Base, Ext) ->
+    {'case',[{test,{get_bits,1,[1]},0,Base},
+	     {test,{get_bits,1,[1]},1,Ext}]}.
+
+decode_unconstrained_length(AllowZero, Aligned) ->
+    Al = [{align,Aligned}],
+    Zero = case AllowZero of
+	       false -> [non_zero];
+	       true -> []
+	   end,
+    {'case',[{test,{get_bits,1,[1|Al]},0,
+	      {value,{get_bits,7,[1|Zero]}}},
+	     {test,{get_bits,1,[1|Al]},1,
+	      {test,{get_bits,1,[1]},0,
+	       {value,{get_bits,14,[1|Zero]}}}}]}.
+
+uper_num_bits(N) ->
+    uper_num_bits(N, 1, 0).
+
+uper_num_bits(N, T, B) when N =< T -> B;
+uper_num_bits(N, T, B) -> uper_num_bits(N, T bsl 1, B+1).
+
+per_num_bits(2) -> 1;
+per_num_bits(N) when N =< 4 -> 2;
+per_num_bits(N) when N =< 8 -> 3;
+per_num_bits(N) when N =< 16 -> 4;
+per_num_bits(N) when N =< 32 -> 5;
+per_num_bits(N) when N =< 64 -> 6;
+per_num_bits(N) when N =< 128 -> 7;
+per_num_bits(N) when N =< 255 -> 8.
+
+%%%
+%%% Remove unnecessary aligning to octet boundaries.
+%%%
+
+opt_al({get_bits,E0,Opts0}, A0) ->
+    {E,A1} = opt_al(E0, A0),
+    Opts = opt_al_1(A1, Opts0),
+    A = update_al(A1, E, Opts),
+    {{get_bits,E,Opts},A};
+opt_al({call,Fun,E0}, A0) ->
+    {E,A} = opt_al(E0, A0),
+    {{call,Fun,E},A};
+opt_al({convert,Op,E0}, A0) ->
+    {E,A} = opt_al(E0, A0),
+    {{convert,Op,E},A};
+opt_al({value,E0}, A0) ->
+    {E,A} = opt_al(E0, A0),
+    {{value,E},A};
+opt_al({add,E0,I}, A0) when is_integer(I) ->
+    {E,A} = opt_al(E0, A0),
+    {{add,E,I},A};
+opt_al({test,E0,V,B0}, A0) ->
+    {E,A1} = opt_al(E0, A0),
+    {B,A2} = opt_al(B0, A1),
+    {{test,E,V,B},A2};
+opt_al({'case',Cs0}, A0) ->
+    {Cs,A} = opt_al_cs(Cs0, A0),
+    {{'case',Cs},A};
+opt_al({map,E0,Cs}, A0) ->
+    {E,A} = opt_al(E0, A0),
+    {{map,E,Cs},A};
+opt_al(I, A) when is_integer(I) ->
+    {I,A}.
+
+opt_al_cs([C0|Cs0], A0) ->
+    {C,A1} = opt_al(C0, A0),
+    {Cs,A2} = opt_al_cs(Cs0, A0),
+    {[C|Cs],merge_al(A1, A2)};
+opt_al_cs([], _) -> {[],none}.
+
+merge_al(unknown, _) -> unknown;
+merge_al(Other, none) -> Other;
+merge_al(_, unknown) -> unknown;
+merge_al(I0, I1) ->
+    case {I0 rem 8,I1 rem 8} of
+	{I,I} -> I;
+	{_,_} -> unknown
+    end.
+
+opt_al_1(unknown, Opts) ->
+    Opts;
+opt_al_1(A, Opts0) ->
+    case alignment(Opts0) of
+	none ->
+	    Opts0;
+	full ->
+	    case A rem 8 of
+		0 ->
+		    %% Already in alignment.
+		    proplists:delete(align, Opts0);
+		Bits ->
+		    %% Cheaper alignment with a constant padding.
+		    Opts1 = proplists:delete(align, Opts0),
+		    [{align,8-Bits }|Opts1]
+	    end;
+	A ->					%Assertion.
+	    Opts0
+    end.
+
+update_al(A0, E, Opts) ->
+    A = case alignment(Opts) of
+	    none -> A0;
+	    full -> 0;
+	    Bits when is_integer(A0) ->
+		0  = (A0 + Bits) rem 8;		%Assertion.
+	    _ ->
+		0
+	end,
+    [U] = [U || U <- Opts, is_integer(U)],
+    if
+	U rem 8 =:= 0 -> A;
+	is_integer(A), is_integer(E) -> A + U*E;
+	true -> unknown
+    end.
+
+%%%
+%%% Flatten the intermediate format and assign temporaries.
+%%%
+
+flatten({get_bits,I,U}, Buf0, St0) when is_integer(I) ->
+    {Dst,St} = new_var_pair(St0),
+    Gb = {get_bits,{I,Buf0},U,Dst},
+    flatten_align(Gb, [], St);
+flatten({get_bits,E0,U}, Buf0, St0) ->
+    {E,Pre,St1} = flatten(E0, Buf0, St0),
+    {Dst,St2} = new_var_pair(St1),
+    Gb = {get_bits,E,U,Dst},
+    flatten_align(Gb, Pre, St2);
+flatten({test,{get_bits,I,U},V,E0}, Buf0, St0) when is_integer(I) ->
+    {DstBuf0,St1} = new_var("Buf", St0),
+    Gb = {get_bits,{I,Buf0},U,{V,DstBuf0}},
+    {{_Dst,DstBuf},Pre0,St2} = flatten_align(Gb, [], St1),
+    {E,Pre1,St3} = flatten(E0, DstBuf, St2),
+    {E,Pre0++Pre1,St3};
+flatten({add,E0,I}, Buf0, St0) ->
+    {{Src,Buf},Pre,St1} = flatten(E0, Buf0, St0),
+    {Dst,St} = new_var("Add", St1),
+    {{Dst,Buf},Pre++[{add,Src,I,Dst}],St};
+flatten({'case',Cs0}, Buf0, St0) ->
+    {Dst,St1} = new_var_pair(St0),
+    {Cs1,St} = flatten_cs(Cs0, Buf0, St1),
+    {Al,Cs2} = flatten_hoist_align(Cs1),
+    {Dst,Al++[{'case',Buf0,Cs2,Dst}],St};
+flatten({map,E0,Cs0}, Buf0, St0) ->
+    {{E,DstBuf},Pre,St1} = flatten(E0, Buf0, St0),
+    {Dst,St2} = new_var("Int", St1),
+    Cs = flatten_map_cs(Cs0, E),
+    {{Dst,DstBuf},Pre++[{'map',E,Cs,{Dst,DstBuf}}],St2};
+flatten({value,V0}, Buf0, St0) when is_integer(V0) ->
+    {{V0,Buf0},[],St0};
+flatten({value,V0}, Buf0, St0) ->
+    flatten(V0, Buf0, St0);
+flatten({convert,Op,E0}, Buf0, St0) ->
+    {{E,Buf},Pre,St1} = flatten(E0, Buf0, St0),
+    {Dst,St2} = new_var("Conv", St1),
+    {{Dst,Buf},Pre++[{convert,Op,E,Dst}],St2};
+flatten({call,Fun,E0}, Buf0, St0) ->
+    {Src,Pre,St1} = flatten(E0, Buf0, St0),
+    {Dst,St2} = new_var_pair(St1),
+    {Dst,Pre++[{call,Fun,Src,Dst}],St2}.
+
+flatten_cs([C0|Cs0], Buf, St0) ->
+    {C,Pre,St1} = flatten(C0, Buf, St0),
+    {Cs,St2} = flatten_cs(Cs0, Buf, St0),
+    St3 = St2#st{var=max(St1#st.var, St2#st.var)},
+    {[Pre++[{return,C}]|Cs],St3};
+flatten_cs([], _, St) -> {[],St}.
+
+flatten_map_cs(Cs, Var) ->
+    flatten_map_cs_1(Cs, {Var,Cs}).
+
+flatten_map_cs_1([{K,V}|Cs], DefData) ->
+    [{{asis,K},{asis,V}}|flatten_map_cs_1(Cs, DefData)];
+flatten_map_cs_1([integer_default], {Int,_}) ->
+    [{'_',Int}];
+flatten_map_cs_1([enum_default], {Int,_}) ->
+    [{'_',["{asn1_enum,",Int,"}"]}];
+flatten_map_cs_1([enum_error], {Var,Cs}) ->
+    Vs = [V || {_,V} <- Cs],
+    [{'_',["exit({error,{asn1,{decode_enumerated,{",Var,",",
+	   {asis,Vs},"}}}})"]}];
+flatten_map_cs_1([], _) -> [].
+
+flatten_hoist_align([[{align_bits,_,_}=Ab|T]|Cs]) ->
+    flatten_hoist_align_1(Cs, Ab, [T]);
+flatten_hoist_align(Cs) -> {[],Cs}.
+
+flatten_hoist_align_1([[Ab|T]|Cs], Ab, Acc) ->
+    flatten_hoist_align_1(Cs, Ab, [T|Acc]);
+flatten_hoist_align_1([], Ab, Acc) ->
+    {[Ab],lists:reverse(Acc)}.
+
+flatten_align({get_bits,{SrcBits,SrcBuf},U,Dst}=Gb0, Pre, St0) ->
+    case alignment(U) of
+	none ->
+	    flatten_align_1(U, Dst, Pre++[Gb0], St0);
+	full ->
+	    {PadBits,St1} = new_var("Pad", St0),
+	    {DstBuf,St2} = new_var("Buf", St1),
+	    Ab = {align_bits,SrcBuf,PadBits},
+	    Agb = {get_bits,{PadBits,SrcBuf},[1],{'_',DstBuf}},
+	    Gb = {get_bits,{SrcBits,DstBuf},U,Dst},
+	    flatten_align_1(U, Dst, Pre++[Ab,Agb,Gb], St2);
+	PadBits when is_integer(PadBits), PadBits > 0 ->
+	    {DstBuf,St1} = new_var("Buf", St0),
+	    Agb = {get_bits,{PadBits,SrcBuf},[1],{'_',DstBuf}},
+	    Gb = {get_bits,{SrcBits,DstBuf},U,Dst},
+	    flatten_align_1(U, Dst, Pre++[Agb,Gb], St1)
+    end.
+
+flatten_align_1(U, {D,_}=Dst, Pre, St) ->
+    case is_non_zero(U) of
+	false ->
+	    {Dst,Pre,St};
+	true ->
+	    {Dst,Pre++[{non_zero,D}],St}
+    end.
+
+new_var_pair(St0) ->
+    {Var,St1} = new_var("V", St0),
+    {Buf,St2} = new_var("Buf", St1),
+    {{Var,Buf},St2}.
+
+new_var(Tag, #st{base=VarBase,var=N}=St) ->
+    {VarBase++Tag++integer_to_list(N),St#st{var=N+1}}.
+
+alignment([{align,false}|_]) -> none;
+alignment([{align,true}|_]) -> full;
+alignment([{align,Bits}|_]) -> Bits;
+alignment([_|T]) -> alignment(T);
+alignment([]) -> none.
+
+is_non_zero(Fl) ->
+    lists:member(non_zero, Fl).
+
+%%%
+%%% Generate Erlang code from the flattened intermediate format.
+%%%
+
+dcg_list_outside([{align_bits,Buf,SzVar}|T]) ->
+    emit([SzVar," = bit_size(",Buf,") band 7"]),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{'case',Buf,Cs,Dst}|T]) ->
+    dcg_case(Buf, Cs, Dst),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{'map',Val,Cs,Dst}|T]) ->
+    dcg_map(Val, Cs, Dst),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{add,S1,S2,Dst}|T]) ->
+    emit([Dst," = ",S1," + ",S2]),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{return,{V,Buf}}|T]) ->
+    emit(["{",V,",",Buf,"}"]),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{call,Fun,{V,Buf},{Dst,DstBuf}}|T]) ->
+    emit(["{",Dst,",",DstBuf,"}  = "]),
+    Fun(V, Buf),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{convert,Op,V,Dst}|T]) ->
+    emit([Dst," = ",Op,"(",V,")"]),
+    iter_dcg_list_outside(T);
+dcg_list_outside([{get_bits,{_,Buf0},_,_}|_]=L0) ->
+    emit("<<"),
+    {L,Buf} = dcg_list_inside(L0, buf),
+    emit([Buf,"/bitstring>> = ",Buf0]),
+    iter_dcg_list_outside(L);
+dcg_list_outside([]) ->
+    emit("ignore"),
+    ok.
+
+iter_dcg_list_outside([_|_]=T) ->
+    emit([",",nl]),
+    dcg_list_outside(T);
+iter_dcg_list_outside([]) -> ok.
+
+dcg_case(Buf, Cs, {Dst,DstBuf}) ->
+    emit(["{",Dst,",",DstBuf,"} = case ",Buf," of",nl]),
+    dcg_case_cs(Cs),
+    emit("end").
+
+dcg_case_cs([C|Cs]) ->
+    emit("<<"),
+    {T0,DstBuf} = dcg_list_inside(C, buf),
+    emit([DstBuf,"/bitstring>>"]),
+    T1 = dcg_guard(T0),
+    dcg_list_outside(T1),
+    case Cs of
+	[] -> emit([nl]);
+	[_|_] -> emit([";",nl])
+    end,
+    dcg_case_cs(Cs);
+dcg_case_cs([]) -> ok.
+
+dcg_guard([{non_zero,Src}|T]) ->
+    emit([" when ",Src," =/= 0 ->",nl]),
+    T;
+dcg_guard(T) ->
+    emit([" ->",nl]),
+    T.
+
+dcg_map(Val, Cs, {Dst,_}) ->
+    emit([Dst," = case ",Val," of",nl]),
+    dcg_map_cs(Cs),
+    emit("end").
+
+dcg_map_cs([{K,V}]) ->
+    emit([K," -> ",V,nl]);
+dcg_map_cs([{K,V}|Cs]) ->
+    emit([K," -> ",V,";",nl]),
+    dcg_map_cs(Cs).
+
+dcg_list_inside([{get_bits,{Sz,_},Fl0,{Dst,DstBuf}}|T], _) ->
+    Fl = bit_flags(Fl0, []),
+    emit([mk_dest(Dst),":",Sz,Fl,","]),
+    dcg_list_inside(T, DstBuf);
+dcg_list_inside(L, Dst) -> {L,Dst}.
+
+bit_flags([1|T], Acc) ->
+    bit_flags(T, Acc);
+bit_flags([{align,_}|T], Acc) ->
+    bit_flags(T, Acc);
+bit_flags([non_zero|T], Acc) ->
+    bit_flags(T, Acc);
+bit_flags([U|T], Acc) when is_integer(U) ->
+    bit_flags(T, ["unit:"++integer_to_list(U)|Acc]);
+bit_flags([H|T], Acc) ->
+    bit_flags(T, [atom_to_list(H)|Acc]);
+bit_flags([], []) ->
+    "";
+bit_flags([], Acc) ->
+    "/" ++ bit_flags_1(Acc, "").
+
+bit_flags_1([H|T], Sep) ->
+    Sep ++ H ++ bit_flags_1(T, "-");
+bit_flags_1([], _) -> [].
+
+mk_dest(I) when is_integer(I) ->
+    integer_to_list(I);
+mk_dest(S) -> S.
+
+%% effective_constraint(Type,C)
+%% Type = atom()
+%% C = [C1,...]
+%% C1 = {'SingleValue',SV} | {'ValueRange',VR} | {atom(),term()}
+%% SV = integer() | [integer(),...]
+%% VR = {Lb,Ub}
+%% Lb = 'MIN' | integer()
+%% Ub = 'MAX' | integer()
+%% Returns a single value if C only has a single value constraint, and no
+%% value range constraints, that constrains to a single value, otherwise
+%% returns a value range that has the lower bound set to the lowest value
+%% of all single values and lower bound values in C and the upper bound to
+%% the greatest value.
+effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
+    [C];
+effective_constraint(integer, C) ->
+    SVs = get_constraints(C, 'SingleValue'),
+    SV = effective_constr('SingleValue', SVs),
+    VRs = get_constraints(C, 'ValueRange'),
+    VR = effective_constr('ValueRange', VRs),
+    greatest_common_range(SV, VR);
+effective_constraint(bitstring, C) ->
+    get_constraint(C, 'SizeConstraint').
+
+effective_constr(_, []) -> [];
+effective_constr('SingleValue', List) ->
+    SVList = lists:flatten(lists:map(fun(X) -> element(2, X) end, List)),
+    %% Sort and remove duplicates before generating SingleValue or ValueRange
+    %% In case of ValueRange, also check for 'MIN and 'MAX'
+    case lists:usort(SVList) of
+	[N] ->
+	    [{'SingleValue',N}];
+	[_|_]=L ->
+	    [{'ValueRange',{least_Lb(L),greatest_Ub(L)}}]
+    end;
+effective_constr('ValueRange', List) ->
+    LBs = lists:map(fun({_,{Lb,_}}) -> Lb end, List),
+    UBs = lists:map(fun({_,{_,Ub}}) -> Ub end, List),
+    Lb = least_Lb(LBs),
+    [{'ValueRange',{Lb,lists:max(UBs)}}].
+
+greatest_common_range([], VR) ->
+    VR;
+greatest_common_range(SV, []) ->
+    SV;
+greatest_common_range([{_,Int}], [{_,{'MIN',Ub}}])
+  when is_integer(Int), Int > Ub ->
+    [{'ValueRange',{'MIN',Int}}];
+greatest_common_range([{_,Int}],[{_,{Lb,Ub}}])
+  when is_integer(Int), Int < Lb ->
+    [{'ValueRange',{Int,Ub}}];
+greatest_common_range([{_,Int}],VR=[{_,{_Lb,_Ub}}]) when is_integer(Int) ->
+    VR;
+greatest_common_range([{_,L}],[{_,{Lb,Ub}}]) when is_list(L) ->
+    Min = least_Lb([Lb|L]),
+    Max = greatest_Ub([Ub|L]),
+    [{'ValueRange',{Min,Max}}];
+greatest_common_range([{_,{Lb1,Ub1}}], [{_,{Lb2,Ub2}}]) ->
+    Min = least_Lb([Lb1,Lb2]),
+    Max = greatest_Ub([Ub1,Ub2]),
+    [{'ValueRange',{Min,Max}}].
+
+
+least_Lb(L) ->
+    case lists:member('MIN', L) of
+	true -> 'MIN';
+	false -> lists:min(L)
+    end.
+
+greatest_Ub(L) ->
+    case lists:member('MAX', L) of
+	true -> 'MAX';
+	false -> lists:max(L)
+    end.
+
+get_constraint(C, Key) ->
+    case lists:keyfind(Key, 1, C) of
+	false -> no;
+	{_,V} -> V
+    end.
+
+get_constraints([{Key,_}=Pair|T], Key) ->
+    [Pair|get_constraints(T, Key)];
+get_constraints([_|T], Key) ->
+    get_constraints(T, Key);
+get_constraints([], _) -> [].
diff --git a/lib/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl
index 7301f49085..9e1fcce2b1 100644
--- a/lib/asn1/src/asn1ct_parser2.erl
+++ b/lib/asn1/src/asn1ct_parser2.erl
@@ -924,19 +924,8 @@ parse_UnionsRec([{'|',_}|Rest]) ->
 	{V1,V2} ->
 	    {[V1,union,V2],Rest3}
 	end;
-parse_UnionsRec([{'UNION',_}|Rest]) ->
-    {InterSec,Rest2} = parse_Intersections(Rest),
-    {URec,Rest3} = parse_UnionsRec(Rest2),
-    case {InterSec,URec} of
-	{V1,[]} ->
-	    {V1,Rest3};
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',ordsets:union(to_set(V1),to_set(V2))},Rest3};
-	{V1,V2} when is_list(V2) ->
-	    {[V1] ++ [union|V2],Rest3};
-	{V1,V2} ->
-	    {[V1,union,V2],Rest3}
-	end;
+parse_UnionsRec([{'UNION',Info}|Rest]) ->
+    parse_UnionsRec([{'|',Info}|Rest]);
 parse_UnionsRec(Tokens) ->
     {[],Tokens}.
 
@@ -971,20 +960,8 @@ parse_IElemsRec([{'^',_}|Rest]) ->
 	{V1,V2} ->
 	    {[V1,intersection,V2],Rest3}
     end;
-parse_IElemsRec([{'INTERSECTION',_}|Rest]) ->
-    {InterSec,Rest2} = parse_IntersectionElements(Rest),
-    {IRec,Rest3} = parse_IElemsRec(Rest2),
-    case {InterSec,IRec} of
-	{{'SingleValue',V1},{'SingleValue',V2}} ->
-	    {{'SingleValue',
-	      ordsets:intersection(to_set(V1),to_set(V2))},Rest3};
-	{V1,[]} ->
-	    {V1,Rest3};
-	{V1,V2} when is_list(V2) ->
-	    {[V1] ++ [intersection|V2],Rest3};
-	{V1,V2} ->
-	    {[V1,intersection,V2],Rest3}
-    end;
+parse_IElemsRec([{'INTERSECTION',Info}|Rest]) ->
+    parse_IElemsRec([{'^',Info}|Rest]);
 parse_IElemsRec(Tokens) ->
     {[],Tokens}.
 
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 6057e27b63..389642c446 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -436,11 +436,8 @@ get_encoding_rule(M) ->
 
 open_type_value(ber) ->
     <<4,9,111,112,101,110,95,116,121,112,101>>;
-open_type_value(per) ->
-    <<"\n\topen_type">>;	       %octet string value "open_type"
-%    <<10,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(_) ->
-    [4,9,111,112,101,110,95,116,121,112,101].
+    <<"\n\topen_type">>.	       %octet string value "open_type"
 
 to_textual_order({Root,Ext}) ->
     {to_textual_order(Root),Ext};
diff --git a/lib/asn1/src/asn1rt_per_bin_rt2ct.erl b/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
index 01e1cb23d7..5997232f13 100644
--- a/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
+++ b/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
@@ -22,25 +22,21 @@
 
 -include("asn1_records.hrl").
 
--export([dec_fixup/3]).
+-export([decode_fragmented/3]).
 -export([setchoiceext/1, setext/1, fixoptionals/3, fixextensions/2, 
-	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
--export([getoptionals/2, getoptionals2/2, 
-	 set_choice/3, encode_integer/2, encode_integer/3  ]).
--export([decode_integer/2, decode_integer/3, encode_small_number/1, 
-	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
-	 encode_small_length/1, decode_small_length/1,
+	 skipextensions/3, getbit/1, getchoice/3 ]).
+-export([set_choice/3, encode_integer/2, encode_integer/3  ]).
+-export([encode_small_number/1,
+	 encode_length/2,
+	 encode_small_length/1,
 	 decode_compact_bit_string/3]).
--export([decode_enumerated/3, 
-	 encode_bit_string/3, decode_bit_string/3  ]).
--export([encode_octet_string/2, decode_octet_string/2,
-	 encode_null/1, decode_null/1,
+-export([encode_bit_string/3, decode_bit_string/3  ]).
+-export([encode_octet_string/2,
 	 encode_object_identifier/1, decode_object_identifier/1,
 	 encode_real/1, decode_real/1,
 	 encode_relative_oid/1, decode_relative_oid/1,
 	 complete/1]).
 
-
 -export([encode_open_type/2, decode_open_type/2]).
 
 -export([encode_GeneralString/2, decode_GeneralString/2,
@@ -51,19 +47,10 @@
 	 encode_UTF8String/1,decode_UTF8String/1
 	]).
 
--export([decode_constrained_number/2,
-	 decode_constrained_number/3,
-	 decode_unconstrained_number/1,
-	 decode_semi_constrained_number/2,
-	 encode_unconstrained_number/1,
-	 decode_constrained_number/4,
+-export([encode_unconstrained_number/1,
 	 encode_octet_string/3,
-	 decode_octet_string/3,
 	 encode_known_multiplier_string/5,
-	 decode_known_multiplier_string/5,
-	 getoctets/2, getbits/2
-%	 start_drv/1,start_drv2/1,init_drv/1
-	]).
+	 decode_known_multiplier_string/5]).
 
 
 -export([eint_positive/1]).
@@ -73,20 +60,6 @@
 -define('32K',32768).
 -define('64K',65536).
 
-%%-define(nodriver,true).
-
-dec_fixup(Terms,Cnames,RemBytes) ->
-    dec_fixup(Terms,Cnames,RemBytes,[]).
-
-dec_fixup([novalue|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([{_Name,novalue}|T],[_Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,Acc);
-dec_fixup([H|T],[Hc|Tc],RemBytes,Acc) ->
-    dec_fixup(T,Tc,RemBytes,[{Hc,H}|Acc]);
-dec_fixup([],_Cnames,RemBytes,Acc) ->
-    {lists:reverse(Acc),RemBytes}.
-
 %%--------------------------------------------------------
 %% setchoiceext(InRootSet) -> [{bit,X}]
 %% X  is set to  1 when InRootSet==false
@@ -131,15 +104,6 @@ fixoptionals([Pos|Ot],Val,Acc) ->
     end.
 
 
-getext(Bytes) when is_bitstring(Bytes) ->
-    getbit(Bytes).
-
-getextension(0, Bytes) ->
-    {<<>>,Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    getbits_as_binary(Len,Bytes2).% {Bin,Bytes3}.
-
 fixextensions({ext,ExtPos,ExtNum},Val) ->
     case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
 	0 -> [];
@@ -182,14 +146,6 @@ getchoice(Bytes,_,1) ->
 getchoice(Bytes,NumChoices,0) ->
     decode_constrained_number(Bytes,{0,NumChoices-1}).
 
-%% old version kept for backward compatibility with generates from R7B01
-getoptionals(Bytes,NumOpt) ->
-    getbits_as_binary(NumOpt,Bytes).
-
-%% new version used in generates from r8b_patch/3 and later
-getoptionals2(Bytes,NumOpt) ->
-    {_,_} = getbits(Bytes,NumOpt).
-
 
 %% getbits_as_binary(Num,Bytes) -> {Bin,Rest}
 %% Num = integer(),
@@ -332,32 +288,6 @@ decode_fragmented_bits(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
 	    exit({error,{asn1,{illegal_value,C,BinBits}}})
     end.
 
-
-decode_fragmented_octets(Bin,C) ->
-    decode_fragmented_octets(Bin,C,[]).
-
-decode_fragmented_octets(<<3:2,Len:6,Bin/binary>>,C,Acc) ->
-    {Value,Bin2} = split_binary(Bin,Len * ?'16K'),
-    decode_fragmented_octets(Bin2,C,[Value|Acc]);
-decode_fragmented_octets(<<0:1,0:7,Bin/binary>>,C,Acc) ->
-    Octets = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when is_integer(Int), C == size(Octets) ->
-	    {Octets,Bin};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,Octets}}})
-    end;
-decode_fragmented_octets(<<0:1,Len:7,Bin/binary>>,C,Acc) ->
-    <<Value:Len/binary-unit:8,Bin2/binary>> = Bin,
-    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
-    case C of
-	Int when is_integer(Int),size(BinOctets) == Int ->
-	    {BinOctets,Bin2};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinOctets}}})
-    end.
-
-
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% encode_open_type(Constraint, Value) -> CompleteList
@@ -442,40 +372,6 @@ encode_integer(_,Val) ->
     exit({error,{asn1,{illegal_value,Val}}}).
 
     
-
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,[{Rc,_Ec}]) when is_tuple(Rc) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,[Rc]);
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when is_integer(V) ->
-	    {V,Buffer};
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_Lb,_Ub} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
 %% X.691:10.6 Encoding of a normally small non-negative whole number
 %% Use this for encoding of CHOICE index if there is an extension marker in 
 %% the CHOICE
@@ -495,7 +391,7 @@ decode_small_number(Bytes) ->
 	0 -> 
 	    getbits(Bytes2,6);
 	1 ->
-	    decode_semi_constrained_number(Bytes2,0)
+	    decode_semi_constrained_number(Bytes2)
     end.
 
 %% X.691:10.7 Encoding of a semi-constrained whole number
@@ -518,12 +414,10 @@ encode_semi_constrained_number(Lb,Val) ->
 	    [encode_length(undefined,Len),[21,<<Len:16>>,Oct]]
     end.
 
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
+decode_semi_constrained_number(Bytes) ->
     {Len,Bytes2} = decode_length(Bytes,undefined),
     {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
+    {V,Bytes3}.
 
 encode_constrained_number({Lb,_Ub},_Range,{bits,N},Val) ->
     Val2 = Val-Lb,
@@ -609,13 +503,6 @@ decode_constrained_number(Buffer,VR={Lb,Ub}) ->
     Range = Ub - Lb + 1,
     decode_constrained_number(Buffer,VR,Range).
 
-decode_constrained_number(Buffer,{Lb,_Ub},_Range,{bits,N}) ->
-    {Val,Remain} = getbits(Buffer,N),
-    {Val+Lb,Remain};
-decode_constrained_number(Buffer,{Lb,_Ub},_Range,{octets,N}) ->
-    {Val,Remain} = getoctets(Buffer,N),
-    {Val+Lb,Remain}.
-
 decode_constrained_number(Buffer,{Lb,_Ub},Range) ->
 						%    Val2 = Val - Lb,
     {Val,Remain} = 
@@ -716,23 +603,6 @@ enint(-1, [B1|T]) when B1 > 127 ->
 enint(N, Acc) ->
     enint(N bsr 8, [N band 16#ff|Acc]).
 
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_bin(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_integer(Bin = <<0:1,_:7,_/binary>>) ->  
-    decpint(Bin);
-dec_integer(<<_:1,B:7,BitStr/bitstring>>) ->
-    Size = bit_size(BitStr),
-    <<I:Size>> = BitStr,
-    (-128 + B) bsl bit_size(BitStr) bor I.
-    
-decpint(Bin) ->
-    Size = bit_size(Bin),
-    <<Int:Size>> = Bin,
-    Int.
-
 %% X.691:10.9 Encoding of a length determinant
 %%encode_small_length(undefined,Len) -> % null means no UpperBound
 %%    encode_small_number(Len).
@@ -777,18 +647,6 @@ encode_small_length(Len) ->
     [1,encode_length(undefined,Len)].
 
 
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
 decode_length(Buffer,undefined)  -> % un-constrained
     case align(Buffer) of
 	<<0:1,Oct:7,Rest/binary>> ->
@@ -831,38 +689,6 @@ decode_length(Buffer,SingleValue) when is_integer(SingleValue) ->
     {SingleValue,Buffer}.
 
 
-						% X.691:11
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when is_tuple(Ntup1), is_tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when is_atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when is_atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when is_tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when is_atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
 
 %%===============================================================================
 %%===============================================================================
@@ -1313,49 +1139,74 @@ encode_octet_string(SZ={_,_},false,Val) ->
 %    [encode_length(SZ,length(Val)),align,
 %	     {octets,Val}];
     Len = length(Val),
-    [encode_length(SZ,Len),2,
-     octets_to_complete(Len,Val)];
+    try
+	[encode_length(SZ,Len),2,
+	 octets_to_complete(Len,Val)]
+    catch
+	exit:{error,{asn1,{encode_length,_}}} ->
+	    encode_fragmented_octet_string(Val)
+    end;
 encode_octet_string(SZ,false,Val) when is_list(SZ) ->
     Len = length(Val),
-    [encode_length({hd(SZ),lists:max(SZ)},Len),2,
-     octets_to_complete(Len,Val)];
+    try
+	[encode_length({hd(SZ),lists:max(SZ)},Len),2,
+	 octets_to_complete(Len,Val)]
+    catch
+	exit:{error,{asn1,{encode_length,_}}} ->
+	    encode_fragmented_octet_string(Val)
+    end;
+encode_octet_string(Sv,false,Val) when is_integer(Sv) ->
+    encode_fragmented_octet_string(Val);
 encode_octet_string(no,false,Val) ->
     Len = length(Val),
-    [encode_length(undefined,Len),2,
-     octets_to_complete(Len,Val)];
+    try
+	[encode_length(undefined,Len),2,
+	 octets_to_complete(Len,Val)]
+    catch
+	exit:{error,{asn1,{encode_length,_}}} ->
+	    encode_fragmented_octet_string(Val)
+    end;
 encode_octet_string(C,_,_) ->
     exit({error,{not_implemented,C}}).
 
-
-decode_octet_string(Bytes,Range) ->
-    decode_octet_string(Bytes,Range,false).
-
-decode_octet_string(<<B1,Bytes/bitstring>>,1,false) ->
-%%    {B1,Bytes2} = getbits(Bytes,8),
-    {[B1],Bytes};
-decode_octet_string(<<B1,B2,Bytes/bitstring>>,2,false) ->
-%%    {Bs,Bytes2}= getbits(Bytes,16),
-%%    {binary_to_list(<<Bs:16>>),Bytes2};
-    {[B1,B2],Bytes};
-decode_octet_string(Bytes,Sv,false) when is_integer(Sv),Sv=<65535 ->
-    %%    Bytes2 = align(Bytes),
-    %% getoctets_as_list aligns buffer before it picks octets
-    getoctets_as_list(Bytes,Sv);
-decode_octet_string(Bytes,Sv,false) when is_integer(Sv) ->
-    Bytes2 = align(Bytes),
-    decode_fragmented_octets(Bytes2,Sv);
-decode_octet_string(Bytes,{Lb,Ub},false) ->
-    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-%%    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes2,Len);
-decode_octet_string(Bytes,Sv,false) when is_list(Sv) ->
-    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-%%    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes2,Len);
-decode_octet_string(Bytes,no,false) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-%%    Bytes3 = align(Bytes2),
-    getoctets_as_list(Bytes2,Len).
+encode_fragmented_octet_string(Val) ->
+    Bin = iolist_to_binary(Val),
+    efos_1(Bin).
+
+efos_1(<<B1:16#C000/binary,B2:16#4000/binary,T/binary>>) ->
+    [20,1,<<3:2,4:6>>,
+     octets_to_complete(16#C000, B1),
+     octets_to_complete(16#4000, B2)|efos_1(T)];
+efos_1(<<B:16#C000/binary,T/binary>>) ->
+    [20,1,<<3:2,3:6>>,octets_to_complete(16#C000, B)|efos_1(T)];
+efos_1(<<B:16#8000/binary,T/binary>>) ->
+    [20,1,<<3:2,2:6>>,octets_to_complete(16#8000, B)|efos_1(T)];
+efos_1(<<B:16#4000/binary,T/binary>>) ->
+    [20,1,<<3:2,1:6>>,octets_to_complete(16#4000, B)|efos_1(T)];
+efos_1(<<>>) ->
+    [20,1,0];
+efos_1(<<B/bitstring>>) ->
+    Len = byte_size(B),
+    [encode_length(undefined, Len),octets_to_complete(Len, B)].
+
+decode_fragmented(SegSz0, Buf0, Unit) ->
+    SegSz = SegSz0 * Unit * ?'16K',
+    <<Res:SegSz/bitstring,Buf/bitstring>> = Buf0,
+    decode_fragmented_1(Buf, Unit, Res).
+
+decode_fragmented_1(<<0:1,N:7,Buf0/bitstring>>, Unit, Res) ->
+    Sz = N*Unit,
+    <<S:Sz/bitstring,Buf/bitstring>> = Buf0,
+    {<<Res/bitstring,S/bitstring>>,Buf};
+decode_fragmented_1(<<1:1,0:1,N:14,Buf0/bitstring>>, Unit, Res) ->
+    Sz = N*Unit,
+    <<S:Sz/bitstring,Buf/bitstring>> = Buf0,
+    {<<Res/bitstring,S/bitstring>>,Buf};
+decode_fragmented_1(<<1:1,1:1,SegSz0:6,Buf0/bitstring>>, Unit, Res0) ->
+    SegSz = SegSz0 * Unit * ?'16K',
+    <<Frag:SegSz/bitstring,Buf/bitstring>> = Buf0,
+    Res = <<Res0/bitstring,Frag/bitstring>>,
+    decode_fragmented_1(Buf, Unit, Res).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1543,16 +1394,6 @@ chars_decode2(Bytes,{Min,Max,CharInTab},NumBits,Len,Acc) ->
     chars_decode2(Bytes2,{Min,Max,CharInTab},NumBits,Len -1,[element(Char+1,CharInTab)|Acc]).
 
 
-						% X.691:17 
-encode_null(_Val) -> []. % encodes to nothing
-%encode_null({Name,Val}) when is_atom(Name) ->
-%    encode_null(Val).
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% encode_UTF8String(Val) -> CompleteList
 %% Val -> <<utf8encoded binary>>
diff --git a/lib/asn1/src/asn1rt_uper_bin.erl b/lib/asn1/src/asn1rt_uper_bin.erl
index e1f96416a9..fc65d80245 100644
--- a/lib/asn1/src/asn1rt_uper_bin.erl
+++ b/lib/asn1/src/asn1rt_uper_bin.erl
@@ -25,21 +25,20 @@
 
 %%-compile(export_all).
 
- -export([setext/1, fixoptionals/3, 
+-export([decode_fragmented/3]).
+-export([setext/1, fixoptionals/3,
  	 fixextensions/2, 
- 	 getext/1, getextension/2, skipextensions/3, getbit/1, getchoice/3 ]).
- -export([getoptionals2/2, set_choice/3, encode_integer/2, encode_integer/3  ]).
- -export([decode_integer/2, decode_integer/3, encode_small_number/1, encode_boolean/1, 
- 	 decode_boolean/1, encode_length/2, decode_length/1, decode_length/2,
- 	 encode_small_length/1, decode_small_length/1,
+	 skipextensions/3, getbit/1, getchoice/3 ]).
+-export([set_choice/3, encode_integer/2, encode_integer/3]).
+-export([encode_small_number/1, encode_boolean/1,
+	 encode_length/2,
+	 encode_small_length/1,
  	 decode_compact_bit_string/3]).
- -export([decode_enumerated/3, 
- 	 encode_bit_string/3, decode_bit_string/3  ]).
- -export([encode_octet_string/2, decode_octet_string/2,
-	  encode_null/1, decode_null/1,
-	  encode_relative_oid/1, decode_relative_oid/1,
+-export([encode_bit_string/3, decode_bit_string/3  ]).
+-export([encode_octet_string/2,
+	 encode_relative_oid/1, decode_relative_oid/1,
  	 encode_object_identifier/1, decode_object_identifier/1,
-	  encode_real/1, decode_real/1,
+	 encode_real/1, decode_real/1,
  	 complete/1, complete_NFP/1]).
 
 
@@ -99,16 +98,6 @@ fixoptionals([Pos|Ot],Val,Acc) ->
     end.
 
 
-getext(Bytes) when is_bitstring(Bytes) ->
-    getbit(Bytes).
-
-getextension(0, Bytes) ->
-    {{},Bytes};
-getextension(1, Bytes) ->
-    {Len,Bytes2} = decode_small_length(Bytes),
-    {Blist, Bytes3} = getbits_as_list(Len,Bytes2),
-    {list_to_tuple(Blist),Bytes3}.
-
 fixextensions({ext,ExtPos,ExtNum},Val) ->
     case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
 	0 -> [];
@@ -131,14 +120,15 @@ fixextensions(Pos,ExtPos,Val,Acc) ->
 	  end,
     fixextensions(Pos+1,ExtPos,Val,(Acc bsl 1)+Bit).
 
-skipextensions(Bytes,Nr,ExtensionBitPattern) -> 
-    case (catch element(Nr,ExtensionBitPattern)) of
-	1 ->
+skipextensions(Bytes,Nr,ExtensionBitstr) when is_bitstring(ExtensionBitstr) ->
+    Prev = Nr - 1,
+    case ExtensionBitstr of
+	<<_:Prev,1:1,_/bitstring>> ->
 	    {_,Bytes2} = decode_open_type(Bytes,[]),
-	    skipextensions(Bytes2, Nr+1, ExtensionBitPattern);
-	0 ->
-	    skipextensions(Bytes, Nr+1, ExtensionBitPattern);
-	{'EXIT',_} -> % badarg, no more extensions
+	    skipextensions(Bytes2, Nr+1, ExtensionBitstr);
+	<<_:Prev,0:1,_/bitstring>> ->
+	    skipextensions(Bytes, Nr+1, ExtensionBitstr);
+	_ ->
 	    Bytes
     end.
 
@@ -151,11 +141,6 @@ getchoice(Bytes,NumChoices,0) ->
     decode_constrained_number(Bytes,{0,NumChoices-1}).
 
 
-%%%%%%%%%%%%%%%
-getoptionals2(Bytes,NumOpt) ->
-    getbits(Bytes,NumOpt).
-
-
 %% getbits_as_binary(Num,Bytes) -> {{Unused,BinBits},RestBytes},
 %% Num = integer(),
 %% Bytes = list() | tuple(),
@@ -275,33 +260,6 @@ decode_fragmented_bits(<<0:1,Len:7,BitStr/bitstring>>,C,Acc) ->
 	    exit({error,{asn1,{illegal_value,C,ResBitStr}}})
     end.
 
-
-decode_fragmented_octets({0,Bin},C) ->
-    decode_fragmented_octets(Bin,C,[]).
-
-decode_fragmented_octets(<<3:2,Len:6,BitStr/bitstring>>,C,Acc) ->
-    FragLen = Len * ?'16K',
-    <<Value:FragLen/binary,Rest/bitstring>> = BitStr,
-    decode_fragmented_octets(Rest,C,[Value|Acc]);
-decode_fragmented_octets(<<0:1,0:7,Bin/bitstring>>,C,Acc) ->
-    Octets = list_to_binary(lists:reverse(Acc)),
-    case C of
-	Int when is_integer(Int), C == size(Octets) ->
-	    {Octets,Bin};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,Octets}}})
-    end;
-decode_fragmented_octets(<<0:1,Len:7,BitStr/bitstring>>,C,Acc) ->
-    <<Value:Len/binary-unit:8,BitStr2/binary>> = BitStr,
-    BinOctets = list_to_binary(lists:reverse([Value|Acc])),
-    case C of
-	Int when is_integer(Int),size(BinOctets) == Int ->
-	    {BinOctets,BitStr2};
-	Int when is_integer(Int) ->
-	    exit({error,{asn1,{illegal_value,C,BinOctets}}})
-    end.
-
-
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% encode_open_type(Constraint, Value) -> CompleteList
@@ -384,47 +342,6 @@ encode_integer1(C, Val) ->
 	    exit({error,{asn1,{illegal_value,VR,Val}}})
     end.
 
-decode_integer(Buffer,Range,NamedNumberList) ->
-    {Val,Buffer2} = decode_integer(Buffer,Range),
-    case lists:keysearch(Val,2,NamedNumberList) of
-	{value,{NewVal,_}} -> {NewVal,Buffer2};
-	_ -> {Val,Buffer2}
-    end.
-
-decode_integer(Buffer,[{Rc,_Ec}]) when is_tuple(Rc) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> decode_integer(Buffer2,[Rc]); %% Value in root of constraint
-	1 -> decode_unconstrained_number(Buffer2)
-    end;
-decode_integer(Buffer,undefined) ->
-    decode_unconstrained_number(Buffer);
-decode_integer(Buffer,C) ->
-    case get_constraint(C,'SingleValue') of
-	V when is_integer(V) ->
-	    {V,Buffer};
-	V when is_list(V) ->
-	    {Val,Buffer2} = decode_integer1(Buffer,C),
-	    case lists:member(Val,V) of
-		true ->
-		    {Val,Buffer2};
-		_ -> 
-		    exit({error,{asn1,{illegal_value,Val}}})
-	    end;
-	_ ->
-	    decode_integer1(Buffer,C)
-    end.
-
-decode_integer1(Buffer,C) ->
-    case VR = get_constraint(C,'ValueRange') of
-	no ->
-	    decode_unconstrained_number(Buffer);
-	{Lb, 'MAX'} ->
-	    decode_semi_constrained_number(Buffer,Lb);
-	{_,_} ->
-	    decode_constrained_number(Buffer,VR)
-    end.
-
 %% X.691:10.6 Encoding of a normally small non-negative whole number
 %% Use this for encoding of CHOICE index if there is an extension marker in 
 %% the CHOICE
@@ -441,7 +358,7 @@ decode_small_number(Bytes) ->
 	0 -> 
 	    getbits(Bytes2,6);
 	1 ->
-	    decode_semi_constrained_number(Bytes2,0)
+	    decode_semi_constrained_number(Bytes2)
     end.
 
 %% X.691:10.7 Encoding of a semi-constrained whole number
@@ -465,12 +382,10 @@ encode_semi_constrained_number(Lb,Val) ->
 	    [encode_length(undefined,Size),Bin]
     end.
 
-decode_semi_constrained_number(Bytes,{Lb,_}) ->
-    decode_semi_constrained_number(Bytes,Lb);
-decode_semi_constrained_number(Bytes,Lb) ->
+decode_semi_constrained_number(Bytes) ->
     {Len,Bytes2} = decode_length(Bytes,undefined),
     {V,Bytes3} = getoctets(Bytes2,Len),
-    {V+Lb,Bytes3}.
+    {V,Bytes3}.
 
 encode_constrained_number(Range,{Name,Val}) when is_atom(Name) ->
     encode_constrained_number(Range,Val);
@@ -552,23 +467,6 @@ enint(-1, [B1|T]) when B1 > 127 ->
 enint(N, Acc) ->
     enint(N bsr 8, [N band 16#ff|Acc]).
 
-decode_unconstrained_number(Bytes) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    {Ints,Bytes3} = getoctets_as_bin(Bytes2,Len),
-    {dec_integer(Ints),Bytes3}.
-
-dec_integer(Bin = <<0:1,_:7,_/bitstring>>) ->  
-    decpint(Bin);
-dec_integer(<<_:1,B:7,BitStr/bitstring>>) ->
-    Size = bit_size(BitStr),
-    <<I:Size>> = BitStr,
-    (-128 + B) bsl bit_size(BitStr) bor I.
-    
-decpint(Bin) ->
-    Size = bit_size(Bin),
-    <<Int:Size>> = Bin,
-    Int.
-
 
 %% X.691:10.9 Encoding of a length determinant
 %%encode_small_length(undefined,Len) -> % null means no UpperBound
@@ -583,7 +481,7 @@ encode_length(undefined,Len) -> % un-constrained
 	Len < 16384 ->
 	    <<2:2,Len:14>>;
 	true  -> % should be able to endode length >= 16384
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
+	    error({error,{asn1,{encode_length,{nyi,above_16k}}}})
     end;
 
 encode_length({0,'MAX'},Len) ->
@@ -609,18 +507,6 @@ encode_small_length(Len) ->
     [<<1:1>>,encode_length(undefined,Len)].
 
 
-decode_small_length(Buffer) ->
-    case getbit(Buffer) of
-	{0,Remain} -> 
-	    {Bits,Remain2} = getbits(Remain,6),
-	    {Bits+1,Remain2};
-	{1,Remain} -> 
-	    decode_length(Remain,undefined)
-    end.
-
-decode_length(Buffer) ->
-    decode_length(Buffer,undefined).
-
 %% un-constrained
 decode_length(<<0:1,Oct:7,Rest/bitstring>>,undefined)  ->
     {Oct,Rest};
@@ -663,38 +549,6 @@ encode_boolean({Name,Val}) when is_atom(Name) ->
 encode_boolean(Val) ->
     exit({error,{asn1,{encode_boolean,Val}}}).
 
-decode_boolean(Buffer) -> %when record(Buffer,buffer)
-    case getbit(Buffer) of
-	{1,Remain} -> {true,Remain};
-	{0,Remain} -> {false,Remain}
-    end.
-
-
-%% ENUMERATED with extension marker
-decode_enumerated(Buffer,C,{Ntup1,Ntup2}) when is_tuple(Ntup1), is_tuple(Ntup2) ->
-    {Ext,Buffer2} = getext(Buffer),
-    case Ext of
-	0 -> % not an extension value
-	    {Val,Buffer3} = decode_integer(Buffer2,C),
-	    case catch (element(Val+1,Ntup1)) of
-		NewVal when is_atom(NewVal) -> {NewVal,Buffer3};
-		_Error -> exit({error,{asn1,{decode_enumerated,{Val,[Ntup1,Ntup2]}}}})
-	    end;
-	1 -> % this an extension value
-	    {Val,Buffer3} = decode_small_number(Buffer2),
-	    case catch (element(Val+1,Ntup2)) of
-		NewVal when is_atom(NewVal) -> {NewVal,Buffer3};
-		_ -> {{asn1_enum,Val},Buffer3}
-	    end
-    end;
-
-decode_enumerated(Buffer,C,NamedNumberTup) when is_tuple(NamedNumberTup) ->
-    {Val,Buffer2} = decode_integer(Buffer,C),
-    case catch (element(Val+1,NamedNumberTup)) of
-	NewVal when is_atom(NewVal) -> {NewVal,Buffer2};
-	_Error -> exit({error,{asn1,{decode_enumerated,{Val,NamedNumberTup}}}})
-    end.
-
 
 %%============================================================================
 %%============================================================================
@@ -1053,36 +907,71 @@ encode_octet_string(C,Val) ->
 	    list_to_binary(Val);
 	2 ->
 	    list_to_binary(Val);
-	Sv when Sv =<65535, Sv == length(Val) -> % fixed length
-	    list_to_binary(Val);
-	VR = {_,_}  ->
-	    [encode_length(VR,length(Val)),list_to_binary(Val)];
+	{_,_}=VR  ->
+	    try
+		[encode_length(VR, length(Val)),list_to_binary(Val)]
+	    catch
+		error:{error,{asn1,{encode_length,_}}} ->
+		    encode_fragmented_octet_string(Val)
+	    end;
+	Sv when is_integer(Sv), Sv =:= length(Val) -> % fixed length
+	    if
+		Sv =< 65535 ->
+		    list_to_binary(Val);
+		true ->
+		    encode_fragmented_octet_string(Val)
+	    end;
 	Sv when is_list(Sv) ->
-	    [encode_length({hd(Sv),lists:max(Sv)},length(Val)),list_to_binary(Val)];
+	    try
+		[encode_length({hd(Sv),lists:max(Sv)},
+			       length(Val)),list_to_binary(Val)]
+	    catch
+		error:{error,{asn1,{encode_length,_}}} ->
+		    encode_fragmented_octet_string(Val)
+	    end;
 	no  ->
-	    [encode_length(undefined,length(Val)),list_to_binary(Val)]
+	    try
+		[encode_length(undefined, length(Val)),list_to_binary(Val)]
+	    catch
+		error:{error,{asn1,{encode_length,_}}} ->
+		    encode_fragmented_octet_string(Val)
+	    end
     end.
 
-decode_octet_string(Bytes,C) ->
-    decode_octet_string1(Bytes,get_constraint(C,'SizeConstraint')).
-decode_octet_string1(<<B1,Bytes/bitstring>>,1) ->
-    {[B1],Bytes};
-decode_octet_string1(<<B1,B2,Bytes/bitstring>>,2) ->
-    {[B1,B2],Bytes};
-decode_octet_string1(Bytes,Sv) when is_integer(Sv),Sv=<65535 ->
-    getoctets_as_list(Bytes,Sv);
-decode_octet_string1(Bytes,Sv) when is_integer(Sv) ->
-    decode_fragmented_octets(Bytes,Sv);
-decode_octet_string1(Bytes,{Lb,Ub}) ->
-    {Len,Bytes2} = decode_length(Bytes,{Lb,Ub}),
-    getoctets_as_list(Bytes2,Len);
-decode_octet_string1(Bytes,Sv) when is_list(Sv) ->
-    {Len,Bytes2} = decode_length(Bytes,{hd(Sv),lists:max(Sv)}),
-    getoctets_as_list(Bytes2,Len);
-decode_octet_string1(Bytes,no) ->
-    {Len,Bytes2} = decode_length(Bytes,undefined),
-    getoctets_as_list(Bytes2,Len).
-
+encode_fragmented_octet_string(Val) ->
+    Bin = list_to_binary(Val),
+    efos_1(Bin).
+
+efos_1(<<B:16#10000/binary,T/binary>>) ->
+    [<<3:2,4:6>>,B|efos_1(T)];
+efos_1(<<B:16#C000/binary,T/binary>>) ->
+    [<<3:2,3:6>>,B|efos_1(T)];
+efos_1(<<B:16#8000/binary,T/binary>>) ->
+    [<<3:2,2:6>>,B|efos_1(T)];
+efos_1(<<B:16#4000/binary,T/binary>>) ->
+    [<<3:2,1:6>>,B|efos_1(T)];
+efos_1(<<B/bitstring>>) ->
+    Len = byte_size(B),
+    [encode_length(undefined, Len),B].
+
+decode_fragmented(SegSz0, Buf0, Unit) ->
+    SegSz = SegSz0 * Unit * ?'16K',
+    <<Res:SegSz/bitstring,Buf/bitstring>> = Buf0,
+    decode_fragmented_1(Buf, Unit, Res).
+
+decode_fragmented_1(<<0:1,N:7,Buf0/bitstring>>, Unit, Res) ->
+    Sz = N*Unit,
+    <<S:Sz/bitstring,Buf/bitstring>> = Buf0,
+    {<<Res/bitstring,S/bitstring>>,Buf};
+decode_fragmented_1(<<1:1,0:1,N:14,Buf0/bitstring>>, Unit, Res) ->
+    Sz = N*Unit,
+    <<S:Sz/bitstring,Buf/bitstring>> = Buf0,
+    {<<Res/bitstring,S/bitstring>>,Buf};
+decode_fragmented_1(<<1:1,1:1,SegSz0:6,Buf0/bitstring>>, Unit, Res0) ->
+    SegSz = SegSz0 * Unit * ?'16K',
+    <<Frag:SegSz/bitstring,Buf/bitstring>> = Buf0,
+    Res = <<Res0/bitstring,Frag/bitstring>>,
+    decode_fragmented_1(Buf, Unit, Res).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1427,12 +1316,6 @@ decode_UTF8String(Bytes) ->
     getoctets_as_bin(Bytes2,Len).
     
 
-						% X.691:17 
-encode_null(_) -> []. % encodes to nothing
-
-decode_null(Bytes) ->
-    {'NULL',Bytes}.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% encode_object_identifier(Val) -> CompleteList
 %% encode_object_identifier({Name,Val}) -> CompleteList
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index fd5ea15323..325293f35d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -20,19 +20,10 @@
 
 -module(asn1_SUITE).
 
--define(only_per(Func),
-    if Rule =:= per -> Func;
-       true -> ok
-    end).
 -define(only_ber(Func),
     if Rule =:= ber -> Func;
        true -> ok
     end).
--define(only_uper(Func),
-    case Rule of
-        uper -> Func;
-        _ -> ok
-    end).
 
 -compile(export_all).
 
@@ -62,7 +53,8 @@ groups() ->
     [{compile, parallel([]),
       [c_syntax,
        c_string,
-       c_implicit_before_choice]},
+       c_implicit_before_choice,
+       constraint_equivalence]},
 
      {ber, parallel([]),
       [ber_choiceinseq,
@@ -188,7 +180,6 @@ groups() ->
        testDoubleEllipses,
        test_x691,
        ticket_6143,
-       testExtensionAdditionGroup,
        test_OTP_9688]},
 
      {performance, [],
@@ -321,12 +312,12 @@ testCompactBitString(Config, Rule, Opts) ->
     asn1_test_lib:compile("PrimStrings", Config,
                           [Rule, compact_bit_string|Opts]),
     testCompactBitString:compact_bit_string(Rule),
-    ?only_uper(testCompactBitString:bit_string_unnamed(Rule)),
-    ?only_per(testCompactBitString:bit_string_unnamed(Rule)),
-    ?only_per(testCompactBitString:ticket_7734(Rule)),
-    ?only_per(asn1_test_lib:compile("Constraints", Config,
-                                        [Rule, compact_bit_string|Opts])),
-    ?only_per(testCompactBitString:otp_4869(Rule)).
+    testCompactBitString:bit_string_unnamed(Rule),
+    testCompactBitString:bit_string_unnamed(Rule),
+    testCompactBitString:ticket_7734(Rule),
+    asn1_test_lib:compile("Constraints", Config,
+			  [Rule, compact_bit_string|Opts]),
+    testCompactBitString:otp_4869(Rule).
 
 testPrimStrings(Config) -> test(Config, fun testPrimStrings/3).
 testPrimStrings(Config, Rule, Opts) ->
@@ -439,7 +430,8 @@ testSeqExtension(Config) -> test(Config, fun testSeqExtension/3).
 testSeqExtension(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["External", "SeqExtension"], Config,
                               [Rule|Opts]),
-    testSeqExtension:main(Rule).
+    DataDir = ?config(data_dir, Config),
+    testSeqExtension:main(DataDir, [Rule|Opts]).
 
 testSeqExternal(Config) -> test(Config, fun testSeqExternal/3).
 testSeqExternal(Config, Rule, Opts) ->
@@ -627,11 +619,39 @@ c_implicit_before_choice(Config, Rule, Opts) ->
     {error, _R2} = asn1ct:compile(filename:join(DataDir, "CCSNARG3"),
                                   [Rule, {outdir, CaseDir}|Opts]).
 
+constraint_equivalence(Config) ->
+    DataDir = ?config(data_dir, Config),
+    CaseDir = ?config(case_dir, Config),
+    Asn1Spec = "ConstraintEquivalence",
+    Asn1Src = filename:join(DataDir, Asn1Spec),
+    ok = asn1ct:compile(Asn1Src, [abs,{outdir,CaseDir}]),
+    AbsFile = filename:join(CaseDir, Asn1Spec++".abs"),
+    {ok,Terms} = file:consult(AbsFile),
+    Cs = [begin
+	      'INTEGER' = element(3, Type),	%Assertion.
+	      Constraints = element(4, Type),
+	      Name1 = atom_to_list(Name0),
+	      {Name,_} = lists:splitwith(fun(C) -> C =/= $X end, Name1),
+	      {Name,Constraints}
+	  end || {typedef,_,_,Name0,Type} <- Terms],
+    R = sofs:relation(Cs, [{name,constraint}]),
+    F0 = sofs:relation_to_family(R),
+    F = sofs:to_external(F0),
+    Diff = [E || {_,L}=E <- F, length(L) > 1],
+    case Diff of
+	[] ->
+	    ok;
+	[_|_] ->
+	    io:put_chars("Not equivalent:\n"),
+	    [io:format("~s: ~p\n", [N,D]) || {N,D} <- Diff],
+	    test_server:fail(length(Diff))
+    end.
+
 parse(Config) ->
     [asn1_test_lib:compile(M, Config, [abs]) || M <- test_modules()].
 
 per(Config) ->
-    test(Config, fun per/3, [per]).
+    test(Config, fun per/3, [per,uper]).
 per(Config, Rule, Opts) ->
     [module_test(M, Config, Rule, Opts) || M <- per_modules()].
 
@@ -1063,6 +1083,7 @@ testExtensionAdditionGroup(Config, Rule, Opts) ->
                                  [debug_info]),
     extensionAdditionGroup:run([Rule|Opts]),
     extensionAdditionGroup:run2([Rule|Opts]),
+    extensionAdditionGroup:run3(),
     asn1_test_lib:compile("EUTRA-RRC-Definitions", Config, [Rule, {record_name_prefix, "RRC-"}|Opts]),
     extensionAdditionGroup:run3([Rule|Opts]).
 
diff --git a/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1 b/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
new file mode 100644
index 0000000000..6a97c1b38e
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
@@ -0,0 +1,42 @@
+ConstraintEquivalence DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+ SingleValueX42 ::= INTEGER (42)
+ SingleValueX1 ::= INTEGER ((42) ^ (42))
+ SingleValueX2 ::= INTEGER ((42) INTERSECTION (42))
+ SingleValueX3 ::= INTEGER ((42) | (42))
+ SingleValueX4 ::= INTEGER ((42) UNION (42))
+ SingleValueX5 ::= INTEGER ((42) INTERSECTION (MIN..MAX))
+ SingleValueX6 ::= INTEGER ((42) INTERSECTION (40..49))
+ SingleValueX7 ::= INTEGER (42..42)
+
+ UnconstrainedX0 ::= INTEGER
+ UnconstrainedX1 ::= INTEGER (MIN..MAX)
+ UnconstrainedX2 ::= INTEGER (1|(MIN..MAX))
+ UnconstrainedX3 ::= INTEGER (1..10|(MIN..MAX))
+ UnconstrainedX4 ::= INTEGER ((MIN..MAX)|9|10)
+ UnconstrainedX5 ::= INTEGER ((MIN..MAX)|10..20)
+ UnconstrainedX6 ::= INTEGER ((MIN..MAX) UNION (10..20))
+
+ RangeX00 ::= INTEGER (5..10)
+ RangeX01 ::= INTEGER (4<..<11)
+ RangeX02 ::= INTEGER (5..<11)
+ RangeX03 ::= INTEGER (4<..10)
+ RangeX04 ::= INTEGER (5|6|7|8|9|10)
+ RangeX05 ::= INTEGER (10|9|8|7|6|5)
+ RangeX06 ::= INTEGER (5|6|7..10)
+
+ RangeX10 ::= INTEGER ((5..6) UNION (7..8) UNION (9|10))
+ RangeX11 ::= INTEGER ((5|6) UNION (7..8) UNION (9|10))
+ RangeX12 ::= INTEGER ((5|6) UNION (7|8) UNION (9|10))
+ RangeX13 ::= INTEGER ((5|6) UNION (7) UNION (8..10))
+ RangeX14 ::= INTEGER ((5|6) UNION (7) UNION (8..10))
+ RangeX15 ::= INTEGER ((5|6) UNION (7) UNION ((8..8)|(9..9)|(10)))
+ RangeX16 ::= INTEGER ((5|6) UNION (7) UNION (7<..<11))
+
+ RangeX20 ::= INTEGER (0..20) (5..10)
+ RangeX21 ::= INTEGER (0..10) (5..20)
+ RangeX22 ::= INTEGER (0..10) (5..20) (MIN..MAX)
+ RangeX23 ::= INTEGER ((0..10) INTERSECTION (5..20) ^ (MIN..MAX))
+ RangeX24 ::= INTEGER ((5|6|7|8|9|10) INTERSECTION (5..20) ^ (MIN..MAX))
+
+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
index 55124f9449..b7cc74ab07 100644
--- a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -95,6 +95,27 @@ AS-Config ::=				SEQUENCE {
 	]]
 }
 
+SystemInformationBlockType2 ::= SEQUENCE {
+  timeAlignmentTimerCommon TimeAlignmentTimer,
+  ...,
+  lateNonCriticalExtension OCTET STRING OPTIONAL,
+  [[ ssac-BarringForMMTEL-Voice-r9 AC-BarringConfig OPTIONAL,
+     ssac-BarringForMMTEL-Video-r9 AC-BarringConfig OPTIONAL
+  ]],
+  [[ ac-BarringForCSFB-r10 AC-BarringConfig OPTIONAL
+  ]]
+}
+
+TimeAlignmentTimer ::= ENUMERATED {
+  sf500, sf750, sf1280, sf1920, sf2560, sf5120,
+  sf10240, infinity}
 
+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))
+}
 
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
index d287840f30..9b6b34a776 100644
--- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
@@ -55,6 +55,32 @@ BS1024 ::= BIT STRING (SIZE (1024))
   OsExpCon ::= [60] EXPLICIT OCTET STRING
   OsExpPri ::= [PRIVATE 61] EXPLICIT  OCTET STRING
   OsExpApp ::= [APPLICATION 62] EXPLICIT OCTET STRING
+  OsFrag ::= OCTET STRING (SIZE (0..100000))
+  FixedOs65536 ::= OCTET STRING (SIZE (65536))
+  FixedOs65537 ::= OCTET STRING (SIZE (65537))
+
+  OsFixedStrings ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 OCTET STRING (SIZE (0)),
+    s1 OCTET STRING (SIZE (1)),
+    s2 OCTET STRING (SIZE (2)),
+    s3 OCTET STRING (SIZE (3)),
+    b2 BOOLEAN,  -- Unalign
+    s255 OCTET STRING (SIZE (255)),
+    s256 OCTET STRING (SIZE (256)),
+    s257 OCTET STRING (SIZE (257)),
+    i INTEGER (0..1024)
+  }
+
+  OsAlignment ::= SEQUENCE {
+    b1 BOOLEAN,
+    s1 Os,
+    b2 BOOLEAN,
+    s2 OsFrag,
+    b3 BOOLEAN,
+    s3 FixedOs65536,
+    i INTEGER (0..63)
+  }
 
   Ns ::= NumericString
   NsCon ::= [70] NumericString
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
index bb0a7cca3a..5fda19303a 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
@@ -31,7 +31,35 @@ SeqExt4 ::= SEQUENCE
   int  INTEGER
 }
 
+SeqExt5 ::= SEQUENCE
+{
+  ...,
+  [[ name OCTET STRING (SIZE (1..8)),
+     shoesize INTEGER ]]
+}
+
+SeqExt6 ::= SEQUENCE
+{
+  -- The spaces between the ellipsis and the comma will prevent them
+  -- from being removed.
+  ...     ,
+  [[ i1 [100] INTEGER, i2 [101] INTEGER, i3 [102] INTEGER ]],
+  [[ i4 [104] INTEGER, i5 [105] INTEGER ]],
+  [[ i6 [106] INTEGER, i7 [107] INTEGER ]]
+}
+
 SeqExt1X ::= XSeqExt1 
 SeqExt2X ::= XSeqExt2 
 
+SuperSeq ::= SEQUENCE
+{
+  s1 SeqExt1,
+  s2 SeqExt2,
+  s3 SeqExt3,
+  s4 SeqExt4,
+  s5 SeqExt5,
+  s6 SeqExt6,
+  i INTEGER
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index 5fcec23756..8148381d92 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -130,3 +130,26 @@ run3(Erule) ->
 	_ -> exit({expected,Val, got, Val2})
     end.
 
+run3() ->
+    SI = #'SystemInformationBlockType2'{
+            timeAlignmentTimerCommon = sf500,
+            lateNonCriticalExtension = asn1_NOVALUE,
+            'ssac-BarringForMMTEL-Voice-r9' = asn1_NOVALUE,
+            'ssac-BarringForMMTEL-Video-r9' = asn1_NOVALUE,
+	    'ac-BarringForCSFB-r10' = asn1_NOVALUE},
+    Barring = #'AC-BarringConfig'{
+                 'ac-BarringFactor' = p00,
+                 'ac-BarringTime' = s4,
+                 'ac-BarringForSpecialAC' = [0,0,0,0,0]},
+    roundtrip(SI),
+    roundtrip(SI#'SystemInformationBlockType2'{
+		'ssac-BarringForMMTEL-Voice-r9'=Barring}),
+    roundtrip(SI#'SystemInformationBlockType2'{
+		'ssac-BarringForMMTEL-Video-r9'=Barring}),
+    roundtrip(SI#'SystemInformationBlockType2'{
+		'ac-BarringForCSFB-r10'=Barring}).
+
+roundtrip(V) ->
+    Mod = 'Extension-Addition-Group',
+    {ok,E} = Mod:encode('SystemInformationBlockType2', V),
+    {ok,V} = Mod:decode('SystemInformationBlockType2', iolist_to_binary(E)).
diff --git a/lib/asn1/test/asn1_SUITE_data/testobj.erl b/lib/asn1/test/asn1_SUITE_data/testobj.erl
index 80942f7e38..d9f60ca8a3 100644
--- a/lib/asn1/test/asn1_SUITE_data/testobj.erl
+++ b/lib/asn1/test/asn1_SUITE_data/testobj.erl
@@ -883,7 +883,7 @@ initial_ue_ies() ->
 
 
 cn_domain_indicator() ->
-    {'CN-DomainIndicator', 'ps-domain'}.
+    'ps-domain'.
     
 init_lai() ->
   #'ProtocolIE-Field'{
@@ -1279,11 +1279,11 @@ reset() ->
        protocolIEs = reset_ies()
       }.
 reset_ies() ->
-    {'Reset_protocolIEs', % this identifier is very unneccesary here 
-     [reset_cause(),
-      cn_domain_ind(),     % Se initial Ue
-      init_global_rnc_id() %  ---- " ----
-			     ]}.
+    [reset_cause(),
+     cn_domain_ind(),     % Se initial Ue
+     init_global_rnc_id() %  ---- " ----
+    ].
+
 init_global_rnc_id() ->
   #'ProtocolIE-Field'{
     id = 86,                              % 86 = id-GlobalRNC-ID 
@@ -1323,8 +1323,7 @@ reset_ack() ->
 	   protocolIEs = reset_ack_ies()
 	  }.
 reset_ack_ies() ->
-    {'ResetAcknowledge_protocolIEs', % very unneccesary 
-     [cn_domain_ind()]}.    % Se initial Ue
+    [cn_domain_ind()].    % Se initial Ue
 
 
 
@@ -1336,13 +1335,12 @@ reset_res(IuSCId) ->
 	  }.
 
 reset_res_ies(IuSCId) ->
-    {'ResetResource_protocolIEs', % very unneccesary
-     [
-      cn_domain_ind()       % Se initial Ue
-      ,reset_cause()        % Se reset
-      ,reset_res_list(IuSCId)
-      ,init_global_rnc_id_reset_res() %  ---- " ----
-     ]}.
+    [
+     cn_domain_ind()       % Se initial Ue
+     ,reset_cause()        % Se reset
+     ,reset_res_list(IuSCId)
+     ,init_global_rnc_id_reset_res() %  ---- " ----
+    ].
 
 init_global_rnc_id_reset_res() ->
   #'ProtocolIE-Field'{
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_test.erl
index 2c31c3259d..9dbe1b50e0 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_test.erl
@@ -138,7 +138,8 @@ check_asn1ct_modules(Extra) ->
 		  asn1ct_name,asn1ct_constructed_per,asn1ct_constructed_ber,
 		  asn1ct_gen_ber,asn1ct_constructed_ber_bin_v2,
 		  asn1ct_gen_ber_bin_v2,asn1ct_value,
-		  asn1ct_tok,asn1ct_parser2,asn1ct_table],
+		  asn1ct_tok,asn1ct_parser2,asn1ct_table,
+		  asn1ct_imm],
     case Extra -- ASN1CTMods of
 	[] ->
 	    ok;
diff --git a/lib/asn1/test/testChoExtension.erl b/lib/asn1/test/testChoExtension.erl
index b75cfb6831..067d4d2bf7 100644
--- a/lib/asn1/test/testChoExtension.erl
+++ b/lib/asn1/test/testChoExtension.erl
@@ -25,42 +25,27 @@
 
 
 extension(_Rules) ->
-
-    ?line {ok,Bytes1} = asn1_wrapper:encode('ChoExtension','ChoExt1',{'ChoExt1',{bool,true}}),
-    ?line {ok,{bool,true}} = 
-	asn1_wrapper:decode('ChoExtension','ChoExt1',lists:flatten(Bytes1)),
-
-    ?line {ok,Bytes2} = asn1_wrapper:encode('ChoExtension','ChoExt1',{'ChoExt1',{int,33}}),
-    ?line {ok,{int,33}} = 
-	asn1_wrapper:decode('ChoExtension','ChoExt1',lists:flatten(Bytes2)),
+    roundtrip('ChoExt1', {bool,true}),
+    roundtrip('ChoExt1', {int,33}),
 
     %% A trick to encode with another compatible CHOICE type to test reception
     %% extension alternative
 
-    ?line {ok,Bytes2x} = asn1_wrapper:encode('ChoExtension','ChoExt1x',{str,"abc"}),
-    ?line {ok,Val2x} = 
+    {ok,Bytes2x} = asn1_wrapper:encode('ChoExtension','ChoExt1x',{str,"abc"}),
+    {ok,Val2x} =
 	asn1_wrapper:decode('ChoExtension','ChoExt1',lists:flatten(Bytes2x)),
     io:format("Choice extension alternative = ~p~n",[Val2x]),
 
-    ?line {ok,Bytes3} = asn1_wrapper:encode('ChoExtension','ChoExt2',{'ChoExt2',{bool,true}}),
-    ?line {ok,{bool,true}} =
-	asn1_wrapper:decode('ChoExtension','ChoExt2',lists:flatten(Bytes3)),
-
-    ?line {ok,Bytes4} = asn1_wrapper:encode('ChoExtension','ChoExt2',{'ChoExt2',{int,33}}),
-    ?line {ok,{int,33}} = 
-	asn1_wrapper:decode('ChoExtension','ChoExt2',lists:flatten(Bytes4)),
+    roundtrip('ChoExt2', {bool,true}),
+    roundtrip('ChoExt2', {int,33}),
+    roundtrip('ChoExt3', {bool,true}),
+    roundtrip('ChoExt3', {int,33}),
+    roundtrip('ChoExt4', {str,"abc"}),
 
-    ?line {ok,Bytes5} = asn1_wrapper:encode('ChoExtension','ChoExt3',{'ChoExt3',{bool,true}}),
-    ?line {ok,{bool,true}} = 
-	asn1_wrapper:decode('ChoExtension','ChoExt3',lists:flatten(Bytes5)),
-
-    ?line {ok,Bytes6} = asn1_wrapper:encode('ChoExtension','ChoExt3',{'ChoExt3',{int,33}}),
-    ?line {ok,{int,33}} = 
-	asn1_wrapper:decode('ChoExtension','ChoExt3',lists:flatten(Bytes6)),
-
-    Val7 = {str,"abc"},
-    ?line {ok,Bytes7} = asn1_wrapper:encode('ChoExtension','ChoExt4',Val7),
-    ?line {ok,Val7} = asn1_wrapper:decode('ChoExtension','ChoExt4',lists:flatten(Bytes7)),
+    ok.
 
 
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'ChoExtension':encode(Type, Value),
+    {ok,Value} = 'ChoExtension':decode(Type, Encoded),
     ok.
diff --git a/lib/asn1/test/testChoExternal.erl b/lib/asn1/test/testChoExternal.erl
index b2d171f9c7..5fdee48add 100644
--- a/lib/asn1/test/testChoExternal.erl
+++ b/lib/asn1/test/testChoExternal.erl
@@ -38,62 +38,27 @@ compile(Config, Rules, Optimize) ->
 
 
 external(_Rules) ->
+    roundtrip('ChoXCho', {boolCho,true}),
+    roundtrip('ChoXCho', {intCho,77}),
 
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoExternal','ChoXCho',{'ChoXCho',{boolCho,true}}),
-    ?line {ok,{boolCho,true}} = asn1_wrapper:decode('ChoExternal','ChoXCho',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoExternal','ChoXCho',{'ChoXCho',{intCho,77}}),
-    ?line {ok,{intCho,77}} = asn1_wrapper:decode('ChoExternal','ChoXCho',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoExternal','ChoXBool',{'ChoXBool',{xbool,true}}),
-    ?line {ok,{xbool,true}} = asn1_wrapper:decode('ChoExternal','ChoXBool',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoExternal','ChoXBool',{'ChoXBool',{xboolImp,true}}),
-    ?line {ok,{xboolImp,true}} = asn1_wrapper:decode('ChoExternal','ChoXBool',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoExternal','ChoXBool',{'ChoXBool',{xboolExp,true}}),
-    ?line {ok,{xboolExp,true}} = asn1_wrapper:decode('ChoExternal','ChoXBool',lists:flatten(Bytes23)),
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('ChoExternal','NT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','NT',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('ChoExternal','Exp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','Exp',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('ChoExternal','NTNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','NTNT',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = asn1_wrapper:encode('ChoExternal','NTExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','NTExp',lists:flatten(Bytes34)),
-    
-    ?line {ok,Bytes35} = asn1_wrapper:encode('ChoExternal','ExpNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','ExpNT',lists:flatten(Bytes35)),
-    
-    ?line {ok,Bytes36} = asn1_wrapper:encode('ChoExternal','ExpExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','ExpExp',lists:flatten(Bytes36)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = asn1_wrapper:encode('ChoExternal','XNTNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XNTNT',lists:flatten(Bytes41)),
-    
-    ?line {ok,Bytes42} = asn1_wrapper:encode('ChoExternal','XNTExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XNTExp',lists:flatten(Bytes42)),
-    
-    ?line {ok,Bytes43} = asn1_wrapper:encode('ChoExternal','XExpNT',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XExpNT',lists:flatten(Bytes43)),
-    
-    ?line {ok,Bytes44} = asn1_wrapper:encode('ChoExternal','XExpExp',{os,"kalle"}),
-    ?line {ok,{os,"kalle"}} = asn1_wrapper:decode('ChoExternal','XExpExp',lists:flatten(Bytes44)),
+    roundtrip('ChoXBool', {xbool,true}),
+    roundtrip('ChoXBool', {xboolImp,true}),
+    roundtrip('ChoXBool', {xboolExp,true}),
+
+    roundtrip('NT', {os,"kalle"}),
+    roundtrip('Exp', {os,"kalle"}),
+    roundtrip('NTNT', {os,"kalle"}),
+    roundtrip('NTExp', {os,"kalle"}),
+    roundtrip('ExpNT', {os,"kalle"}),
+    roundtrip('ExpExp', {os,"kalle"}),
+    roundtrip('XNTNT', {os,"kalle"}),
+    roundtrip('XNTExp', {os,"kalle"}),
+    roundtrip('XExpNT', {os,"kalle"}),
+    roundtrip('XExpExp', {os,"kalle"}),
     
     ok.
 
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'ChoExternal':encode(Type, Value),
+    {ok,Value} = 'ChoExternal':decode(Type, Encoded),
+    ok.
diff --git a/lib/asn1/test/testChoRecursive.erl b/lib/asn1/test/testChoRecursive.erl
index 22be26cbce..ee26d124a9 100644
--- a/lib/asn1/test/testChoRecursive.erl
+++ b/lib/asn1/test/testChoRecursive.erl
@@ -28,38 +28,21 @@
 -record('ChoRec2_something',{a, b, c}).
 
 recursive(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoRecursive','ChoRec',{'ChoRec',{something,
-				      #'ChoRec_something'{a = 77,
-							  b = "some octets here",
-							  c = {'ChoRec',{nothing,'NULL'}}}}}),
-    ?line {ok,{something,{'ChoRec_something',77,"some octets here",{nothing,'NULL'}}}} = 
-	   asn1_wrapper:decode('ChoRecursive','ChoRec',lists:flatten(Bytes11)),
-	   
-	   
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoRecursive','ChoRec',{'ChoRec',{nothing,'NULL'}}),
-    ?line {ok,{nothing,'NULL'}} = 
-	asn1_wrapper:decode('ChoRecursive','ChoRec',lists:flatten(Bytes12)),
-	   
-	   
-	   
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('ChoRecursive','ChoRec2',{'ChoRec2',
-					       {something,
-						#'ChoRec2_something'{a = 77,
-								     b = "some octets here",
-								     c = {'ChoRec2',
-									  {nothing,'NULL'}}}}}),
-    ?line {ok,{something,{'ChoRec2_something',77,"some octets here",{nothing,'NULL'}}}} = 
-	   asn1_wrapper:decode('ChoRecursive','ChoRec2',lists:flatten(Bytes21)),
-		  
-		  
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('ChoRecursive','ChoRec2',{'ChoRec2',{nothing,'NULL'}}),
-    ?line {ok,{nothing,'NULL'}} = 
-	asn1_wrapper:decode('ChoRecursive','ChoRec2',lists:flatten(Bytes22)),
-		  
-		  
-		  
-		  
+    roundtrip('ChoRec',
+	      {something,
+	       #'ChoRec_something'{a = 77,
+				   b = "some octets here",
+				   c = {nothing,'NULL'}}}),
+    roundtrip('ChoRec', {nothing,'NULL'}),
+    roundtrip('ChoRec2',
+	      {something,
+	       #'ChoRec2_something'{a = 77,
+				    b = "some octets here",
+				    c = {nothing,'NULL'}}}),
+    roundtrip('ChoRec2', {nothing,'NULL'}),
+    ok.
+
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'ChoRecursive':encode(Type, Value),
+    {ok,Value} = 'ChoRecursive':decode(Type, Encoded),
     ok.
diff --git a/lib/asn1/test/testCompactBitString.erl b/lib/asn1/test/testCompactBitString.erl
index db102a3bda..96d9f0fdcb 100644
--- a/lib/asn1/test/testCompactBitString.erl
+++ b/lib/asn1/test/testCompactBitString.erl
@@ -22,240 +22,132 @@
 -export([compact_bit_string/1, bit_string_unnamed/1,otp_4869/1,
 	 ticket_7734/1]).
 
--include_lib("test_server/include/test_server.hrl").
-
 compact_bit_string(Rules) ->
 
     %%==========================================================
     %% Bs1 ::= BIT STRING
     %%==========================================================
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('PrimStrings','Bs1',0),
-    ?line {ok,{0,<<>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes1)),
-    
-    ?line {ok,Bytes2} = asn1_wrapper:encode('PrimStrings','Bs1',4),
-    ?line {ok,{5,<<32>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes2)),
-    
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PrimStrings','Bs1',15),
-    ?line {ok,{4,<<240>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',
-			    lists:flatten(Bytes3)),
-    
-    ?line {ok,Bytes4} = asn1_wrapper:encode('PrimStrings','Bs1',255),
-    ?line {ok,{0,<<255>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes4)),
-	    
-    ?line {ok,Bytes5} = asn1_wrapper:encode('PrimStrings','Bs1',256),
-    ?line {ok,{7,<<0,128>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes5)),
-    
-    ?line {ok,Bytes6} = asn1_wrapper:encode('PrimStrings','Bs1',257),
-    ?line {ok,{7,<<128,128>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',
-			    lists:flatten(Bytes6)),
-    
-    ?line {ok,Bytes7} = asn1_wrapper:encode('PrimStrings','Bs1',444),
-    ?line {ok,{7,<<61,128>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',
-			    lists:flatten(Bytes7)),
-    
-    ?line {ok,Bytes8} = asn1_wrapper:encode('PrimStrings','Bs1',
-					    12345678901234567890),
-    ?line {ok,_} = asn1_wrapper:decode('PrimStrings','Bs1',
-				       lists:flatten(Bytes8)),
-    
-%% Removed due to beam cannot handle this big integers    
-%%    Bs1_1 = 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
-%%    ?line {ok,Bytes9} = asn1_wrapper:encode('PrimStrings','Bs1',Bs1_1),
-%%    ?line {ok,_} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes9)),
-    
-%%    Bs1_2 = 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
-%%    ?line {ok,Bytes10} = asn1_wrapper:encode('PrimStrings','Bs1',Bs1_2),
-%%    ?line {ok,_} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes10)),
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('PrimStrings','Bs1',
-					     [1,1,1,1,1,1,1,1]),
-    ?line {ok,{0,<<255>>}} = asn1_wrapper:decode('PrimStrings','Bs1',
-						 lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('PrimStrings',
-					     'Bs1',
-					     [0,1,0,0,1,0]),
-    ?line {ok,{2,<<72>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',
-			    lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('PrimStrings', 'Bs1',
-			    [1,0,0,0,0,0,0,0,0]),
-    ?line {ok,{7,<<128,0>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',
-			    lists:flatten(Bytes13)),
-    
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('PrimStrings','Bs1',
-			    [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
-    ?line {ok,{5,<<75,226,96>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes14)),
-    
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line Bytes15 = [35,8,3,2,0,73,3,2,4,32],
-		  ?line {ok,{4,<<73,32>>}} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',
-					  lists:flatten(Bytes15)),
-		  
-		  ?line Bytes16 = [35,9,3,2,0,234,3,3,7,156,0],
-		  ?line {ok,{7,<<234,156,0>>}} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',
-					  lists:flatten(Bytes16)),
-		  
-		  ?line Bytes17 = [35,128,3,2,0,73,3,2,4,32,0,0],
-		  ?line {ok,{4,<<73,32>>}} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',
-					  lists:flatten(Bytes17)),
-		  
-		  ?line Bytes18 = [35,128,3,2,0,234,3,3,7,156,0,0,0],
-		  ?line {ok,{7,<<234,156,0>>}} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',
-					  lists:flatten(Bytes18)),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
+    roundtrip('Bs1', 0, {0,<<>>}),
+    roundtrip('Bs1', 4, {5,<<2#00100000>>}),
+    roundtrip('Bs1', 15, {4,<<2#11110000>>}),
+    roundtrip('Bs1', 255, {0,<<2#11111111>>}),
+    roundtrip('Bs1', 256, {7,<<16#00,16#80>>}),
+    roundtrip('Bs1', 257, {7,<<16#80,16#80>>}),
+    roundtrip('Bs1', 444, {7,<<16#3D,16#80>>}),
+    roundtrip('Bs1', 12345678901234567890,
+	      {0,<<75,80,248,215,49,149,42,213>>}),
+
+    roundtrip('Bs1', [1,1,1,1,1,1,1,1], {0,<<255>>}),
+    roundtrip('Bs1', [0,1,0,0,1,0], {2,<<16#48>>}),
+    roundtrip('Bs1', [1,0,0,0,0,0,0,0,0], {7,<<16#80,0>>}),
+    roundtrip('Bs1', [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1],
+	      {5,<<75,226,96>>}),
     
-    %% The following case to test OTP-4200
-     ?line {ok,Bytes19} = 
-	asn1_wrapper:encode('PrimStrings','Bs1',{0,<<0,0,1,1>>}),
-    ?line {ok,{0,<<0,0,1,1>>}} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes19)),
+    case Rules of
+	ber ->
+	    {ok,{4,<<73,32>>}} =
+		'PrimStrings':decode('Bs1', <<35,8,3,2,0,73,3,2,4,32>>),
+	    {ok,{7,<<234,156,0>>}} =
+		'PrimStrings':decode('Bs1', <<35,9,3,2,0,234,3,3,7,156,0>>),
+	    {ok,{4,<<73,32>>}} =
+		'PrimStrings':decode('Bs1', <<35,128,3,2,0,73,3,2,4,32,0,0>>),
+	    {ok,{7,<<234,156,0>>}} =
+		'PrimStrings':decode('Bs1',
+				     <<35,128,3,2,0,234,3,3,7,156,0,0,0>>);
+	_ ->
+	    ok
+    end,
+
+    %% Test OTP-4200
+    roundtrip('Bs1',  {0,<<0,0,1,1>>}),
 
     %%==========================================================
     %% Bs2 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (7))
     %%==========================================================
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('PrimStrings','Bs2',[mo,tu,fr]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('PrimStrings','Bs2',[0,1,1,0,0,1,0]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs2',lists:flatten(Bytes22)),
-    
-    % ?line case asn1_wrapper:erule(Rules) of
-% 	      ber -> 
-% 		  ?line {ok,[mo,tu,fr,su,mo,th]} = 
-% 		      asn1_wrapper:decode('PrimStrings','Bs2',[35,8,3,2,1,100,3,2,2,200]),
-		  
-% 		  ?line {ok,[mo,tu,fr,su,mo,th]} = 
-% 		      asn1_wrapper:decode('PrimStrings','Bs2',[35,128,3,2,1,100,3,2,2,200,0,0]),
-% 		  ok;
-	      
-% 	      per ->
-% 		  ok
-% 	  end,
-    
-    
+
+    roundtrip('Bs2', [mo,tu,fr]),
+    roundtrip('Bs2', [0,1,1,0,0,1,0], [mo,tu,fr]),
     
     %%==========================================================
     %% Bs3 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..7))
     %%==========================================================
     
-    ?line {ok,Bytes31} = asn1_wrapper:encode('PrimStrings','Bs3',[mo,tu,fr]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('PrimStrings','Bs3',[0,1,1,0,0,1,0]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs3',lists:flatten(Bytes32)),
-    
-    
+    roundtrip('Bs3', [mo,tu,fr]),
+    roundtrip('Bs3', [0,1,1,0,0,1,0], [mo,tu,fr]),
     
     %%==========================================================
     %% BsPri ::= [PRIVATE 61] BIT STRING
     %%==========================================================
-    
-    ?line {ok,Bytes41} = asn1_wrapper:encode('PrimStrings','BsPri',45),
-    ?line {ok,{2,<<180>>}} = 
-	asn1_wrapper:decode('PrimStrings','BsPri',lists:flatten(Bytes41)),
-    
-    ?line {ok,Bytes42} = asn1_wrapper:encode('PrimStrings','BsPri',211),
-    ?line {ok,{0,<<203>>}} = 
-	asn1_wrapper:decode('PrimStrings','BsPri',lists:flatten(Bytes42)),
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,{5,<<75,226,96>>}} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',
-					  [223,61,4,5,75,226,96]),
-		  
-		  ?line {ok,{5,<<75,226,96>>}} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',
-					  [255,61,128,3,4,5,75,226,96,0,0]),
-		  
-		  ?line {ok,{5,<<75,226,96>>}} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',
-					  [255,61,9,3,2,0,75,3,3,5,226,96]),
-		  
-		  ?line {ok,{5,<<75,226,96>>}} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',
-					  [255,61,128,3,2,0,75,3,3,5,226,96,0,0]),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
-    
+
+    roundtrip('BsPri', 45, {2,<<180>>}),
+    roundtrip('BsPri', 211, {0,<<203>>}),
+
+    case Rules of
+	ber ->
+	    {ok,{5,<<75,226,96>>}} =
+		'PrimStrings':decode('BsPri',
+				     <<223,61,4,5,75,226,96>>),
+
+	    {ok,{5,<<75,226,96>>}} =
+		'PrimStrings':decode('BsPri',
+				     <<255,61,128,3,4,5,75,226,96,0,0>>),
+
+	    {ok,{5,<<75,226,96>>}} =
+		'PrimStrings':decode('BsPri',
+				     <<255,61,9,3,2,0,75,3,3,5,226,96>>),
+
+	    {ok,{5,<<75,226,96>>}} =
+		'PrimStrings':decode('BsPri',
+				     <<255,61,128,3,2,0,75,3,3,5,226,96,0,0>>),
+	    ok;
+	_ ->
+	    ok
+    end,
     
     
     %%==========================================================
     %% BsExpPri ::= [PRIVATE 61] EXPLICIT BIT STRING
     %%==========================================================
-    
-    ?line {ok,Bytes51} = asn1_wrapper:encode('PrimStrings','BsExpPri',45),
-    ?line {ok,{2,<<180>>}} = 
-	asn1_wrapper:decode('PrimStrings','BsExpPri',lists:flatten(Bytes51)),
-    
-    ?line {ok,Bytes52} = asn1_wrapper:encode('PrimStrings','BsExpPri',211),
-    ?line {ok,{0,<<203>>}} = 
-	asn1_wrapper:decode('PrimStrings','BsExpPri',lists:flatten(Bytes52)),
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,{5,<<75,226,96>>}} = 
-		      asn1_wrapper:decode('PrimStrings','BsExpPri',[255,61,6,3,4,5,75,226,96]),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
-    
-    ok.
 
-ticket_7734(per) ->
-    ?line BS = {0,list_to_binary(lists:duplicate(128,0))},
-    ?line {ok,BSEnc} = asn1_wrapper:encode('PrimStrings','BS1024',BS),
-    ?line {ok,BS} = asn1_wrapper:decode('PrimStrings','BS1024',BSEnc).
+    roundtrip('BsExpPri', 45, {2,<<180>>}),
+    roundtrip('BsExpPri', 211, {0,<<203>>}),
 
-bit_string_unnamed(Rules) ->
-    case asn1_wrapper:erule(Rules) of
+    case Rules of
 	ber ->
-	    ok;
-	per ->
-	    ?line {ok,Bytes1} = 
-		asn1_wrapper:encode('PrimStrings','TransportLayerAddress',
-				    [0,1,1,0]),
-	    ?line {ok,{4,<<96>>}} = 
-		asn1_wrapper:decode('PrimStrings','TransportLayerAddress',
-				    lists:flatten(Bytes1))
-    end.
+	    {ok,{5,<<75,226,96>>}} =
+		'PrimStrings':decode('BsExpPri', <<255,61,6,3,4,5,75,226,96>>);
+	_ ->
+	    ok
+    end,
 
-otp_4869(per) ->
-    ?line Val1={'IP',[0],{0,<<62,235,90,50,0,0,0,0,0,0,0,0,0,0,0,0>>},asn1_NOVALUE},
-    ?line Val2 = {'IP',[0],[0,0,1,1,1,1,1,0,1,1,1,0,1,0,1,1,0,1,0,1,1,0,1,0,0,0,1,1,0,0,1,0] ++ lists:duplicate(128 - 32,0),asn1_NOVALUE},
+    ok.
+
+ticket_7734(_) ->
+    BS = {0,list_to_binary(lists:duplicate(128, 0))},
+    roundtrip('BS1024', BS).
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Constraints','IP',Val1),
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Constraints','IP',Val2);
+bit_string_unnamed(_Rules) ->
+    roundtrip('TransportLayerAddress', [0,1,1,0], {4,<<96>>}).
+
+otp_4869(per) ->
+    Val1 = {'IP',[0],{0,<<62,235,90,50,0,0,0,0,0,0,0,0,0,0,0,0>>},asn1_NOVALUE},
+    Val2 = {'IP',[0],[0,0,1,1,1,1,1,0,1,1,1,0,1,0,1,1,0,1,0,1,1,0,
+		      1,0,0,0,1,1,0,0,1,0] ++
+	    lists:duplicate(128 - 32, 0),asn1_NOVALUE},
+    {ok,Encoded} = 'Constraints':encode('IP', Val1),
+    {ok,Encoded} = 'Constraints':encode('IP', Val2),
+    ok;
 otp_4869(_) ->
     ok.
+
+roundtrip(Type, Val) ->
+    roundtrip_1('PrimStrings', Type, Val, Val).
+
+roundtrip(Type, Val1, Val2) ->
+    roundtrip_1('PrimStrings', Type, Val1, Val2).
+
+roundtrip_1(Mod, Type, In, Out) ->
+    {ok,Encoded} = Mod:encode(Type, In),
+    {ok,Out} = Mod:decode(Type, Encoded),
+    ok.
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index 543c106e8a..c8d9008641 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -30,59 +30,20 @@ int_constraints(Rules) ->
     %% SingleValue ::=  INTEGER (1) 
     %%==========================================================
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Constraints','SingleValue',1),
-    ?line {ok,1} = asn1_wrapper:decode('Constraints','SingleValue',
-					  lists:flatten(Bytes1)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber ->
-		  ?line {ok,Bytes2} = 
-		      asn1_wrapper:encode('Constraints','SingleValue',0),
-		  ?line {error,{asn1,{integer_range,_,0}}} = 
-		      asn1_wrapper:decode('Constraints','SingleValue',
-					  lists:flatten(Bytes2)),
-		  ?line {ok,Bytes3} = 
-		      asn1_wrapper:encode('Constraints','SingleValue',1000),
-		  ?line {error,{asn1,{integer_range,_,1000}}} = 
-		      asn1_wrapper:decode('Constraints','SingleValue',
-					  lists:flatten(Bytes3));
-	      per ->
-		  ?line {error,_Reason1} =
-		      asn1_wrapper:encode('Constraints','SingleValue',0),
-		  ?line {error,_Reason2} =
-		      asn1_wrapper:encode('Constraints','SingleValue',1000)
-	  end,
+    range_error(Rules, 'SingleValue', 0),
+    roundtrip('SingleValue', 1),
+    range_error(Rules, 'SingleValue', 2),
+    range_error(Rules, 'SingleValue', 1000),
 
     %%==========================================================
     %% SingleValue2 ::=  INTEGER (1..20) 
     %%==========================================================
 
-    ?line {ok,Bytes4} = asn1_wrapper:encode('Constraints','SingleValue2',1),
-    ?line {ok,1} = asn1_wrapper:decode('Constraints','SingleValue2',
-					  lists:flatten(Bytes4)),
-
-    ?line {ok,Bytes5} = asn1_wrapper:encode('Constraints','SingleValue2',20),
-    ?line {ok,20} = asn1_wrapper:decode('Constraints','SingleValue2',
-					  lists:flatten(Bytes5)),
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber ->
-		  ?line {ok,Bytes6} = 
-		      asn1_wrapper:encode('Constraints','SingleValue2',0),
-		  ?line {error,{asn1,{integer_range,{1,20},0}}} = 
-		      asn1_wrapper:decode('Constraints','SingleValue2',
-					  lists:flatten(Bytes6)),
-		  ?line {ok,Bytes7} = 
-		      asn1_wrapper:encode('Constraints','SingleValue2',21),
-		  ?line {error,{asn1,{integer_range,{1,20},21}}} = 
-		      asn1_wrapper:decode('Constraints','SingleValue2',
-					  lists:flatten(Bytes7));
-	      per ->
-		  ?line {error,_Reason3} =
-		      asn1_wrapper:encode('Constraints','SingleValue',0),
-		  ?line {error,_Reason4} =
-		      asn1_wrapper:encode('Constraints','SingleValue',1000)
-	  end,
+    range_error(Rules, 'SingleValue2', 0),
+    roundtrip('SingleValue2', 1),
+    roundtrip('SingleValue2', 20),
+    range_error(Rules, 'SingleValue2', 21),
+    range_error(Rules, 'SingleValue2', 1000),
 
     %%==========================================================
     %% SingleValue3 ::=  INTEGER (Predefined | 5 | 10)
@@ -90,136 +51,106 @@ int_constraints(Rules) ->
     %% where one value is predefined.
     %%==========================================================
 
-    ?line {ok,BytesSV3} = asn1_wrapper:encode('Constraints','SingleValue3',1),
-    ?line {ok,1} = asn1_wrapper:decode('Constraints','SingleValue3',
-                                       lists:flatten(BytesSV3)),
-    ?line {ok,BytesSV3_2} = asn1_wrapper:encode('Constraints','SingleValue3',5),
-    ?line {ok,5} = asn1_wrapper:decode('Constraints','SingleValue3',
-                                       lists:flatten(BytesSV3_2)),
-    ?line {ok,BytesSV3_3} = asn1_wrapper:encode('Constraints','SingleValue3',10),
-    ?line {ok,10} = asn1_wrapper:decode('Constraints','SingleValue3',
-                                        lists:flatten(BytesSV3_3)),
+    roundtrip('SingleValue3', 1),
+    roundtrip('SingleValue3', 5),
+    roundtrip('SingleValue3', 10),
 
     %%==========================================================
     %% Range2to19 ::=  INTEGER (1<..<20) 
     %%==========================================================
 
-    ?line {ok,Bytes8} = asn1_wrapper:encode('Constraints','Range2to19',2),
-    ?line {ok,2} = asn1_wrapper:decode('Constraints','Range2to19',lists:flatten(Bytes8)),
-
-    ?line {ok,Bytes9} = asn1_wrapper:encode('Constraints','Range2to19',19),
-    ?line {ok,19} = asn1_wrapper:decode('Constraints','Range2to19',lists:flatten(Bytes9)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,Bytes10} = 
-		      asn1_wrapper:encode('Constraints','Range2to19',1),
-		  ?line {error,{asn1,{integer_range,{2,19},1}}} = 
-		      asn1_wrapper:decode('Constraints','Range2to19',
-					  lists:flatten(Bytes10)),
-		  ?line {ok,Bytes11} = 
-		      asn1_wrapper:encode('Constraints','Range2to19',20),
-		  ?line {error,{asn1,{integer_range,{2,19},20}}} = 
-		      asn1_wrapper:decode('Constraints','Range2to19',
-					  lists:flatten(Bytes11));
-	      per ->
-		  ?line {error,_Reason5} =
-		      asn1_wrapper:encode('Constraints','Range2to19',1),
-		  ?line {error,_Reason6} =
-		      asn1_wrapper:encode('Constraints','Range2to19',20)
-	  end,
+    range_error(Rules, 'Range2to19', 1),
+    roundtrip('Range2to19', 2),
+    roundtrip('Range2to19', 19),
+    range_error(Rules, 'Range2to19', 20),
 
     %%==========================================================
     %% Tests for Range above 16^4 up to maximum supported by asn1 assuming the
     %% octet length field is encoded on max 8 bits
     %%==========================================================
     LastNumWithoutLengthEncoding = 65536,
-    ?line {ok,BytesFoo} = asn1_wrapper:encode('Constraints','Range256to65536',
-                                              LastNumWithoutLengthEncoding),
-    ?line {ok,LastNumWithoutLengthEncoding} = 
-        asn1_wrapper:decode('Constraints','Range256to65536',lists:flatten(BytesFoo)),
+    roundtrip('Range256to65536', LastNumWithoutLengthEncoding),
 
     FirstNumWithLengthEncoding = 65537,
-    ?line {ok,BytesBar} = asn1_wrapper:encode('LargeConstraints','RangeMax',
-                                              FirstNumWithLengthEncoding),
-    ?line {ok,FirstNumWithLengthEncoding} =
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBar)),
+    roundtrip('LargeConstraints', 'RangeMax', FirstNumWithLengthEncoding),
 
     FirstNumOver16_6 = 16777217,
-    ?line {ok, BytesBaz} =
-        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_6),
-    ?line {ok, FirstNumOver16_6} = 
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBaz)),
+    roundtrip('LargeConstraints', 'RangeMax', FirstNumOver16_6),
     
     FirstNumOver16_8 = 4294967297,
-    ?line {ok, BytesQux} =
-        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_8),
-    ?line {ok, FirstNumOver16_8} = 
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesQux)),
+    roundtrip('LargeConstraints', 'RangeMax', FirstNumOver16_8),
 
     FirstNumOver16_10 = 1099511627776,
-    ?line {ok, BytesBur} =
-        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_10),
-    ?line {ok, FirstNumOver16_10} = 
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBur)),
+    roundtrip('LargeConstraints', 'RangeMax', FirstNumOver16_10),
 
     FirstNumOver16_10 = 1099511627776,
-    ?line {ok, BytesBur} =
-        asn1_wrapper:encode('LargeConstraints','RangeMax', FirstNumOver16_10),
-    ?line {ok, FirstNumOver16_10} =
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesBur)),
+    roundtrip('LargeConstraints', 'RangeMax', FirstNumOver16_10),
 
     HalfMax = 1 bsl (128*8),
-    ?line {ok, BytesHalfMax} =
-        asn1_wrapper:encode('LargeConstraints','RangeMax', HalfMax),
-    ?line {ok, HalfMax} =
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesHalfMax)),
+    roundtrip('LargeConstraints', 'RangeMax', HalfMax),
 
     Max = 1 bsl (255*8),
-    ?line {ok, BytesMax} =
-        asn1_wrapper:encode('LargeConstraints','RangeMax', Max),
-    ?line {ok, Max} =
-        asn1_wrapper:decode('LargeConstraints','RangeMax',lists:flatten(BytesMax)),
+    roundtrip('LargeConstraints', 'RangeMax', Max),
     
     %% Random number within longlong range
     LongLong = 12672809400538808320,
-    ?line {ok, BytesLongLong} =
-        asn1_wrapper:encode('Constraints','LongLong', LongLong),
-    ?line {ok, LongLong} =
-        asn1_wrapper:decode('Constraints','LongLong',lists:flatten(BytesLongLong)),
+    roundtrip('LongLong', LongLong),
 
     %%==========================================================
     %%  Constraint Combinations (Duboisson p. 285)
     %%  I ::= INTEGER (0|15..269)
     %%==========================================================
 
-    ?line {ok,Bytes12} = asn1_wrapper:encode('Constraints','I',0),
-    ?line {ok,0} = asn1_wrapper:decode('Constraints','I',Bytes12),
-    ?line {ok,Bytes13} = asn1_wrapper:encode('Constraints','I',20),
-    ?line {ok,20} = asn1_wrapper:decode('Constraints','I',Bytes13),
+    range_error(Rules, 'I', -1),
+    roundtrip('I', 0),
+    roundtrip('I', 15),
+    roundtrip('I', 20),
+    roundtrip('I', 269),
+    range_error(Rules, 'I', 270),
 
     %%==========================================================
     %%  Constraint Combinations (Duboisson p. 285)
     %%  X1 ::= INTEGER (1..4|8|10|20)
     %%==========================================================
 
-    ?line {ok,Bytes14} = asn1_wrapper:encode('Constraints','X1',1),
-    ?line {ok,1} = asn1_wrapper:decode('Constraints','X1',Bytes14),
-    ?line {ok,Bytes15} = asn1_wrapper:encode('Constraints','X1',20),
-    ?line {ok,20} = asn1_wrapper:decode('Constraints','X1',Bytes15),   
+    range_error(Rules, 'X1', 0),
+    roundtrip('X1', 1),
+    roundtrip('X1', 4),
+    roundtrip('X1', 8),
+    roundtrip('X1', 10),
+    roundtrip('X1', 20),
+    range_error(Rules, 'X1', 21),
+
     %%==========================================================
     %%  SIZE Constraint (Duboisson p. 268)
     %%  T ::=  IA5String (SIZE (1|2, ..., SIZE (1|2|3)))
     %%  T2 ::= IA5String (SIZE (1|2, ..., 3))
     %%==========================================================
 
-    ?line {ok,Bytes16} = asn1_wrapper:encode('Constraints','T',"IA"),
-    ?line {ok,"IA"} = asn1_wrapper:decode('Constraints','T',Bytes16),
-    ?line {ok,Bytes17} = asn1_wrapper:encode('Constraints','T2',"IA"),
-    ?line {ok,"IA"} = asn1_wrapper:decode('Constraints','T2',Bytes17).
-
+    roundtrip('T', "IA"),
+    roundtrip('T2', "IA").
 
 refed_NNL_name(_Erule) ->
     ?line {ok,_} = asn1_wrapper:encode('Constraints','AnotherThing',fred),
     ?line {error,_Reason} = 
 	asn1_wrapper:encode('Constraints','AnotherThing',fred3).
+
+roundtrip(Type, Value) ->
+    roundtrip('Constraints', Type, Value).
+
+roundtrip(Module, Type, Value) ->
+    {ok,Encoded} = Module:encode(Type, Value),
+    {ok,Value} = Module:decode(Type, Encoded),
+    ok.
+
+range_error(ber, Type, Value) ->
+    %% BER: Values outside the effective range should be rejected
+    %% on decode.
+    {ok,Encoded} = 'Constraints':encode(Type, Value),
+    {error,{asn1,{integer_range,_,_}}} = 'Constraints':decode(Type, Encoded),
+    ok;
+range_error(Per, Type, Value) when Per =:= per; Per =:= uper ->
+    %% (U)PER: Values outside the effective range should be rejected
+    %% on encode.
+    {error,_} = 'Constraints':encode(Type, Value),
+    ok.
diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl
index aa3afbb58f..3df7bcbaa0 100644
--- a/lib/asn1/test/testDeepTConstr.erl
+++ b/lib/asn1/test/testDeepTConstr.erl
@@ -26,21 +26,19 @@
 -include_lib("test_server/include/test_server.hrl").
 
 main(_Erule) ->
-    Val1 = {'FilterItem',
-	    {substrings,
-	     {'FilterItem_substrings',
-	      {2,6},
-	      [{initial,"SE"},
-	       {any,"DK"},
-	       {final,"N"}]}}},
+    Val1 = {substrings,
+	    {'FilterItem_substrings',
+	     {2,6},
+	     [{initial,"SE"},
+	      {any,"DK"},
+	      {final,"N"}]}},
 
-    Val2 = {'FilterItem',
-	    {substrings,
-	     {'FilterItem_substrings',
-	      {2,6},
-	      [{initial,"SE"},
-	       {any,"DK"},
-	       {final,"NO"}]}}},
+    Val2 = {substrings,
+	    {'FilterItem_substrings',
+	     {2,6},
+	     [{initial,"SE"},
+	      {any,"DK"},
+	      {final,"NO"}]}},
 
     ?line {ok,Bytes1} = 
 	asn1_wrapper:encode('TConstrChoice','FilterItem',Val1),
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index bb975a1d13..0811f20571 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -25,58 +25,41 @@
 
 main(Rule) when Rule =:= per; Rule =:= uper ->
     io:format("main(~p)~n",[Rule]),
-    B32=[32],B64=[64],
+
     %% ENUMERATED with extensionmark (value is in root set)
-    ?line {ok,B32} = asn1_wrapper:encode('EnumExt','Ext',red),
-    ?line {ok,red} = asn1_wrapper:decode('EnumExt','Ext',B32),
+    B32 = <<32>>,
+    B32 = roundtrip('Ext', red),
 
     %% ENUMERATED with extensionmark (value is an extensionvalue)
-    ?line {ok,Or} = asn1_wrapper:encode('EnumExt','Ext1',orange),
-    ?line {ok,orange} = asn1_wrapper:decode('EnumExt','Ext1',Or),
+    Or = roundtrip('Ext1', orange),
     %% unknown extensionvalue
-    ?line {ok,{asn1_enum,0}} = asn1_wrapper:decode('EnumExt','Ext',Or),
-
+    {ok,{asn1_enum,0}} = asn1_wrapper:decode('EnumExt','Ext',Or),
 
     %% ENUMERATED no extensionmark 
-    ?line {ok,B64} = asn1_wrapper:encode('EnumExt','Noext',red),
-    ?line {ok,red} = asn1_wrapper:decode('EnumExt','Noext',B64),
+    B64 = <<64>>,
+    B64 = roundtrip('Noext', red),
     ok;
 
 main(ber) ->
     io:format("main(ber)~n",[]),
     %% ENUMERATED with extensionmark (value is in root set)
-    ?line {ok,Bytes1} = asn1_wrapper:encode('EnumExt','Ext',red),
-    ?line {ok,red} = asn1_wrapper:decode('EnumExt','Ext',lists:flatten(Bytes1)),
+    roundtrip('Ext', red),
 
     %% value is an extensionvalue
-    ?line {ok,Bytes1_1} = asn1_wrapper:encode('EnumExt','Ext1',orange),
-    ?line {ok,{asn1_enum,7}} = asn1_wrapper:decode('EnumExt','Ext',lists:flatten(Bytes1_1)),
-%%    ?line {ok,Bytes1_1} = asn1_wrapper:encode('EnumExt','Ext',{asn1_enum,7}),
+    {ok,Bytes1_1} = asn1_wrapper:encode('EnumExt','Ext1',orange),
+    {ok,{asn1_enum,7}} = asn1_wrapper:decode('EnumExt','Ext',lists:flatten(Bytes1_1)),
 
-    %% ENUMERATED no extensionmark 
-    ?line {ok,Bytes2} = asn1_wrapper:encode('EnumExt','Noext',red),
-    ?line {ok,red} = asn1_wrapper:decode('EnumExt','Noext',lists:flatten(Bytes2)),
+    %% ENUMERATED no extensionmark
+    roundtrip('Noext', red),
     ?line {error,{asn1,_}} = (catch asn1_wrapper:encode('EnumExt','Noext',orange)),
-%%    ?line {error,{asn1,_}} = (catch asn1_wrapper:encode('EnumExt','Noext',{asn1_enum,7})),
-    ok,
     
     %% ENUMERATED with atom 'com'
-    ?line {ok,Bytes3} = asn1_wrapper:encode('EnumExt','Globalstate',{'Globalstate',preop}),
-    ?line {ok,preop} = asn1_wrapper:decode('EnumExt','Globalstate',
-					   lists:flatten(Bytes3)),
-    ?line {ok,Bytes4} = asn1_wrapper:encode('EnumExt','Globalstate',{'Globalstate',com}),
-    ?line {ok,com} = asn1_wrapper:decode('EnumExt','Globalstate',
-					   lists:flatten(Bytes4)).
-
-
-
-
-
-
-
-
-
-
-
+    roundtrip('Globalstate', preop),
+    roundtrip('Globalstate', com),
 
+    ok.
 
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'EnumExt':encode(Type, Value),
+    {ok,Value} = 'EnumExt':decode(Type, Encoded),
+    Encoded.
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index d63df28c31..8ef7ba3458 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -37,7 +37,7 @@ main(Erule) ->
 
     %% test of RANAP.set.asn1
     ?line _PIEVal = [{'ProtocolIE-Field',4,ignore,{'Cause',{radioNetwork,{'CauseRadioNetwork','rab-pre-empted'}}}}],
-    ?line PIEVal2 = [{'ProtocolIE-Field',4,ignore,{'Cause',{radioNetwork,'rab-pre-empted'}}}],
+    PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
     ?line _PEVal = [{'ProtocolExtensionField',[0]}],
 %%    ?line EncVal = asn1rt_per_v1:encode_integer([],100),
     ?line EncVal = 
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 6f53595132..17108e285b 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -86,7 +86,7 @@ main(Erule) ->
 
 
 ranap(_Erule) ->    
-    ?line PIEVal2 = [{'ProtocolIE-Field',4,ignore,{'Cause',{radioNetwork,'rab-pre-empted'}}}],
+    PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
     ?line Val2 = 
 	#'InitiatingMessage'{procedureCode=1,
 			     criticality=ignore,
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index b1c5172b95..263d9e5ed2 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -338,69 +338,24 @@ octet_string(Rules) ->
 		  ok
 	  end,
 
+    roundtrip('Os', [47,23,99,255,1]),
+    roundtrip('OsCon', [47,23,99,255,1]),
+    roundtrip('OsPri', [47,23,99,255,1]),
+    roundtrip('OsApp', [47,23,99,255,1]),
 
-    
-    ?line {ok,Bytes4} = 
-	asn1_wrapper:encode('PrimStrings','Os',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','Os',lists:flatten(Bytes4)),
-
-    ?line {ok,Bytes5} = 
-	asn1_wrapper:encode('PrimStrings','OsCon',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','OsCon',lists:flatten(Bytes5)),
-
-    ?line {ok,Bytes6} = 
-	asn1_wrapper:encode('PrimStrings','OsPri',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','OsPri',lists:flatten(Bytes6)),
-
-    ?line {ok,Bytes7} = 
-	asn1_wrapper:encode('PrimStrings','OsApp',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','OsApp',lists:flatten(Bytes7)),
-
-    ?line {ok,Bytes8} = 
-	asn1_wrapper:encode('PrimStrings','OsExpCon',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','OsExpCon',lists:flatten(Bytes8)),
-
-    ?line {ok,Bytes9} = 
-	asn1_wrapper:encode('PrimStrings','OsExpPri',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','OsExpPri',lists:flatten(Bytes9)),
-
-    ?line {ok,Bytes10} = 
-	asn1_wrapper:encode('PrimStrings','OsExpApp',[47,23,99,255,1]),
-    ?line {ok,[47,23,99,255,1]} = asn1_wrapper:decode('PrimStrings','OsExpApp',lists:flatten(Bytes10)),
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('PrimStrings','Os',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Os',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('PrimStrings','OsApp',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','OsApp',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('PrimStrings','OsExpApp',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','OsExpApp',lists:flatten(Bytes13)),
-
-
-
-
-
+    roundtrip('OsExpCon', [47,23,99,255,1]),
+    roundtrip('OsExpPri', [47,23,99,255,1]),
+    roundtrip('OsExpApp', [47,23,99,255,1]),
 
+    roundtrip('Os', []),
+    roundtrip('OsApp', []),
+    roundtrip('OsExpApp',[]),
     
     OsR = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
 
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('PrimStrings','Os',OsR),
-    ?line {ok,Os1} = asn1_wrapper:decode('PrimStrings','Os',lists:flatten(Bytes21)),
-    ?line Os1 = OsR,
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('PrimStrings','OsCon',OsR),
-    ?line {ok,Os2} = asn1_wrapper:decode('PrimStrings','OsCon',lists:flatten(Bytes22)),
-    ?line Os2 = OsR,
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('PrimStrings','OsExpApp',OsR),
-    ?line {ok,Os3} = asn1_wrapper:decode('PrimStrings','OsExpApp',lists:flatten(Bytes23)),
-    ?line Os3 = OsR,
-    
+    roundtrip('Os', OsR),
+    roundtrip('OsCon', OsR),
+    roundtrip('OsExpApp', OsR),
 
 
     ?line case asn1_wrapper:erule(Rules) of
@@ -416,21 +371,90 @@ octet_string(Rules) ->
 		  ok
 	  end,
 
+    fragmented_octet_string(Rules),
 
+    S255 = lists:seq(1, 255),
+    FixedStrings = {'OsFixedStrings',true,"","1","12","345",true,
+		    S255,[$a|S255],[$a,$b|S255],397},
+    roundtrip('OsFixedStrings', FixedStrings),
     ok.
     
+fragmented_octet_string(Erules) ->
+    K16 = 1 bsl 14,
+    K32 = K16 + K16,
+    K48 = K32 + K16,
+    K64 = K48 + K16,
+    Lens = [0,1,14,15,16,17,127,128,
+	    K16-1,K16,K16+1,K16+(1 bsl 7)-1,K16+(1 bsl 7),K16+(1 bsl 7)+1,
+	    K32-1,K32,K32+1,K32+(1 bsl 7)-1,K32+(1 bsl 7),K32+(1 bsl 7)+1,
+	    K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
+	    K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
+	    K64+K16-1,K64+K16,K64+K16+1],
+    Types = ['Os','OsFrag'],
+    [fragmented_octet_string(Erules, Types, L) || L <- Lens],
+    fragmented_octet_string(Erules, ['FixedOs65536'], 65536),
+    fragmented_octet_string(Erules, ['FixedOs65537'], 65537),
+
+    %% Make sure that octet alignment works.
+    roundtrip('OsAlignment',
+	      {'OsAlignment',false,make_value(70000),true,make_value(66666),
+	       false,make_value(65536),42}),
+    roundtrip('OsAlignment',
+	      {'OsAlignment',false,make_value(0),true,make_value(0),
+	       false,make_value(65536),42}),
+    ok.
 
+fragmented_octet_string(Erules, Types, L) ->
+    Value = make_value(L),
+    [begin
+	 Encoded = enc_frag(Erules, Type, Value),
+	 {ok,Value} = 'PrimStrings':decode(Type, Encoded)
+     end || Type <- Types],
+    ok.
+
+enc_frag(Erules, Type, Value) ->
+    {ok,Encoded} = 'PrimStrings':encode(Type, Value),
+    case Erules of
+	ber ->
+	    Encoded;
+	_ ->
+	    %% Validate encoding with our own encoder.
+	    Encoded = enc_frag_1(<<>>, list_to_binary(Value))
+    end.
+
+enc_frag_1(Res, Bin0) ->
+    K16 = 1 bsl 14,
+    Sz = byte_size(Bin0),
+    if
+	Sz >= K16 ->
+	    F = min(Sz div K16, 4),
+	    FragSize = F * K16,
+	    <<Frag:FragSize/binary-unit:8,Bin/binary>> = Bin0,
+	    enc_frag_1(<<Res/binary,3:2,F:6,Frag/binary>>, Bin);
+	Sz >= 128 ->
+	    <<Res/binary,1:1,0:1,Sz:14,Bin0/binary>>;
+	true ->
+	    <<Res/binary,0:1,Sz:7,Bin0/binary>>
+    end.
+
+make_value(L) ->
+    make_value(L, 0, []).
+
+make_value(0, _, Acc) ->
+    Acc;
+make_value(N, Byte, Acc) when Byte =< 255 ->
+    make_value(N-1, Byte+7, [Byte|Acc]);
+make_value(N, Byte, Acc) ->
+    make_value(N, Byte band 16#FF, Acc).
 
 
-		       
 numeric_string(Rules) ->
 
     %%==========================================================
     %% Ns ::= NumericString
     %%==========================================================
 
-    ?line {ok,BytesNs2} = asn1_wrapper:encode('PrimStrings','Ns',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Ns',lists:flatten(BytesNs2)),
+    roundtrip('Ns', []),
 
     ?line case asn1_wrapper:erule(Rules) of
 	      ber -> 
@@ -455,10 +479,7 @@ numeric_string(Rules) ->
     %% NsCon ::= [70] NumericString
     %%==========================================================
 
-    ?line {ok,BytesNs12} = asn1_wrapper:encode('PrimStrings','NsCon',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','NsCon',lists:flatten(BytesNs12)),
-
-    
+    roundtrip('NsCon', []),
 
     ?line case asn1_wrapper:erule(Rules) of
 	      ber -> 
@@ -482,10 +503,7 @@ numeric_string(Rules) ->
     %% NsExpCon ::= [71] EXPLICIT NumericString
     %%==========================================================
 
-    ?line {ok,BytesNs22} = asn1_wrapper:encode('PrimStrings','NsExpCon',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','NsExpCon',lists:flatten(BytesNs22)),
-
-    
+    roundtrip('NsExpCon', []),
 
     ?line case asn1_wrapper:erule(Rules) of
 	      ber -> 
@@ -507,9 +525,6 @@ numeric_string(Rules) ->
 
     ok.
 
-
-
-
 		       
 other_strings(_Rules) ->
 
@@ -517,49 +532,27 @@ other_strings(_Rules) ->
     %% Ps ::= PrintableString
     %%==========================================================
 
-    ?line {ok,BytesPs1} = asn1_wrapper:encode('PrimStrings','Ps',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','Ps',lists:flatten(BytesPs1)),
-
-    ?line {ok,BytesPs2} = asn1_wrapper:encode('PrimStrings','Ps',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Ps',lists:flatten(BytesPs2)),
-
+    roundtrip('Ps', [47,23,99,75,47]),
+    roundtrip('Ps', []),
     
 		       
     %%==========================================================
     %% Vis ::= VisibleString
     %%==========================================================
 
-    ?line {ok,BytesVis1} = asn1_wrapper:encode('PrimStrings','Vis',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','Vis',lists:flatten(BytesVis1)),
-
-    ?line {ok,BytesVis2} = asn1_wrapper:encode('PrimStrings','Vis',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Vis',lists:flatten(BytesVis2)),
-    
+    roundtrip('Vis', [47,23,99,75,47]),
+    roundtrip('Vis', []),
 
 		       
     %%==========================================================
     %% IA5 ::= IA5String
     %%==========================================================
 
-    ?line {ok,BytesIA51} = asn1_wrapper:encode('PrimStrings','IA5',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','IA5',lists:flatten(BytesIA51)),
-
-    ?line {ok,BytesIA52} = asn1_wrapper:encode('PrimStrings','IA5',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','IA5',lists:flatten(BytesIA52)),
+    roundtrip('IA5', [47,23,99,75,47]),
+    roundtrip('IA5', []),
 
-    
     IA5_1 = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
-
-    ?line {ok,BytesIA53} = asn1_wrapper:encode('PrimStrings','IA5',IA5_1),
-    ?line {ok,IA5_1r} = asn1_wrapper:decode('PrimStrings','IA5',lists:flatten(BytesIA53)),
-    ?line IA5_1 = IA5_1r,
-
-		       
-    
-
+    roundtrip('IA5', IA5_1),
     ok.
 
 
@@ -568,94 +561,60 @@ more_strings(_Rules) ->
     %% Ts ::= TeletexString
     %%==========================================================
 
-    ?line {ok,BytesTs1} = asn1_wrapper:encode('PrimStrings','Ts',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','Ts',lists:flatten(BytesTs1)),
-    
-    ?line {ok,BytesTs2} = asn1_wrapper:encode('PrimStrings','Ts',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Ts',lists:flatten(BytesTs2)),
-
+    roundtrip('Ts', [47,23,99,75,47]),
+    roundtrip('Ts', []),
 
 		       
     %%==========================================================
     %% Vxs ::= VideotexString
     %%==========================================================
 
-    ?line {ok,BytesVxs1} = asn1_wrapper:encode('PrimStrings','Vxs',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','Vxs',lists:flatten(BytesVxs1)),
-    
-    ?line {ok,BytesVxs2} = asn1_wrapper:encode('PrimStrings','Vxs',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Vxs',lists:flatten(BytesVxs2)),
-
+    roundtrip('Vxs', [47,23,99,75,47]),
+    roundtrip('Vxs', []),
 
     
     %%==========================================================
     %% Grs ::= GraphicString
     %%==========================================================
 
-    ?line {ok,BytesGrs1} = asn1_wrapper:encode('PrimStrings','Grs',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','Grs',lists:flatten(BytesGrs1)),
-		  
-    ?line {ok,BytesGrs2} = asn1_wrapper:encode('PrimStrings','Grs',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Grs',lists:flatten(BytesGrs2)),
+    roundtrip('Grs',[47,23,99,75,47]),
+    roundtrip('Grs', []),
     
 
     %%==========================================================
     %% ODesc ::= ObjectDescriptor, test case for OTP-4161
     %%==========================================================
 
-    ?line {ok,BytesODesc1} = asn1_wrapper:encode('PrimStrings','ODesc',[79,98,106,101,99,116,68,101,115,99,114,105,112,116,111,114]),
-    ?line {ok,[79,98,106,101,99,116,68,101,115,99,114,105,112,116,111,114]} = 
-	asn1_wrapper:decode('PrimStrings','ODesc',lists:flatten(BytesODesc1)),
-		  
-    ?line {ok,BytesODesc2} = asn1_wrapper:encode('PrimStrings','ODesc',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','ODesc',lists:flatten(BytesODesc2)),
+    roundtrip('ODesc', [79,98,106,101,99,116,68,101,115,99,114,
+			105,112,116,111,114]),
+    roundtrip('ODesc', []),
 		       
     %%==========================================================
     %% Ges ::= GeneralString
     %%==========================================================
 
-    ?line {ok,BytesGes1} = asn1_wrapper:encode('PrimStrings','Ges',[47,23,99,75,47]),
-    ?line {ok,[47,23,99,75,47]} = 
-	asn1_wrapper:decode('PrimStrings','Ges',lists:flatten(BytesGes1)),
-    
-    ?line {ok,BytesGes2} = asn1_wrapper:encode('PrimStrings','Ges',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Ges',lists:flatten(BytesGes2)),
-    
-    ok.
+    roundtrip('Ges', [47,23,99,75,47]),
+    roundtrip('Ges', []),
 
+    ok.
 
 		       
 universal_string(Rules) ->
     
-    
     %%==========================================================
     %% Us ::= UniversalString
     %%==========================================================
     
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('PrimStrings','Us',[{47,23,99,47},{0,0,55,66}]),
-    ?line {ok,[{47,23,99,47},{0,0,55,66}]} = 
-	asn1_wrapper:decode('PrimStrings','Us',lists:flatten(Bytes1)),
+    roundtrip('Us', [{47,23,99,47},{0,0,55,66}]),
     
     ?line {ok,Bytes2} = 
 	asn1_wrapper:encode('PrimStrings','Us',[{47,23,99,255},{0,0,0,201}]),
     ?line {ok,[{47,23,99,255},201]} = 
 	asn1_wrapper:decode('PrimStrings','Us',lists:flatten(Bytes2)),
     
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PrimStrings','Us',"Universal String"),
-    ?line {ok,"Universal String"} = 
-	asn1_wrapper:decode('PrimStrings','Us',lists:flatten(Bytes3)),
-    
-    ?line {ok,Bytes4} = asn1_wrapper:encode('PrimStrings','Us',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Us',lists:flatten(Bytes4)),
-    
-    ?line {ok,Bytes5} = asn1_wrapper:encode('PrimStrings','Us',[{47,23,99,47}]),
-    ?line {ok,[{47,23,99,47}]} = 
-	asn1_wrapper:decode('PrimStrings','Us',lists:flatten(Bytes5)),
-
+    roundtrip('Us', "Universal String"),
+    roundtrip('Us', []),
+    roundtrip('Us', [{47,23,99,47}]),
     
     ?line case asn1_wrapper:erule(Rules) of
 	      ber -> 
@@ -670,32 +629,22 @@ universal_string(Rules) ->
 
 
     Us1 = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
-    ?line {ok,Bytes15} = asn1_wrapper:encode('PrimStrings','IA5',Us1),
-    ?line {ok,Us1r} = asn1_wrapper:decode('PrimStrings','IA5',lists:flatten(Bytes15)),
-    ?line Us1 = Us1r,
-
+    roundtrip('IA5', Us1),
 
 
 %%==========================================================
 %% UsCon ::= [70] UniversalString
 %%==========================================================
 
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('PrimStrings','UsCon',[{47,23,99,255},{0,0,2,201}]),
-    ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-	asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten(Bytes11)),
+    roundtrip('UsCon', [{47,23,99,255},{0,0,2,201}]),
     
     ?line {ok,Bytes12} = 
 	asn1_wrapper:encode('PrimStrings','UsCon',[{47,23,99,255},{0,0,0,201}]),
     ?line {ok,[{47,23,99,255},201]} = 
 	asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten(Bytes12)),
     
-    ?line {ok,Bytes13} = asn1_wrapper:encode('PrimStrings','UsCon',"Universal String"),
-    ?line {ok,"Universal String"} = 
-	asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = asn1_wrapper:encode('PrimStrings','UsCon',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten(Bytes14)),
+    roundtrip('UsCon', "Universal String"),
+    roundtrip('UsCon', []),
     
     ?line case asn1_wrapper:erule(Rules) of
 	      ber -> 
@@ -712,25 +661,15 @@ universal_string(Rules) ->
 %% UsExpCon ::= [71] EXPLICIT UniversalString
 %%==========================================================
 
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('PrimStrings','UsExpCon',[{47,23,99,255},{0,0,2,201}]),
-    ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-	asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten(Bytes21)),
+    roundtrip('UsExpCon', [{47,23,99,255},{0,0,2,201}]),
     
     ?line {ok,Bytes22} = 
 	asn1_wrapper:encode('PrimStrings','UsExpCon',[{47,23,99,255},{0,0,0,201}]),
     ?line {ok,[{47,23,99,255},201]} = 
 	asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten(Bytes22)),
     
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('PrimStrings','UsExpCon',"Universal String"),
-    ?line {ok,"Universal String"} = 
-	asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = 
-	asn1_wrapper:encode('PrimStrings','UsExpCon',[]),
-    ?line {ok,[]} = 
-	asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten(Bytes24)),
+    roundtrip('UsExpCon', "Universal String"),
+    roundtrip('UsExpCon', []),
     
     ?line case asn1_wrapper:erule(Rules) of
 	      ber ->     
@@ -740,12 +679,8 @@ universal_string(Rules) ->
 		      asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten([16#BF,16#47,16,60,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0]));
 	      _ -> ok
 	  end,
-    
-
-ok.
-
-
 
+    ok.
 
 		       
 bmp_string(_Rules) ->
@@ -754,29 +689,18 @@ bmp_string(_Rules) ->
     %% BMP ::= BMPString
     %%==========================================================
 
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('PrimStrings','BMP',[{0,0,99,48},{0,0,2,201}]),
-    ?line {ok,[{0,0,99,48},{0,0,2,201}]} = 
-	asn1_wrapper:decode('PrimStrings','BMP',lists:flatten(Bytes1)),
+    roundtrip('BMP', [{0,0,99,48},{0,0,2,201}]),
     
     ?line {ok,Bytes2} = 
 	asn1_wrapper:encode('PrimStrings','BMP',[{0,0,0,48},{0,0,2,201}]),
     ?line {ok,[48,{0,0,2,201}]} = 
 	asn1_wrapper:decode('PrimStrings','BMP',lists:flatten(Bytes2)),
-    
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PrimStrings','BMP',"BMP String"),
-    ?line {ok,"BMP String"} = 
-	asn1_wrapper:decode('PrimStrings','BMP',lists:flatten(Bytes3)),
-    
-    ?line {ok,Bytes4} = asn1_wrapper:encode('PrimStrings','BMP',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','BMP',lists:flatten(Bytes4)),
 
+    roundtrip('BMP', "BMP String"),
+    roundtrip('BMP', []),
 
     BMP1 = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
-    ?line {ok,Bytes5} = asn1_wrapper:encode('PrimStrings','BMP',BMP1),
-    ?line {ok,BMP1r} = asn1_wrapper:decode('PrimStrings','BMP',lists:flatten(Bytes5)),
-    ?line BMP1 = BMP1r,
-		       
+    roundtrip('BMP', BMP1),
 		     
     ok.
 
@@ -790,35 +714,17 @@ times(_Rules) ->
     %% Gt ::= GeneralizedTime
     %%==========================================================
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('PrimStrings','Gt',"19970923110723.2"),
-    ?line {ok,"19970923110723.2"} = 
-	asn1_wrapper:decode('PrimStrings','Gt',lists:flatten(Bytes1)),
+    roundtrip('Gt', "19970923110723.2"),
+    roundtrip('Gt', "19970923110723.2Z"),
+    roundtrip('Gt', "19970923110723.2-0500"),
 
-    ?line {ok,Bytes2} = asn1_wrapper:encode('PrimStrings','Gt',"19970923110723.2Z"),
-    ?line {ok,"19970923110723.2Z"} = 
-	asn1_wrapper:decode('PrimStrings','Gt',lists:flatten(Bytes2)),
-
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PrimStrings','Gt',"19970923110723.2-0500"),
-    ?line {ok,"19970923110723.2-0500"} = 
-	asn1_wrapper:decode('PrimStrings','Gt',lists:flatten(Bytes3)),
-
-
-    
-    
-
-		       
 
     %%==========================================================
     %% UTC ::= UTCTime
     %%==========================================================
 
-    ?line {ok,Bytes11} = asn1_wrapper:encode('PrimStrings','UTC',"9709211107Z"),
-    ?line {ok,"9709211107Z"} = 
-	asn1_wrapper:decode('PrimStrings','UTC',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = asn1_wrapper:encode('PrimStrings','UTC',"9709211107-0500"),
-    ?line {ok,"9709211107-0500"} = 
-	asn1_wrapper:decode('PrimStrings','UTC',lists:flatten(Bytes12)),    
+    roundtrip('UTC', "9709211107Z"),
+    roundtrip('UTC', "9709211107-0500"),
 
     ok.
 
@@ -917,3 +823,8 @@ wrapper_utf8_binary_to_list(L) when is_list(L) ->
     asn1rt:utf8_binary_to_list(list_to_binary(L));
 wrapper_utf8_binary_to_list(B) ->
     asn1rt:utf8_binary_to_list(B).
+
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'PrimStrings':encode(Type, Value),
+    {ok,Value} = 'PrimStrings':decode(Type, Encoded),
+    ok.
diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl
index 7c77ab87e9..1128d9a7c3 100644
--- a/lib/asn1/test/testSeqExtension.erl
+++ b/lib/asn1/test/testSeqExtension.erl
@@ -20,7 +20,7 @@
 -module(testSeqExtension).
 
 -include("External.hrl").
--export([main/1]).
+-export([main/2]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -28,70 +28,73 @@
 -record('SeqExt2',{bool, int}).
 -record('SeqExt3',{bool, int}).
 -record('SeqExt4',{bool, int}).
-
-
-main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt1',#'SeqExt1'{}), 
-    ?line {ok,{'SeqExt1'}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt1',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt2',#'SeqExt2'{bool = true,int = 99}), 
-    ?line {ok,{'SeqExt2',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt2',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt2',#'SeqExt2'{int = 99,bool = true}), 
-    ?line {ok,{'SeqExt2',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt2',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt3',#'SeqExt3'{bool = true,int = 99}), 
-    ?line {ok,{'SeqExt3',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt3',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt3',#'SeqExt3'{int = 99,bool = true}), 
-    ?line {ok,{'SeqExt3',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt3',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt4',#'SeqExt4'{bool = true,int = 99}), 
-    ?line {ok,{'SeqExt4',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt4',lists:flatten(Bytes41)),
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt4',#'SeqExt4'{int = 99,bool = true}), 
-    ?line {ok,{'SeqExt4',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt4',lists:flatten(Bytes42)),
-
-
-    % test of extension , not ready
-    
-     ?line {ok,BytesX11} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt1',#'SeqExt1'{}), 
-    ?line {ok,{'SeqExt1'}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt1',lists:flatten(BytesX11)),
-
-    ?line {ok,BytesX21} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt2',#'SeqExt2'{bool = true,int = 99}), 
-    ?line {ok,{'SeqExt2',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt2',lists:flatten(BytesX21)),
-
-    ?line {ok,BytesX22} = 
-	asn1_wrapper:encode('SeqExtension','SeqExt2',#'SeqExt2'{int = 99,bool = true}), 
-    ?line {ok,{'SeqExt2',true,99}} = 
-	asn1_wrapper:decode('SeqExtension','SeqExt2',lists:flatten(BytesX22)),
-
-   
-    
-     
-
+-record('SeqExt5',{name, shoesize}).
+-record('SeqExt6',{i1,i2,i3,i4,i5,i6,i7}).
+-record('SuperSeq',{s1,s2,s3,s4,s5,s6,i}).
+
+main(DataDir, Opts) ->
+    roundtrip('SeqExt1', #'SeqExt1'{}),
+
+    roundtrip('SeqExt2', #'SeqExt2'{bool=true,int=99}),
+    roundtrip('SeqExt2', #'SeqExt2'{bool=false,int=42}),
+
+    roundtrip('SeqExt3', #'SeqExt3'{bool=true,int=-77777}),
+    roundtrip('SeqExt3', #'SeqExt3'{bool=false,int=-42000}),
+
+    roundtrip('SeqExt4', #'SeqExt4'{bool=true,int=12345}),
+    roundtrip('SeqExt4', #'SeqExt4'{bool=false,int=123456}),
+
+    roundtrip('SeqExt5', #'SeqExt5'{name="Arne",shoesize=47}),
+
+    %% Encode a value with this version of the specification.
+    BigInt = 128638468966,
+    SuperSeq = #'SuperSeq'{s1=#'SeqExt1'{},
+			   s2=#'SeqExt2'{bool=true,int=2345},
+			   s3=#'SeqExt3'{bool=false,int=17},
+			   s4=#'SeqExt4'{bool=true,int=38739739},
+			   s5=#'SeqExt5'{name="Arne",shoesize=47},
+			   s6=#'SeqExt6'{i1=531,i2=601,i3=999,
+					 i4=777,i5=11953,
+					 i6=13553,i7=77777},
+			   i=BigInt
+			  },
+    {ok,SuperSeqEnc} = 'SeqExtension':encode('SuperSeq', SuperSeq),
+    {ok,SuperSeq} = 'SeqExtension':decode('SuperSeq', SuperSeqEnc),
+
+    %% Remove all extensions from the ASN.1 specification and compile it.
+    CaseDir = filename:dirname(code:which('SeqExtension')),
+    Asn1SrcBase = "SeqExtension.asn1",
+    Asn1SrcFile0 = filename:join(DataDir, Asn1SrcBase),
+    {ok,Src0} = file:read_file(Asn1SrcFile0),
+    %% Remove all declarations following "...," up to the end
+    %% of the SEQUENCE.
+    Src1 = re:replace(Src0, "[.][.][.],[^}]*", "...\n",
+		      [global,{return,binary}]),
+    %% Remove the last double bracket group in the SEQUENCE.
+    Src = re:replace(Src1, ",\\s*\\[\\[.*?\\]\\]\\s*\\}", "\n}",
+		     [global,{return,binary}]),
+    io:format("~s\n\n", [Src]),
+    Asn1SrcFile = filename:join(CaseDir, Asn1SrcBase),
+    ok = file:write_file(Asn1SrcFile, Src),
+    ok = asn1ct:compile(Asn1SrcFile,
+			[{i,DataDir},{outdir,CaseDir}|Opts]),
+
+    %% Decode the encoded sequence with the version of the spec
+    %% with no extensions following the extension marks
+    %% (except in SeqExt6). The integer 'i' at the end
+    %% of the sequence must still be the correct integer (otherwise
+    %% some extension has not been skipped correctly).
+    {ok,DecodedSuperSeq} = 'SeqExtension':decode('SuperSeq', SuperSeqEnc),
+    #'SuperSeq'{s1={'SeqExt1'},
+		s2=#'SeqExt2'{bool=true,int=2345},
+		s3={'SeqExt3'},
+		s4={'SeqExt4',true},
+		s5={'SeqExt5'},
+		s6={'SeqExt6',531,601,999,777,11953},
+		i=BigInt} = DecodedSuperSeq,
     ok.
 
-
-
-
-
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'SeqExtension':encode(Type, Value),
+    {ok,Value} = 'SeqExtension':decode(Type, Encoded),
+    ok.
diff --git a/lib/asn1/test/testSetOptional.erl b/lib/asn1/test/testSetOptional.erl
index cef90bc843..bb43ff0a96 100644
--- a/lib/asn1/test/testSetOptional.erl
+++ b/lib/asn1/test/testSetOptional.erl
@@ -21,8 +21,7 @@
 
 -include("External.hrl").
 -export([main/1]).
--export([ticket_7533/1,decoder/4]).
--include_lib("test_server/include/test_server.hrl").
+-export([ticket_7533/1]).
 
 -record('SetOpt1',{bool1 = asn1_NOVALUE, int1, set1 = asn1_NOVALUE}).
 -record('SetOpt1Imp',{bool1 = asn1_NOVALUE, int1, set1 = asn1_NOVALUE}).
@@ -36,171 +35,64 @@
 -record('SetIn',{boolIn, intIn}).
 
 main(_Rules) ->
+    roundtrip('SetOpt1',
+	      #'SetOpt1'{bool1=true,int1=15,
+			 set1=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt1', #'SetOpt1'{int1=15}),
+
+    roundtrip('SetOpt2', #'SetOpt2'{bool2=true,int2=15,
+				    set2=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt2', #'SetOpt2'{int2=15,bool2=true}),
+
+    roundtrip('SetOpt3', #'SetOpt3'{bool3=true,int3=15,
+				    set3=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt3', #'SetOpt3'{int3=15}),
+
+    roundtrip('SetOpt1Imp',
+	      #'SetOpt1Imp'{bool1=true,int1 = 15,
+			    set1=#'SetIn'{boolIn = true,intIn = 66}}),
+    roundtrip('SetOpt1Imp', #'SetOpt1Imp'{int1=15}),
     
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOptional','SetOpt1',#'SetOpt1'{bool1 = true,
-							int1 = 15,
-							set1 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetOpt1',true,15,{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('SetOptional','SetOpt1',#'SetOpt1'{int1 = 15}), 
-    ?line {ok,{'SetOpt1',asn1_NOVALUE,15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt1',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOptional','SetOpt2',#'SetOpt2'{bool2 = true,
-							int2 = 15,
-							set2 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetOpt2',{'SetIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('SetOptional','SetOpt2',#'SetOpt2'{int2 = 15,
-									  bool2 = true}), 
-    ?line {ok,{'SetOpt2',asn1_NOVALUE,true,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOptional','SetOpt3',#'SetOpt3'{bool3 = true,
-							int3 = 15,
-							set3 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetOpt3',true,{'SetIn',true,66},15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('SetOptional','SetOpt3',#'SetOpt3'{int3 = 15}), 
-    ?line {ok,{'SetOpt3',asn1_NOVALUE,asn1_NOVALUE,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt3',lists:flatten(Bytes32)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetOptional','SetOpt1Imp',#'SetOpt1Imp'{bool1 = true,
-							      int1 = 15,
-							      set1 = #'SetIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetOpt1Imp',true,15,{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt1Imp',lists:flatten(Bytes41)),
-    
-    
-    ?line {ok,Bytes42} = asn1_wrapper:encode('SetOptional','SetOpt1Imp',#'SetOpt1Imp'{int1 = 15}), 
-    ?line {ok,{'SetOpt1Imp',asn1_NOVALUE,15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt1Imp',lists:flatten(Bytes42)),
-    
-    
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SetOptional','SetOpt2Imp',#'SetOpt2Imp'{bool2 = true,
-							      int2 = 15,
-							      set2 = #'SetIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetOpt2Imp',{'SetIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt2Imp',lists:flatten(Bytes51)),
-    
-    
-    ?line {ok,Bytes52} = asn1_wrapper:encode('SetOptional','SetOpt2Imp',#'SetOpt2Imp'{int2 = 15,
-									        bool2 = true}), 
-    ?line {ok,{'SetOpt2Imp',asn1_NOVALUE,true,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt2Imp',lists:flatten(Bytes52)),
-    
-    
-    
-    ?line {ok,Bytes61} = 
-	asn1_wrapper:encode('SetOptional','SetOpt3Imp',#'SetOpt3Imp'{bool3 = true,
-							      int3 = 15,
-							      set3 = #'SetIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetOpt3Imp',true,{'SetIn',true,66},15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt3Imp',lists:flatten(Bytes61)),
-    
-    
-    ?line {ok,Bytes62} = asn1_wrapper:encode('SetOptional','SetOpt3Imp',#'SetOpt3Imp'{int3 = 15}), 
-    ?line {ok,{'SetOpt3Imp',asn1_NOVALUE,asn1_NOVALUE,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt3Imp',lists:flatten(Bytes62)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes71} = 
-	asn1_wrapper:encode('SetOptional','SetOpt1Exp',#'SetOpt1Exp'{bool1 = true,
-							      int1 = 15,
-							      set1 = #'SetIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetOpt1Exp',true,15,{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt1Exp',lists:flatten(Bytes71)),
-    
-    
-    ?line {ok,Bytes72} = asn1_wrapper:encode('SetOptional','SetOpt1Exp',#'SetOpt1Exp'{int1 = 15}), 
-    ?line {ok,{'SetOpt1Exp',asn1_NOVALUE,15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt1Exp',lists:flatten(Bytes72)),
-    
-    
-    ?line {ok,Bytes81} = 
-	asn1_wrapper:encode('SetOptional','SetOpt2Exp',#'SetOpt2Exp'{bool2 = true,
-							      int2 = 15,
-							      set2 = #'SetIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetOpt2Exp',{'SetIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt2Exp',lists:flatten(Bytes81)),
-    
-    
-    ?line {ok,Bytes82} = asn1_wrapper:encode('SetOptional','SetOpt2Exp',#'SetOpt2Exp'{int2 = 15,
-									       bool2 = true}), 
-    ?line {ok,{'SetOpt2Exp',asn1_NOVALUE,true,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt2Exp',lists:flatten(Bytes82)),
-    
-    
-    
-    ?line {ok,Bytes91} = 
-	asn1_wrapper:encode('SetOptional','SetOpt3Exp',#'SetOpt3Exp'{bool3 = true,
-							      int3 = 15,
-							      set3 = #'SetIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetOpt3Exp',true,{'SetIn',true,66},15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt3Exp',lists:flatten(Bytes91)),
-    
-    
-    ?line {ok,Bytes92} = asn1_wrapper:encode('SetOptional','SetOpt3Exp',#'SetOpt3Exp'{int3 = 15}), 
-    ?line {ok,{'SetOpt3Exp',asn1_NOVALUE,asn1_NOVALUE,15}} = 
-	asn1_wrapper:decode('SetOptional','SetOpt3Exp',lists:flatten(Bytes92)),
-    
+
+    roundtrip('SetOpt2Imp',
+	      #'SetOpt2Imp'{bool2=true,int2=15,
+			    set2=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt2Imp',#'SetOpt2Imp'{int2=15,bool2=true}),
     
+
+    roundtrip('SetOpt3Imp',
+	      #'SetOpt3Imp'{bool3=true,int3=15,
+			    set3=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt3Imp', #'SetOpt3Imp'{int3=15}),
+
+    roundtrip('SetOpt1Exp',
+	      #'SetOpt1Exp'{bool1=true,int1=15,
+			    set1=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt1Exp', #'SetOpt1Exp'{int1=15}),
+
+    roundtrip('SetOpt2Exp',
+	      #'SetOpt2Exp'{bool2=true,int2=15,
+			    set2=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt2Exp', #'SetOpt2Exp'{int2=15,bool2=true}),
     
+    roundtrip('SetOpt3Exp',
+	      #'SetOpt3Exp'{bool3=true,int3=15,
+			    set3=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetOpt3Exp', #'SetOpt3Exp'{int3=15}),
     
     ok.
 
 
 ticket_7533(Ber) when Ber == ber ->
-    Val = #'SetOpt1'{bool1 = true,int1=12,set1=#'SetIn'{boolIn=false,intIn=13}},
-    ?line {ok,B} = asn1_wrapper:encode('SetOptional','SetOpt1',Val),
-    ?line {ok,Val} = asn1_wrapper:decode('SetOptional','SetOpt1',B),
-    
-    CorruptVal = [49,14,1,1,255,2,1,12] ++ lists:duplicate(8,0),
-    Pid = spawn(?MODULE,decoder,[self(),'SetOptional','SetOpt1',CorruptVal]),
-    receive
-	{ok,Pid,Result} ->
-	    io:format("Decode result: ~p~n",[Result]),
-	    ok
-    after 10000 ->
-	    io:format("Decode timeout~n",[]),
-	    exit(Pid,normal)
-    end;
+    Val = #'SetOpt1'{bool1=true,int1=12,set1=#'SetIn'{boolIn=false,intIn=13}},
+    roundtrip('SetOpt1', Val),
+    CorruptVal = <<49,14,1,1,255,2,1,12,0:8/unit:8>>,
+    {error,_} = 'SetOptional':decode('SetOpt1', CorruptVal),
+    ok;
 ticket_7533(_) ->
     ok.
 
-decoder(Parent,Module,Type,Val) ->
-    io:format("Decoding~n",[]),
-    ?line {ok,Res} = asn1_wrapper:decode(Module,Type,Val),
-    io:format("Decode res: ~p~n",[Res]),
-    Parent ! {ok,self(),Res}.
+roundtrip(Type, Value) ->
+    {ok,Encoded} = 'SetOptional':encode(Type, Value),
+    {ok,Value} = 'SetOptional':decode(Type, Encoded),
+    ok.
diff --git a/lib/asn1/test/test_partial_incomplete_decode.erl b/lib/asn1/test/test_partial_incomplete_decode.erl
index df56c27115..8ede06938d 100644
--- a/lib/asn1/test/test_partial_incomplete_decode.erl
+++ b/lib/asn1/test/test_partial_incomplete_decode.erl
@@ -188,7 +188,7 @@ decode_parts('S1_2',PartDecMsg) ->
 
     
 msg('F') ->
-    {'F',{fb,{'E',35,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}],false,{da,[{'A',16,{'D',17,true}}]}}}};
+    {fb,{'E',35,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}],false,{da,[{'A',16,{'D',17,true}}]}}};
 
 msg('F3') ->
     {fb,{'E',10,[{'D',11,true},{'D',12,false}],false,{dc,{'E_d_dc',13,true,{'E_d_dc_dcc',14,15}}}}};
diff --git a/lib/asn1/test/test_selective_decode.erl b/lib/asn1/test/test_selective_decode.erl
index bb348611da..ebe1296cf3 100644
--- a/lib/asn1/test/test_selective_decode.erl
+++ b/lib/asn1/test/test_selective_decode.erl
@@ -53,7 +53,7 @@ test() ->
 
     
 msg('F') ->
-    {'F',{fb,{'E',35,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}],false,{da,[{'A',16,{'D',17,true}}]}}}};
+    {fb,{'E',35,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}],false,{da,[{'A',16,{'D',17,true}}]}}};
 
 msg('E') ->
     {'E',10,[{'D',11,true},{'D',12,false}],false,{dc,{'E_d_dc',13,true,{'E_d_dc_dcc',14,15}}}};
diff --git a/lib/asn1/test/test_special_decode_performance.erl b/lib/asn1/test/test_special_decode_performance.erl
index dd56d29b28..7dfab1f25a 100644
--- a/lib/asn1/test/test_special_decode_performance.erl
+++ b/lib/asn1/test/test_special_decode_performance.erl
@@ -31,8 +31,8 @@ go(all) ->
 		     {Time_S_c,Time_MGC_c}).
 
 go(N,Mod) ->
-    ?line Val = val(Mod),
-    ?line {ok,B} = Mod:encode(element(1,Val),Val),
+    {Type,Val} = val(Mod),
+    {ok,B} = Mod:encode(Type, Val),
     ?line go(Mod,B,N).
 
 go(Mod,Bin,N) ->
@@ -92,7 +92,7 @@ val('PartialDecSeq') ->
     {'F',{fb,{'E',12,[{'D',13,true},{'D',14,false},{'D',15,true},{'D',16,false},{'D',13,true},{'D',14,false},{'D',15,true},{'D',16,false},{'D',13,true},{'D',14,false},{'D',15,true},{'D',16,false}],true,{da,[{'A',17,{'D',18,false}},{'A',19,{'D',20,true}},{'A',21,{'D',22,false}},{'A',17,{'D',18,false}},{'A',19,{'D',20,true}},{'A',21,{'D',22,false}},{'A',17,{'D',18,false}},{'A',19,{'D',20,true}},{'A',21,{'D',22,false}},{'A',17,{'D',18,false}},{'A',19,{'D',20,true}},{'A',21,{'D',22,false}},{'A',17,{'D',18,false}},{'A',19,{'D',20,true}},{'A',21,{'D',22,false}},{'A',17,{'D',18,false}},{'A',19,{'D',20,true}},{'A',21,{'D',22,false}}]}}}};
 
 val('MEDIA-GATEWAY-CONTROL') ->
-    {'MegacoMessage',asn1_NOVALUE,{'Message',1,{ip4Address,{'IP4Address',[125,125,125,111],55555}},{transactions,[{transactionReply,{'TransactionReply',50007,asn1_NOVALUE,{actionReplies,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,[{auditValueReply,{auditResult,{'AuditResult',{'TerminationID',[],[255,255,255]},[{mediaDescriptor,{'MediaDescriptor',asn1_NOVALUE,{multiStream,[{'StreamDescriptor',1,{'StreamParms',{'LocalControlDescriptor',sendRecv,asn1_NOVALUE,asn1_NOVALUE,[{'PropertyParm',[0,11,0,7],[[52,48]],asn1_NOVALUE}]},{'LocalRemoteDescriptor',[[{'PropertyParm',[0,0,176,1],[[48]],asn1_NOVALUE},{'PropertyParm',[0,0,176,8],[[73,78,32,73,80,52,32,49,50,53,46,49,50,53,46,49,50,53,46,49,49,49]],asn1_NOVALUE},{'PropertyParm',[0,0,176,15],[[97,117,100,105,111,32,49,49,49,49,32,82,84,80,47,65,86,80,32,32,52]],asn1_NOVALUE},{'PropertyParm',[0,0,176,12],[[112,116,105,109,101,58,51,48]],asn1_NOVALUE}]]},{'LocalRemoteDescriptor',[[{'PropertyParm',[0,0,176,1],[[48]],asn1_NOVALUE},{'PropertyParm',[0,0,176,8],[[73,78,32,73,80,52,32,49,50,52,46,49,50,52,46,49,50,52,46,50,50,50]],asn1_NOVALUE},{'PropertyParm',[0,0,176,15],[[97,117,100,105,111,32,50,50,50,50,32,82,84,80,47,65,86,80,32,32,52]],asn1_NOVALUE},{'PropertyParm',[0,0,176,12],[[112,116,105,109,101,58,51,48]],asn1_NOVALUE}]]}}}]}}},{packagesDescriptor,[{'PackagesItem',[0,11],1},{'PackagesItem',[0,11],1}]},{statisticsDescriptor,[{'StatisticsParameter',[0,12,0,4],[[49,50,48,48]]},{'StatisticsParameter',[0,11,0,2],[[54,50,51,48,48]]},{'StatisticsParameter',[0,12,0,5],[[55,48,48]]},{'StatisticsParameter',[0,11,0,3],[[52,53,49,48,48]]},{'StatisticsParameter',[0,12,0,6],[[48,46,50]]},{'StatisticsParameter',[0,12,0,7],[[50,48]]},{'StatisticsParameter',[0,12,0,8],[[52,48]]}]}]}}}]}]}}}]}}}.
+    {'MegacoMessage',{'MegacoMessage',asn1_NOVALUE,{'Message',1,{ip4Address,{'IP4Address',[125,125,125,111],55555}},{transactions,[{transactionReply,{'TransactionReply',50007,asn1_NOVALUE,{actionReplies,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,[{auditValueReply,{auditResult,{'AuditResult',{'TerminationID',[],[255,255,255]},[{mediaDescriptor,{'MediaDescriptor',asn1_NOVALUE,{multiStream,[{'StreamDescriptor',1,{'StreamParms',{'LocalControlDescriptor',sendRecv,asn1_NOVALUE,asn1_NOVALUE,[{'PropertyParm',[0,11,0,7],[[52,48]],asn1_NOVALUE}]},{'LocalRemoteDescriptor',[[{'PropertyParm',[0,0,176,1],[[48]],asn1_NOVALUE},{'PropertyParm',[0,0,176,8],[[73,78,32,73,80,52,32,49,50,53,46,49,50,53,46,49,50,53,46,49,49,49]],asn1_NOVALUE},{'PropertyParm',[0,0,176,15],[[97,117,100,105,111,32,49,49,49,49,32,82,84,80,47,65,86,80,32,32,52]],asn1_NOVALUE},{'PropertyParm',[0,0,176,12],[[112,116,105,109,101,58,51,48]],asn1_NOVALUE}]]},{'LocalRemoteDescriptor',[[{'PropertyParm',[0,0,176,1],[[48]],asn1_NOVALUE},{'PropertyParm',[0,0,176,8],[[73,78,32,73,80,52,32,49,50,52,46,49,50,52,46,49,50,52,46,50,50,50]],asn1_NOVALUE},{'PropertyParm',[0,0,176,15],[[97,117,100,105,111,32,50,50,50,50,32,82,84,80,47,65,86,80,32,32,52]],asn1_NOVALUE},{'PropertyParm',[0,0,176,12],[[112,116,105,109,101,58,51,48]],asn1_NOVALUE}]]}}}]}}},{packagesDescriptor,[{'PackagesItem',[0,11],1},{'PackagesItem',[0,11],1}]},{statisticsDescriptor,[{'StatisticsParameter',[0,12,0,4],[[49,50,48,48]]},{'StatisticsParameter',[0,11,0,2],[[54,50,51,48,48]]},{'StatisticsParameter',[0,12,0,5],[[55,48,48]]},{'StatisticsParameter',[0,11,0,3],[[52,53,49,48,48]]},{'StatisticsParameter',[0,12,0,6],[[48,46,50]]},{'StatisticsParameter',[0,12,0,7],[[50,48]]},{'StatisticsParameter',[0,12,0,8],[[52,48]]}]}]}}}]}]}}}]}}}}.
 
 %% val('PartialDecSeq') ->
 %%     {'F',{fb,{'E',35,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}],false,{dc,{'E_d_dc',15,true,{'E_d_dc_dcc',17,4711}}}}}}.
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index b6d4a633cb..151159ad69 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>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -170,7 +170,9 @@
 	<v> UserData = term()</v>
 	<v> Conns = [atom()]</v>
 	<v> CSSFile = string()</v>
-	<v> CTHs = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}]</v>
+	<v> CTHs = [CTHModule |</v>
+        <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs} |</v>
+        <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs, CTHPriority}]</v>
 	<v> CTHModule = atom()</v>
 	<v> CTHInitArgs = term()</v>
 	</type>
@@ -297,8 +299,9 @@
 	<v> UserData = term()</v>
 	<v> Conns = [atom()]</v>
 	<v> CSSFile = string()</v>
-	<v> CTHs = [CTHModule | {CTHModule, CTHInitArgs} |
-	  {CTHModule, CTHInitArgs, CTHPriority}]</v>
+	<v> CTHs = [CTHModule |</v>
+        <v> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs} |</v>
+	<v> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs, CTHPriority}]</v>
 	<v> CTHModule = atom()</v>
 	<v> CTHInitArgs = term()</v>
 	</type>
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index b2e64bfff0..4fa92d5583 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -108,8 +108,8 @@
       specifications</seealso>).</p>
   </section>
 
+  <marker id="cover_stop"></marker>
   <section>
-    <marker id="cover_stop"></marker>
     <title>Stopping the cover tool when tests are completed</title>
     <p>By default the Cover tool is automatically stopped when the
       tests are completed. This causes the original (non cover
@@ -175,6 +175,11 @@
 
       %% Specific modules to exclude in cover.
       {excl_mods, Mods}.
+
+      %% Cross cover compilation
+      %% Tag = atom(), an identifier for a test run
+      %% Mod = [atom()], modules to compile for accumulated analysis
+      {cross,[{Tag,Mods}]}.
     </pre>
 
     <p>The <c>incl_dirs_r</c> and <c>excl_dirs_r</c> terms tell Common
@@ -190,6 +195,81 @@
        specification file for Common Test).</p>
   </section>
 
+  <marker id="cross_cover"/>
+  <section>
+    <title>Cross cover analysis</title>
+    <p>The cross cover mechanism allows cover analysis of modules
+    across multiple tests. It is useful if some code, e.g. a library
+    module, is used by many different tests and the accumulated cover
+    result is desirable.</p>
+
+    <p>This can of course also be achieved in a more customized way by
+    using the <c>export</c> parameter in the cover specification and
+    analysing the result off line, but the cross cover mechanism is a
+    build in solution which also provides the logging.</p>
+
+    <p>The mechanism is easiest explained via an example:</p>
+
+    <p>Let's say that there are two systems, <c>s1</c> and <c>s2</c>,
+    which are tested in separate test runs. System <c>s1</c> contains
+    a library module <c>m1</c> which is tested by the <c>s1</c> test
+    run and is included in <c>s1</c>'s cover specification:</p>
+
+<code type="none">
+s1.cover:
+  {incl_mods,[m1]}.</code>
+
+    <p>When analysing code coverage, the result for <c>m1</c> can be
+    seen in the cover log in the <c>s1</c> test result.</p>
+
+    <p>Now, let's imagine that since <c>m1</c> is a library module, it
+    is also used quite a bit by system <c>s2</c>. The <c>s2</c> test
+    run does not specifically test <c>m1</c>, but it might still be
+    interesting to see which parts of <c>m1</c> is actually covered by
+    the <c>s2</c> tests. To do this, <c>m1</c> could be included also
+    in <c>s2</c>'s cover specification:</p>
+
+<code type="none">
+s2.cover:
+  {incl_mods,[m1]}.</code>
+
+    <p>This would give an entry for <c>m1</c> also in the cover log
+    for the <c>s2</c> test run. The problem is that this would only
+    reflect the coverage by <c>s2</c> tests, not the accumulated
+    result over <c>s1</c> and <c>s2</c>. And this is where the cross
+    cover mechanism comes in handy.</p>
+
+    <p>If instead the cover specification for <c>s2</c> was like
+    this:</p>
+
+<code type="none">
+s2.cover:
+  {cross,[{s1,[m1]}]}.</code>
+
+    <p>then <c>m1</c> would be cover compiled in the <c>s2</c> test
+    run, but not shown in the coverage log. Instead, if
+    <c>ct_cover:cross_cover_analyse/2</c> is called after both
+    <c>s1</c> and <c>s2</c> test runs are completed, the accumulated
+    result for <c>m1</c> would be available in the cross cover log for
+    the <c>s1</c> test run.</p>
+
+    <p>The call to the analyse function must be like this:</p>
+
+<code type="none">
+ct_cover:cross_cover_analyse(Level, [{s1,S1LogDir},{s2,S2LogDir}]).</code>
+
+    <p>where <c>S1LogDir</c> and <c>S2LogDir</c> are the directories
+    named <c>&lt;TestName&gt;.logs</c> for each test respectively.</p>
+
+    <p>Note the tags <c>s1</c> and <c>s2</c> which are used in the
+    cover specification file and in the call to
+    <c>ct_cover:cross_cover_analyse/2</c>. The point of these are only
+    to map the modules specified in the cover specification to the log
+    directory specified in the call to the analyse function. The name
+    of the tag has no meaning beyond this.</p>
+
+  </section>
+
   <section>
     <title>Logging</title>
     <p>To view the result of a code coverage test, follow the
@@ -197,6 +277,11 @@
       takes you to the code coverage overview page. If you have 
       successfully performed a detailed coverage analysis, you 
       find links to each individual module coverage page here.</p>
+
+    <p>If cross cover analysis has been performed, and there are
+      accumulated coverage results for the current test, then the -
+      "Coverdata collected over all tests" link will take you to these
+      results.</p>
   </section>
 
 </chapter>
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 86237f5fc1..fe871eb516 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2011</year><year>2012</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -439,14 +439,14 @@ terminate(State) ->
 
     <table>
       <row>
-	<cell><em>CTH Name</em></cell>
-	<cell><em>Is Built-in</em></cell>
-	<cell><em>Description</em></cell>
+	<cell align="left"><em>CTH Name</em></cell>
+	<cell align="left"><em>Is Built-in</em></cell>
+	<cell align="left"><em>Description</em></cell>
       </row>
       <row>
-	<cell>cth_log_redirect</cell>
-	<cell>yes</cell>
-	<cell>Captures all error_logger and SASL logging events and prints them
+	<cell align="left">cth_log_redirect</cell>
+	<cell align="left">yes</cell>
+	<cell align="left">Captures all error_logger and SASL logging events and prints them
 	to the current test case log. If an event can not be associated with a
 	testcase it will be printed in the common test framework log. This will
 	happen for testcases which are run in parallel and events which occur
@@ -455,14 +455,29 @@ terminate(State) ->
 	using the normal SASL mechanisms. </cell>
       </row>
       <row>
-	<cell>cth_surefire</cell>
-	<cell>no</cell>
-	<cell>Captures all test results and outputs them as surefire XML into
-	a file. The file which is created is by default called junit_report.xml.
-	The name can be by setting the path option for this hook. e.g.
+	<cell align="left">cth_surefire</cell>
+	<cell align="left">no</cell>
+	<cell align="left"><p>Captures all test results and outputs them as surefire
+	XML into a file. The file which is created is by default
+	called junit_report.xml. The file name can be changed by
+	setting the <c>path</c> option for this hook, e.g.</p>
+
 	<code>-ct_hooks cth_surefire [{path,"/tmp/report.xml"}]</code>
-	Surefire XML can forinstance be used by Jenkins to display test
-	results.</cell>
+
+	<p>If the <c>url_base</c> option is set, an additional
+	attribute named <c>url</c> will be added to each
+	<c>testsuite</c> and <c>testcase</c> XML element. The value will
+	be constructed from the <c>url_base</c> and a relative path
+	to the test suite or test case log respectively, e.g.</p>
+
+	<code>-ct_hooks cth_surefire [{url_base, "http://myserver.com/"}]</code>
+	<p>will give a url attribute value similar to</p>
+
+	<code>"http://myserver.com/[email protected]_11.19.39/
+x86_64-unknown-linux-gnu.my_test.logs/run.2012-12-12_11.19.39/suite.log.html"</code>
+
+	<p>Surefire XML can for instance be used by Jenkins to display test
+	results.</p></cell>
       </row>
     </table>
 
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 7e33b71de1..0345fab8e8 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -32,6 +32,172 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Severe errors detected by <c>test_server</c> (e.g. if log
+	    files directories cannot be created) will now be reported
+	    to <c>common_test</c> and noted in the <c>common_test</c>
+	    logs.</p>
+          <p>
+	    Own Id: OTP-9769 Aux Id: kunagi-202 [113] </p>
+        </item>
+        <item>
+          <p>
+	    If a busy test case generated lots of error messages,
+	    cth_log_redirect:post_end_per_testcase would crash with a
+	    timeout while waiting for the error logger to finish
+	    handling all error reports. The default timer was 5
+	    seconds. This has now been extended to 5 minutes.</p>
+          <p>
+	    Own Id: OTP-10040 Aux Id: kunagi-173 [84] </p>
+        </item>
+        <item>
+          <p>
+	    Some bugfixes in <c>ct_snmp:</c></p>
+          <p>
+	    <list> <item> ct_snmp will now use the value of the
+	    'agent_vsns' config variable when setting the 'variables'
+	    parameter to snmp application agent configuration.
+	    Earlier this had to be done separately - i.e. the
+	    supported versions had to be specified twice. </item>
+	    <item> Snmp application failed to write notify.conf since
+	    ct_snmp gave the notify type as a string instead of an
+	    atom. This has been corrected. </item> </list></p>
+          <p>
+	    Own Id: OTP-10432</p>
+        </item>
+        <item>
+          <p>
+	    Some bugfixes in <c>ct_snmp</c>:</p>
+          <p>
+	    <list> <item> Functions <c>register_users/2</c>,
+	    <c>register_agents/2</c> and <c>register_usm_users/2</c>,
+	    and the corresponding <c>unregister_*/1</c> functions
+	    were not executable. These are corrected/rewritten.
+	    </item> <item> Function <c>update_usm_users/2</c> is
+	    removed, and an unregister function is added instead.
+	    Update can now be done with unregister_usm_users and then
+	    register_usm_users. </item> <item> Functions
+	    <c>unregister_*/2</c> are added, so specific
+	    users/agents/usm users can be unregistered. </item>
+	    <item> Function <c>unload_mibs/1</c> is added for
+	    completeness. </item> <item> Overriding configuration
+	    files did not work, since the files were written in
+	    priv_dir instead of in the configuration dir
+	    (priv_dir/conf). This has been corrected. </item> <item>
+	    Arguments to <c>register_usm_users/2</c> were faulty
+	    documented. This has been corrected. </item> </list></p>
+          <p>
+	    Own Id: OTP-10434 Aux Id: kunagi-264 [175] </p>
+        </item>
+        <item>
+          <p>
+	    Faulty exported specs in common test has been corrected
+	    to <c>ct_netconfc:hook_options/0</c> and
+	    <c>inet:hostname/0</c></p>
+          <p>
+	    Own Id: OTP-10601</p>
+        </item>
+        <item>
+          <p>
+	    The netconf client in common_test did not adjust the
+	    window after receiving data. Due to this, the client
+	    stopped receiving data after a while. This has been
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-10646</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    The earlier undocumented cross cover feature for
+	    accumulating cover data over multiple tests has now been
+	    fixed and documented.</p>
+          <p>
+	    Own Id: OTP-9870 Aux Id: kunagi-206 [117] </p>
+        </item>
+        <item>
+          <p>
+	    CT drops error reason when groups/0 crashes.</p>
+          <p>
+	    Own Id: OTP-10631 Aux Id: kunagi-345 [256] </p>
+        </item>
+        <item>
+          <p>
+	    Problem opening sftp connection with ct_ssh.</p>
+          <p>
+	    Own Id: OTP-10632 Aux Id: kunagi-346 [257] </p>
+        </item>
+        <item>
+          <p>
+	    Event handler on a ct_master node causes hanging.</p>
+          <p>
+	    Own Id: OTP-10634 Aux Id: kunagi-347 [258] </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.6.3.1</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    The following corrections/changes are done in the
+	    cth_surefire hook:</p>
+          <p>
+	    <list> <item> Earlier there would always be a
+	    'properties' element under the 'testsuites' element. This
+	    would exist even if there were no 'property' element
+	    inside it. This has been changed so if there are no
+	    'property' elements to display, then there will not be a
+	    'properties' element either. </item> <item> The XML file
+	    will now (unless other is specified) be stored in the top
+	    log directory. Earlier, the default directory would be
+	    the current working directory for the erlang node, which
+	    would mostly, but not always, be the top log directory.
+	    </item> <item> The 'hostname' attribute in the
+	    'testsuite' element would earlier never have the correct
+	    value. This has been corrected. </item> <item> The
+	    'errors' attribute in the 'testsuite' element would
+	    earlier display the number of failed testcases. This has
+	    been changed and will now always have the value 0, while
+	    the 'failures' attribute will show the number of failed
+	    testcases. </item> <item> A new attribute 'skipped' is
+	    added to the 'testsuite' element. This will display the
+	    number of skipped testcases. These would earlier be
+	    included in the number of failed test cases. </item>
+	    <item> The total number of tests displayed by the 'tests'
+	    attribute in the 'testsuite' element would earlier
+	    include init/end_per_suite and init/end_per_group. This
+	    is no longer the case. The 'tests' attribute will now
+	    only count "real" test cases. </item> <item> Earlier,
+	    auto skipped test cases would have no value in the 'log'
+	    attribute. This is now corrected. </item> <item> A new
+	    attributes 'log' is added to the 'testsuite' element.
+	    </item> <item> A new option named 'url_base' is added for
+	    this hook. If this option is used, a new attribute named
+	    'url' will be added to the 'testcase' and 'testsuite'
+	    elements. </item> </list></p>
+          <p>
+	    Own Id: OTP-10589</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.6.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index b804f134c6..d5f5d89e05 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>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -752,7 +752,9 @@
       PrivDirOption   = auto_per_run | auto_per_tc | manual_per_tc
       EventHandlers   = atom() | [atom()]
       InitArgs        = [term()]
-      CTHModules      = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}]
+      CTHModules      = [CTHModule |
+                         {CTHModule, CTHInitArgs} |
+                         {CTHModule, CTHInitArgs, CTHPriority}]
       CTHModule       = atom()
       CTHInitArgs     = term()
       Dir             = string()
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 248d7de8b6..cc8d913994 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>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -982,38 +982,36 @@
 
     <p>Example:</p>
     <pre>
+   Some printouts during test case execution:
 
-      Some printouts during test case execution:
+     io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
+     ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
+     ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
+     ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
+     ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
+     ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),
 
-        io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
-        ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
-        ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
-        ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
-        ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
-        ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),
+   If starting the test without specifying any verbosity levels:
 
-      If starting the test without specifying any verbosity levels:
+     $ ct_run ...
 
-        $ ct_run ...
+   the following gets printed:
 
-      the following gets printed:
-      
-        1. Standard IO, importance = 50
-        2. Uncategorized, importance = 50
-        3. Categorized info, importance = 50
-        5. Categorized error, importance = 75
-        6. Categorized error, importance = 99
-
-      If starting the test with:
-        
-        $ ct_run -verbosity 1 and info 75
-      
-      the following gets printed:
+     1. Standard IO, importance = 50
+     2. Uncategorized, importance = 50
+     3. Categorized info, importance = 50
+     5. Categorized error, importance = 75
+     6. Categorized error, importance = 99
+
+   If starting the test with:
+
+     $ ct_run -verbosity 1 and info 75
+
+   the following gets printed:
 
-        3. Categorized info, importance = 50
-	4. Categorized info, importance = 25
-        6. Categorized error, importance = 99
-    </pre>
+     3. Categorized info, importance = 50
+     4. Categorized info, importance = 25
+     6. Categorized error, importance = 99</pre>
 
     <p>How categories can be mapped to CSS tags is documented in the 
     <seealso marker="run_test_chapter#html_stylesheet">Running Tests</seealso>
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in
index 4372ab124e..5a9fabbe45 100644
--- a/lib/common_test/priv/Makefile.in
+++ b/lib/common_test/priv/Makefile.in
@@ -68,15 +68,15 @@ JS = jquery-latest.js jquery.tablesorter.min.js
 
 include ../../test_server/vsn.mk
 debug opt:
-	sed -e 's;@CT_VSN@;$(VSN);' \
+	$(V_at)sed -e 's;@CT_VSN@;$(VSN);' \
             -e 's;@TS_VSN@;$(TEST_SERVER_VSN);' \
             ../install.sh.in > install.sh
-	chmod 775 install.sh
+	$(V_at)chmod 775 install.sh
 
 docs:
 
 clean:
-	rm -f $(SCRIPTS)
+	$(V_at)rm -f $(SCRIPTS)
 
 
 # ----------------------------------------------------
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index dd2923ece9..eb35a43d99 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -127,10 +127,10 @@ clean:
 # Special Build Targets
 # ----------------------------------------------------
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/common_test/src/ct_cover.erl b/lib/common_test/src/ct_cover.erl
index d39f50ba00..ae671c750a 100644
--- a/lib/common_test/src/ct_cover.erl
+++ b/lib/common_test/src/ct_cover.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The 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,7 @@
 
 -module(ct_cover).
 
--export([get_spec/1, add_nodes/1, remove_nodes/1]).
+-export([get_spec/1, add_nodes/1, remove_nodes/1, cross_cover_analyse/2]).
 
 -include("ct_util.hrl").
 
@@ -100,6 +100,22 @@ remove_nodes(Nodes) ->
     
     
 %%%-----------------------------------------------------------------
+%%% @spec cross_cover_analyse(Level,Tests) -> ok
+%%%    Level = overview | details
+%%%    Tests = [{Tag,Dir}]
+%%%    Tag = atom()
+%%%    Dir = string()
+%%%
+%%% @doc Accumulate cover results over multiple tests.
+%%%      See the chapter about <seealso
+%%%      marker="cover_chapter#cross_cover">cross cover
+%%%      analysis</seealso> in the users's guide.
+%%%
+cross_cover_analyse(Level,Tests) ->
+    test_server_ctrl:cross_cover_analyse(Level,Tests).
+
+
+%%%-----------------------------------------------------------------
 %%% @hidden 
 
 %% Read cover specification file and return the parsed info.
@@ -249,9 +265,11 @@ get_app_info(App=#cover{app=Name}, [{excl_mods,Name,Mods1}|Terms]) ->
     Mods = App#cover.excl_mods,
     get_app_info(App#cover{excl_mods=Mods++Mods1},Terms);
 
-get_app_info(App=#cover{app=Name}, [{cross_apps,Name,AppMods1}|Terms]) ->
-    AppMods = App#cover.cross,
-    get_app_info(App#cover{cross=AppMods++AppMods1},Terms);
+get_app_info(App=#cover{app=none}, [{cross,Cross}|Terms]) ->
+    get_app_info(App, [{cross,none,Cross}|Terms]);
+get_app_info(App=#cover{app=Name}, [{cross,Name,Cross1}|Terms]) ->
+    Cross = App#cover.cross,
+    get_app_info(App#cover{cross=Cross++Cross1},Terms);
 
 get_app_info(App=#cover{app=none}, [{src_dirs,Dirs}|Terms]) ->
     get_app_info(App, [{src_dirs,none,Dirs}|Terms]);
@@ -354,10 +372,10 @@ remove_excludes_and_dups(CoverData=#cover{excl_mods=Excl,incl_mods=Incl}) ->
     
 files2mods(Info=#cover{excl_mods=ExclFs,
 		       incl_mods=InclFs,
-		       cross=CrossFs}) ->
+		       cross=Cross}) ->
     Info#cover{excl_mods=files2mods1(ExclFs),
 	       incl_mods=files2mods1(InclFs),
-	       cross=files2mods1(CrossFs)}.
+	       cross=[{Tag,files2mods1(Fs)} || {Tag,Fs} <- Cross]}.
 
 files2mods1([M|Fs]) when is_atom(M) ->
     [M|files2mods1(Fs)];
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 11c8235040..1ccbc86d8f 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1073,7 +1073,8 @@ handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) ->
     SimpleXml = encode_rpc_operation(get,[Filter]),
     do_send_rpc(Op, SimpleXml, Timeout, From, State).
 
-handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) ->
+handle_msg({ssh_cm, CM, {data, Ch, _Type, Data}}, State) ->
+    ssh_connection:adjust_window(CM,Ch,size(Data)),
     handle_data(Data, State);
 handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) ->
     %% _SshCloseMsg can probably be one of
@@ -1805,7 +1806,8 @@ get_tag([]) ->
 %%% SSH stuff
 ssh_receive_data() ->
     receive
-	{ssh_cm, _CM, {data, _Ch, _Type, Data}} ->
+	{ssh_cm, CM, {data, Ch, _Type, Data}} ->
+	    ssh_connection:adjust_window(CM,Ch,size(Data)),
 	    {ok, Data};
         {ssh_cm, _CM, {Closed, _Ch}} = X when Closed == closed; Closed == eof ->
             {error,X};
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 58633b7de6..1fd8c04f8b 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -449,15 +449,29 @@ wait_for_node_alive(Node, N) ->
 
 % call init:stop on a remote node
 do_stop(ENode) ->
-    case test_server:is_cover() of
-	true ->
-	    MainCoverNode = cover:get_main_node(),
-	    rpc:call(MainCoverNode,cover,flush,[ENode]);
-	false ->
-	    ok
+    {Cover,MainCoverNode} =
+	case test_server:is_cover() of
+	    true ->
+		Main = cover:get_main_node(),
+		rpc:call(Main,cover,flush,[ENode]),
+		{true,Main};
+	    false ->
+		{false,undefined}
     end,
     spawn(ENode, init, stop, []),
-    wait_for_node_dead(ENode, 5).
+    case wait_for_node_dead(ENode, 5) of
+	{ok,ENode} ->
+	    if Cover ->
+		    %% To avoid that cover is started again if a node
+		    %% with the same name is started later.
+		    rpc:call(MainCoverNode,cover,stop,[ENode]);
+	       true ->
+		    ok
+	    end,
+	    {ok,ENode};
+	Error ->
+	    Error
+    end.
 
 % wait N seconds until node is disconnected
 wait_for_node_dead(Node, 0) ->
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index 76b0f0b5ea..e6eaad8d48 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -1,3 +1,22 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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 handling test specifications.
 %%%
 %%% <p>This module creates a junit report of the test run if plugged in
@@ -27,18 +46,28 @@
 -export([terminate/1]).
 
 -record(state, { filepath, axis, properties, package, hostname,
-		 curr_suite, curr_suite_ts, curr_group = [], curr_tc,
-		 curr_log_dir, timer, tc_log,
+		 curr_suite, curr_suite_ts, curr_group = [],
+		 curr_log_dir, timer, tc_log, url_base,
 		 test_cases = [],
 		 test_suites = [] }).
 
--record(testcase, { log, group, classname, name, time, failure, timestamp }).
--record(testsuite, { errors, failures, hostname, name, tests,
+-record(testcase, { log, url, group, classname, name, time, result, timestamp }).
+-record(testsuite, { errors, failures, skipped, hostname, name, tests,
 		     time, timestamp, id, package,
-		     properties, testcases }).
+		     properties, testcases, log, url }).
+
+-define(default_report,"junit_report.xml").
+-define(suite_log,"suite.log.html").
+
+%% Number of dirs from log root to testcase log file.
+%% ct_run.<node>.<timestamp>/<test_name>/run.<timestamp>/<tc_log>.html
+-define(log_depth,3).
 
 id(Opts) ->
-    filename:absname(proplists:get_value(path, Opts, "junit_report.xml")).
+    case proplists:get_value(path, Opts) of
+	undefined -> ?default_report;
+	Path -> filename:absname(Path)
+    end.
 
 init(Path, Opts) ->
     {ok, Host} = inet:gethostname(),
@@ -47,10 +76,24 @@ init(Path, Opts) ->
 	    package = proplists:get_value(package,Opts),
 	    axis = proplists:get_value(axis,Opts,[]),
 	    properties = proplists:get_value(properties,Opts,[]),
+	    url_base = proplists:get_value(url_base,Opts),
 	    timer = now() }.
 
 pre_init_per_suite(Suite,Config,#state{ test_cases = [] } = State) ->
-    {Config, init_tc(State#state{ curr_suite = Suite, curr_suite_ts = now() },
+    TcLog = proplists:get_value(tc_logfile,Config),
+    CurrLogDir = filename:dirname(TcLog),
+    Path =
+	case State#state.filepath of
+	    ?default_report ->
+		RootDir = get_test_root(TcLog),
+		filename:join(RootDir,?default_report);
+	    P ->
+		P
+	end,
+    {Config, init_tc(State#state{ filepath = Path,
+				  curr_suite = Suite,
+				  curr_suite_ts = now(),
+				  curr_log_dir = CurrLogDir},
 		     Config) };
 pre_init_per_suite(Suite,Config,State) ->
     %% Have to close the previous suite
@@ -59,7 +102,8 @@ pre_init_per_suite(Suite,Config,State) ->
 post_init_per_suite(_Suite,Config, Result, State) ->
     {Result, end_tc(init_per_suite,Config,Result,State)}.
 
-pre_end_per_suite(_Suite,Config,State) -> {Config, init_tc(State, Config)}.
+pre_end_per_suite(_Suite,Config,State) ->
+    {Config, init_tc(State, Config)}.
 
 post_end_per_suite(_Suite,Config,Result,State) ->
     {Result, end_tc(end_per_suite,Config,Result,State)}.
@@ -71,13 +115,15 @@ pre_init_per_group(Group,Config,State) ->
 post_init_per_group(_Group,Config,Result,State) ->
     {Result, end_tc(init_per_group,Config,Result,State)}.
 
-pre_end_per_group(_Group,Config,State) -> {Config, init_tc(State, Config)}.
+pre_end_per_group(_Group,Config,State) ->
+    {Config, init_tc(State, Config)}.
 
 post_end_per_group(_Group,Config,Result,State) ->
     NewState = end_tc(end_per_group, Config, Result, State),
     {Result, NewState#state{ curr_group = tl(NewState#state.curr_group)}}.
 
-pre_init_per_testcase(_TC,Config,State) -> {Config, init_tc(State, Config)}.
+pre_init_per_testcase(_TC,Config,State) ->
+    {Config, init_tc(State, Config)}.
 
 post_end_per_testcase(TC,Config,Result,State) ->
     {Result, end_tc(TC,Config, Result,State)}.
@@ -88,11 +134,19 @@ on_tc_fail(_TC, Res, State) ->
     TCs = State#state.test_cases,
     TC = hd(TCs),
     NewTC = TC#testcase{
-	      failure =
+	      result =
 		  {fail,lists:flatten(io_lib:format("~p",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
-on_tc_skip(Tc,{Type,_Reason} = Res, State) when Type == tc_auto_skip ->
+on_tc_skip(Tc,{Type,_Reason} = Res, State0) when Type == tc_auto_skip ->
+    TcStr = atom_to_list(Tc),
+    State =
+	case State0#state.test_cases of
+	    [#testcase{name=TcStr}|TCs] ->
+		State0#state{test_cases=TCs};
+	    _ ->
+		State0
+	end,
     do_tc_skip(Res, end_tc(Tc,[],Res,init_tc(State,[])));
 on_tc_skip(_Tc, _Res, State = #state{test_cases = []}) ->
     State;
@@ -103,7 +157,7 @@ do_tc_skip(Res, State) ->
     TCs = State#state.test_cases,
     TC = hd(TCs),
     NewTC = TC#testcase{
-	      failure =
+	      result =
 		  {skipped,lists:flatten(io_lib:format("~p",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
@@ -117,33 +171,52 @@ end_tc(Func, Config, Res, State) when is_atom(Func) ->
     end_tc(atom_to_list(Func), Config, Res, State);
 end_tc(Name, _Config, _Res, State = #state{ curr_suite = Suite,
 					    curr_group = Groups,
-					    timer = TS, tc_log = Log } ) ->
+					    curr_log_dir = CurrLogDir,
+					    timer = TS,
+					    tc_log = Log0,
+					    url_base = UrlBase } ) ->
+    Log =
+	case Log0 of
+	    "" ->
+		LowerSuiteName = string:to_lower(atom_to_list(Suite)),
+		filename:join(CurrLogDir,LowerSuiteName++"."++Name++".html");
+	    _ ->
+		Log0
+	end,
+    Url = make_url(UrlBase,Log),
     ClassName = atom_to_list(Suite),
     PGroup = string:join([ atom_to_list(Group)||
 			     Group <- lists:reverse(Groups)],"."),
     TimeTakes = io_lib:format("~f",[timer:now_diff(now(),TS) / 1000000]),
     State#state{ test_cases = [#testcase{ log = Log,
+					  url = Url,
 					  timestamp = now_to_string(TS),
 					  classname = ClassName,
 					  group = PGroup,
 					  name = Name,
 					  time = TimeTakes,
-					  failure = passed }| State#state.test_cases]}.
+					  result = passed }|
+			       State#state.test_cases],
+		 tc_log = ""}. % so old tc_log is not set if next is on_tc_skip
 close_suite(#state{ test_cases = [] } = State) ->
     State;
-close_suite(#state{ test_cases = TCs } = State) ->
-    Total = length(TCs),
-    Succ = length(lists:filter(fun(#testcase{ failure = F }) ->
-				       F == passed
-			       end,TCs)),
-    Fail = Total - Succ,
+close_suite(#state{ test_cases = TCs, url_base = UrlBase } = State) ->
+    {Total,Fail,Skip} = count_tcs(TCs,0,0,0),
     TimeTaken = timer:now_diff(now(),State#state.curr_suite_ts) / 1000000,
+    SuiteLog = filename:join(State#state.curr_log_dir,?suite_log),
+    SuiteUrl = make_url(UrlBase,SuiteLog),
     Suite = #testsuite{ name = atom_to_list(State#state.curr_suite),
 			package = State#state.package,
+			hostname = State#state.hostname,
 			time = io_lib:format("~f",[TimeTaken]),
 			timestamp = now_to_string(State#state.curr_suite_ts),
-			errors = Fail, tests = Total,
-			testcases = lists:reverse(TCs) },
+			errors = 0,
+			failures = Fail,
+			skipped = Skip,
+			tests = Total,
+			testcases = lists:reverse(TCs),
+			log = SuiteLog,
+			url = SuiteUrl},
     State#state{ test_cases = [],
 		 test_suites = [Suite | State#state.test_suites]}.
 
@@ -159,14 +232,15 @@ terminate(State) ->
 
 
 
-to_xml(#testcase{ group = Group, classname = CL, log = L, name = N, time = T, timestamp = TS, failure = F}) ->
+to_xml(#testcase{ group = Group, classname = CL, log = L, url = U, name = N, time = T, timestamp = TS, result = R}) ->
     ["<testcase ",
-     [["group=\"",Group,"\""]||Group /= ""]," "
+     [["group=\"",Group,"\" "]||Group /= ""],
      "name=\"",N,"\" "
      "time=\"",T,"\" "
-     "timestamp=\"",TS,"\" "
+     "timestamp=\"",TS,"\" ",
+     [["url=\"",U,"\" "]||U /= undefined],
      "log=\"",L,"\">",
-     case F of
+     case R of
 	 passed ->
 	     [];
 	 {skipped,Reason} ->
@@ -176,22 +250,29 @@ to_xml(#testcase{ group = Group, classname = CL, log = L, name = N, time = T, ti
 	     ["<failure message=\"Test ",N," in ",CL," failed!\" type=\"crash\">",
 	      sanitize(Reason),"</failure>"]
      end,"</testcase>"];
-to_xml(#testsuite{ package = P, hostname = H, errors = E, time = Time,
-		   timestamp = TS, tests = T, name = N, testcases = Cases }) ->
+to_xml(#testsuite{ package = P, hostname = H, errors = E, failures = F,
+		   skipped = S, time = Time, timestamp = TS, tests = T, name = N,
+		   testcases = Cases, log = Log, url = Url }) ->
     ["<testsuite ",
      [["package=\"",P,"\" "]||P /= undefined],
-     [["hostname=\"",P,"\" "]||H /= undefined],
-     [["name=\"",N,"\" "]||N /= undefined],
-     [["time=\"",Time,"\" "]||Time /= undefined],
-     [["timestamp=\"",TS,"\" "]||TS /= undefined],
+     "hostname=\"",H,"\" "
+     "name=\"",N,"\" "
+     "time=\"",Time,"\" "
+     "timestamp=\"",TS,"\" "
      "errors=\"",integer_to_list(E),"\" "
-     "tests=\"",integer_to_list(T),"\">",
+     "failures=\"",integer_to_list(F),"\" "
+     "skipped=\"",integer_to_list(S),"\" "
+     "tests=\"",integer_to_list(T),"\" ",
+     [["url=\"",Url,"\" "]||Url /= undefined],
+     "log=\"",Log,"\">",
      [to_xml(Case) || Case <- Cases],
      "</testsuite>"];
 to_xml(#state{ test_suites = TestSuites, axis = Axis, properties = Props }) ->
     ["<testsuites>",properties_to_xml(Axis,Props),
      [to_xml(TestSuite) || TestSuite <- TestSuites],"</testsuites>"].
 
+properties_to_xml([],[]) ->
+    [];
 properties_to_xml(Axis,Props) ->
     ["<properties>",
      [["<property name=\"",Name,"\" axis=\"yes\" value=\"",Value,"\" />"] || {Name,Value} <- Axis],
@@ -217,3 +298,37 @@ sanitize([]) ->
 now_to_string(Now) ->
     {{YY,MM,DD},{HH,Mi,SS}} = calendar:now_to_local_time(Now),
     io_lib:format("~p-~2..0B-~2..0BT~2..0B:~2..0B:~2..0B",[YY,MM,DD,HH,Mi,SS]).
+
+make_url(undefined,_) ->
+    undefined;
+make_url(_,[]) ->
+    undefined;
+make_url(UrlBase0,Log) ->
+    UrlBase = string:strip(UrlBase0,right,$/),
+    RelativeLog = get_relative_log_url(Log),
+    string:join([UrlBase,RelativeLog],"/").
+
+get_test_root(Log) ->
+    LogParts = filename:split(Log),
+    filename:join(lists:sublist(LogParts,1,length(LogParts)-?log_depth)).
+
+get_relative_log_url(Log) ->
+    LogParts = filename:split(Log),
+    Start = length(LogParts)-?log_depth,
+    Length = ?log_depth+1,
+    string:join(lists:sublist(LogParts,Start,Length),"/").
+
+count_tcs([#testcase{name=ConfCase}|TCs],Ok,F,S)
+  when ConfCase=="init_per_suite";
+       ConfCase=="end_per_suite";
+       ConfCase=="init_per_group";
+       ConfCase=="end_per_group" ->
+    count_tcs(TCs,Ok,F,S);
+count_tcs([#testcase{result=passed}|TCs],Ok,F,S) ->
+    count_tcs(TCs,Ok+1,F,S);
+count_tcs([#testcase{result={fail,_}}|TCs],Ok,F,S) ->
+    count_tcs(TCs,Ok,F+1,S);
+count_tcs([#testcase{result={skipped,_}}|TCs],Ok,F,S) ->
+    count_tcs(TCs,Ok,F,S+1);
+count_tcs([],Ok,F,S) ->
+    {Ok+F+S,F,S}.
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index df816f9a61..d469d03e04 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -56,7 +56,8 @@ MODULES= \
 	ct_snmp_SUITE \
 	ct_group_leader_SUITE \
 	ct_cover_SUITE \
-	ct_groups_search_SUITE
+	ct_groups_search_SUITE \
+	ct_surefire_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
diff --git a/lib/common_test/test/common_test.cover b/lib/common_test/test/common_test.cover
index 66697854ea..3aa49623e7 100644
--- a/lib/common_test/test/common_test.cover
+++ b/lib/common_test/test/common_test.cover
@@ -1,10 +1,10 @@
 %% -*- erlang -*-
 {incl_app,common_test,details}.
-{cross_apps,common_test,[erl2html2,
-			 test_server,
-			 test_server_ctrl,
-			 test_server_gl,
-			 test_server_h,
-			 test_server_io,
-			 test_server_node,
-			 test_server_sup]}.
+{cross,common_test,[{test_server,[erl2html2,
+				  test_server,
+				  test_server_ctrl,
+				  test_server_gl,
+				  test_server_h,
+				  test_server_io,
+				  test_server_node,
+				  test_server_sup]}]}.
diff --git a/lib/common_test/test/ct_cover_SUITE.erl b/lib/common_test/test/ct_cover_SUITE.erl
index bebfce70d0..cb49dc423f 100644
--- a/lib/common_test/test/ct_cover_SUITE.erl
+++ b/lib/common_test/test/ct_cover_SUITE.erl
@@ -77,7 +77,8 @@ all() ->
      slave_start_slave,
      cover_node_option,
      ct_cover_add_remove_nodes,
-     otp_9956
+     otp_9956,
+     cross
     ].
 
 %%--------------------------------------------------------------------
@@ -161,6 +162,43 @@ otp_9956(Config) ->
     check_calls(Events,{?suite,otp_9956,1},1),
     ok.
 
+%% Test cross cover mechanism
+cross(Config) ->
+    {ok,Events1} = run_test(cross1,Config),
+    check_calls(Events1,1),
+
+    CoverFile2 = create_cover_file(cross1,[{cross,[{cross1,[?mod]}]}],Config),
+    {ok,Events2} = run_test(cross2,[{cover,CoverFile2}],Config),
+    check_calls(Events2,1),
+
+    %% Get the log dirs for each test and run cross cover analyse
+    [D11,D12] = lists:sort(get_run_dirs(Events1)),
+    [D21,D22] = lists:sort(get_run_dirs(Events2)),
+
+    ct_cover:cross_cover_analyse(details,[{cross1,D11},{cross2,D21}]),
+    ct_cover:cross_cover_analyse(details,[{cross1,D12},{cross2,D22}]),
+
+    %% Get the cross cover logs and read for each test
+    [C11,C12,C21,C22] =
+	[filename:join(D,"cross_cover.html") || D <- [D11,D12,D21,D22]],
+
+    {ok,CrossData} = file:read_file(C11),
+    {ok,CrossData} = file:read_file(C12),
+
+    {ok,Def} = file:read_file(C21),
+    {ok,Def} = file:read_file(C22),
+
+    %% A simple test: just check that the test module exists in the
+    %% log from cross1 test, and that it does not exist in the log
+    %% from cross2 test.
+    TestMod = list_to_binary(atom_to_list(?mod)),
+    {_,_} = binary:match(CrossData,TestMod),
+    nomatch = binary:match(Def,TestMod),
+    {_,_} = binary:match(Def,
+			 <<"No cross cover modules exist for this application">>),
+
+    ok.
+
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -229,15 +267,18 @@ check_cover(Node) when is_atom(Node) ->
 	    false
     end.
 
+%% Get the log dir "run.<timestamp>" for all (both!) tests
+get_run_dirs(Events) ->
+    [filename:dirname(TCLog) ||
+	{ct_test_support_eh,
+	 {event,tc_logfile,_Node,
+	  {{?suite,init_per_suite},TCLog}}} <- Events].
+
 %% Check that each coverlog includes N calls to ?mod:foo/0
 check_calls(Events,N) ->
     check_calls(Events,{?mod,foo,0},N).
 check_calls(Events,MFA,N) ->
-    CoverLogs =
-	[filename:join(filename:dirname(TCLog),"all.coverdata") ||
-	    {ct_test_support_eh,
-	     {event,tc_logfile,ct@falco,
-	      {{?suite,init_per_suite},TCLog}}} <- Events],
+    CoverLogs = [filename:join(D,"all.coverdata") || D <- get_run_dirs(Events)],
     do_check_logs(CoverLogs,MFA,N).
 
 do_check_logs([CoverLog|CoverLogs],{Mod,_,_} = MFA,N) ->
diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
new file mode 100644
index 0000000000..69e98cef48
--- /dev/null
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -0,0 +1,351 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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_surefire_SUITE
+%%%
+%%% Description:
+%%% Test cth_surefire hook
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_surefire_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-include_lib("xmerl/include/xmerl.hrl").
+
+-define(eh, ct_test_support_eh).
+
+-define(url_base,"http://my.host.com/").
+
+%%--------------------------------------------------------------------
+%% 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() ->
+    [
+     default,
+     absolute_path,
+     relative_path,
+     url,
+     logdir
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+default(Config) when is_list(Config) ->
+    run(default,[cth_surefire],Config),
+    PrivDir = ?config(priv_dir,Config),
+    XmlRe = filename:join([PrivDir,"*","junit_report.xml"]),
+    check_xml(default,XmlRe).
+
+absolute_path(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Path = filename:join(PrivDir,"abspath.xml"),
+    run(absolute_path,[{cth_surefire,[{path,Path}]}],Config),
+    check_xml(absolute_path,Path).
+
+relative_path(Config) when is_list(Config) ->
+    Path = "relpath.xml",
+    run(relative_path,[{cth_surefire,[{path,Path}]}],Config),
+    PrivDir = ?config(priv_dir,Config),
+    XmlRe = filename:join([PrivDir,"*",Path]),
+    check_xml(relative_path,XmlRe).
+
+url(Config) when is_list(Config) ->
+    Path = "url.xml",
+    run(url,[{cth_surefire,[{url_base,?url_base},
+			    {path,Path}]}],Config),
+    PrivDir = ?config(priv_dir,Config),
+    XmlRe = filename:join([PrivDir,"*",Path]),
+    check_xml(url,XmlRe).
+
+logdir(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    LogDir = filename:join(PrivDir,"specific_logdir"),
+    file:make_dir(LogDir),
+    Path = "logdir.xml",
+    run(logdir,[{cth_surefire,[{path,Path}]}],Config,[{logdir,LogDir}]),
+    PrivDir = ?config(priv_dir,Config),
+    XmlRe = filename:join([LogDir,"*",Path]),
+    check_xml(logdir,XmlRe).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+run(Case,CTHs,Config) ->
+    run(Case,CTHs,Config,[]).
+run(Case,CTHs,Config,ExtraOpts) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "surefire_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{ct_hooks,CTHs},{label,Case}|ExtraOpts],
+			 Config),
+    ok = execute(Case, Opts, ERPid, Config).
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Opts1 =
+	case lists:keymember(logdir,1,Test) of
+	    true -> lists:keydelete(logdir,1,Opts0);
+	    false -> Opts0
+	end,
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts1 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(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) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(_) ->
+    [{?eh,start_logging,'_'},
+     {?eh,start_info,{1,1,9}},
+     {?eh,tc_start,{surefire_SUITE,init_per_suite}},
+     {?eh,tc_done,{surefire_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{surefire_SUITE,tc_ok}},
+     {?eh,tc_done,{surefire_SUITE,tc_ok,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{surefire_SUITE,tc_fail}},
+     {?eh,tc_done,{surefire_SUITE,tc_fail,
+		   {failed,{error,{test_case_failed,"this test should fail"}}}}},
+     {?eh,test_stats,{1,1,{0,0}}},
+     {?eh,tc_start,{surefire_SUITE,tc_skip}},
+     {?eh,tc_done,{surefire_SUITE,tc_skip,{skipped,"this test is skipped"}}},
+     {?eh,test_stats,{1,1,{1,0}}},
+     {?eh,tc_start,{surefire_SUITE,tc_autoskip_require}},
+     {?eh,tc_done,{surefire_SUITE,tc_autoskip_require,
+		   {skipped,{require_failed,'_'}}}},
+     {?eh,test_stats,{1,1,{1,1}}},
+     [{?eh,tc_start,{surefire_SUITE,{init_per_group,g,[]}}},
+      {?eh,tc_done,{surefire_SUITE,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{surefire_SUITE,tc_ok}},
+      {?eh,tc_done,{surefire_SUITE,tc_ok,ok}},
+      {?eh,test_stats,{2,1,{1,1}}},
+      {?eh,tc_start,{surefire_SUITE,tc_fail}},
+      {?eh,tc_done,{surefire_SUITE,tc_fail,
+		    {failed,{error,{test_case_failed,"this test should fail"}}}}},
+      {?eh,test_stats,{2,2,{1,1}}},
+      {?eh,tc_start,{surefire_SUITE,tc_skip}},
+      {?eh,tc_done,{surefire_SUITE,tc_skip,{skipped,"this test is skipped"}}},
+      {?eh,test_stats,{2,2,{2,1}}},
+      {?eh,tc_start,{surefire_SUITE,tc_autoskip_require}},
+      {?eh,tc_done,{surefire_SUITE,tc_autoskip_require,
+		    {skipped,{require_failed,'_'}}}},
+      {?eh,test_stats,{2,2,{2,2}}},
+      {?eh,tc_start,{surefire_SUITE,{end_per_group,g,[]}}},
+      {?eh,tc_done,{surefire_SUITE,{end_per_group,g,[]},ok}}],
+     [{?eh,tc_start,{surefire_SUITE,{init_per_group,g_fail,[]}}},
+      {?eh,tc_done,{surefire_SUITE,{init_per_group,g_fail,[]},
+		    {failed,{error,all_cases_should_be_skipped}}}},
+      {?eh,tc_auto_skip,{surefire_SUITE,tc_ok,
+			 {failed,
+			  {surefire_SUITE,init_per_group,
+			   {'EXIT',all_cases_should_be_skipped}}}}},
+      {?eh,test_stats,{2,2,{2,3}}},
+      {?eh,tc_auto_skip,{surefire_SUITE,end_per_group,
+			 {failed,
+			  {surefire_SUITE,init_per_group,
+			   {'EXIT',all_cases_should_be_skipped}}}}}],
+     {?eh,tc_start,{surefire_SUITE,end_per_suite}},
+     {?eh,tc_done,{surefire_SUITE,end_per_suite,ok}},
+     {?eh,stop_logging,[]}].
+
+
+%%%-----------------------------------------------------------------
+%%% Check generated xml log files
+check_xml(Case,XmlRe) ->
+    case filelib:wildcard(XmlRe) of
+	[] ->
+	    ct:fail("No xml files found with regexp ~p~n", [XmlRe]);
+	[_] = Xmls when Case==absolute_path ->
+	    do_check_xml(Case,Xmls);
+	[_,_] = Xmls ->
+	    do_check_xml(Case,Xmls)
+    end.
+
+%% Allowed structure:
+%% <testsuites>
+%%  <testsuite>
+%%   <properties>
+%%    <property/>
+%%    ...
+%%   </properties>
+%%   <testcase>
+%%    [<failure/> | <error/> | <skipped/> ]
+%%   </testcase>
+%%   ...
+%%  </testsuite>
+%%  ...
+%% </testsuites>
+do_check_xml(Case,[Xml|Xmls]) ->
+    ct:log("Checking <a href=~p>~s</a>~n",[Xml,Xml]),
+    {E,_} = xmerl_scan:file(Xml),
+    Expected = events_to_result(lists:flatten(test_events(Case))),
+    ParseResult = testsuites(Case,E),
+    ct:log("Expecting: ~p~n",[[Expected]]),
+    ct:log("Actual   : ~p~n",[ParseResult]),
+    [Expected] = ParseResult,
+    do_check_xml(Case,Xmls);
+do_check_xml(_,[]) ->
+    ok.
+
+%% Scanning the XML to get the same type of result as events_to_result/1
+testsuites(Case,#xmlElement{name=testsuites,content=TS}) ->
+    %% OTP-10589 - move properties element to <testsuite>
+    false = lists:keytake(properties,#xmlElement.name,TS),
+    testsuite(Case,TS).
+
+testsuite(Case,[#xmlElement{name=testsuite,content=TC,attributes=A}|TS]) ->
+    {ET,EF,ES} = events_to_numbers(lists:flatten(test_events(Case))),
+    {T,E,F,S} = get_numbers_from_attrs(A,false,false,false,false),
+    ct:log("Expecting total:~p, error:~p, failure:~p, skipped:~p~n",[ET,0,EF,ES]),
+    ct:log("Actual    total:~p, error:~p, failure:~p, skipped:~p~n",[T,E,F,S]),
+    {ET,0,EF,ES} = {T,E,F,S},
+
+    %% properties should only be there if given a options to hook
+    false = lists:keytake(properties,#xmlElement.name,TC),
+    %% system-out and system-err is not used by common_test
+    false = lists:keytake('system-out',#xmlElement.name,TC),
+    false = lists:keytake('system-err',#xmlElement.name,TC),
+    R=testcase(Case,TC),
+    [R|testsuite(Case,TS)];
+testsuite(_Case,[]) ->
+    [].
+
+testcase(url=Case,[#xmlElement{name=testcase,attributes=A,content=C}|TC]) ->
+    R = failed_or_skipped(C),
+    case R of
+	[s] ->
+	    case lists:keyfind(url,#xmlAttribute.name,A) of
+		false -> ok;
+		#xmlAttribute{value=UrlAttr} ->
+		    lists:keyfind(url,#xmlAttribute.name,A),
+		    true = lists:prefix(?url_base,UrlAttr)
+	    end;
+	_ ->
+	    #xmlAttribute{value=UrlAttr} =
+		lists:keyfind(url,#xmlAttribute.name,A),
+	    true = lists:prefix(?url_base,UrlAttr)
+    end,
+    [R|testcase(Case,TC)];
+testcase(Case,[#xmlElement{name=testcase,attributes=A,content=C}|TC]) ->
+    false = lists:keyfind(url,#xmlAttribute.name,A),
+    R = failed_or_skipped(C),
+    [R|testcase(Case,TC)];
+testcase(_Case,[]) ->
+    [].
+
+failed_or_skipped([#xmlElement{name=failure}|E]) ->
+    [f|failed_or_skipped(E)];
+failed_or_skipped([#xmlElement{name=error}|E]) ->
+    [e|failed_or_skipped(E)];
+failed_or_skipped([#xmlElement{name=skipped}|E]) ->
+    [s|failed_or_skipped(E)];
+failed_or_skipped([]) ->
+    [].
+
+%% Using the expected events to produce the expected result of the XML scanning.
+%% The result is a list of test suites:
+%% Testsuites = [Testsuite]
+%% Testsuite = [Testcase]
+%% Testcase = [] | [f] | [s], indicating ok, failed and skipped respectively
+events_to_result([{?eh,tc_done,{_Suite,_Case,R}}|E]) ->
+    [result(R)|events_to_result(E)];
+events_to_result([{?eh,tc_auto_skip,_}|E]) ->
+    [[s]|events_to_result(E)];
+events_to_result([_|E]) ->
+    events_to_result(E);
+events_to_result([]) ->
+    [].
+
+result(ok) ->[];
+result({skipped,_}) -> [s];
+result({failed,_}) -> [f].
+
+%% Using the expected events' last test_stats element to produce the
+%% expected number of totla, errors, failed and skipped testcases.
+events_to_numbers(E) ->
+    RevE = lists:reverse(E),
+    {?eh,test_stats,{Ok,F,{US,AS}}} = lists:keyfind(test_stats,2,RevE),
+    {Ok+F+US+AS,F,US+AS}.
+
+get_numbers_from_attrs([#xmlAttribute{name=tests,value=X}|A],false,E,F,S) ->
+    get_numbers_from_attrs(A,list_to_integer(X),E,F,S);
+get_numbers_from_attrs([#xmlAttribute{name=errors,value=X}|A],T,false,F,S) ->
+    get_numbers_from_attrs(A,T,list_to_integer(X),F,S);
+get_numbers_from_attrs([#xmlAttribute{name=failures,value=X}|A],T,E,false,S) ->
+    get_numbers_from_attrs(A,T,E,list_to_integer(X),S);
+get_numbers_from_attrs([#xmlAttribute{name=skipped,value=X}|A],T,E,F,false) ->
+    get_numbers_from_attrs(A,T,E,F,list_to_integer(X));
+get_numbers_from_attrs([_|A],T,E,F,S) ->
+    get_numbers_from_attrs(A,T,E,F,S);
+get_numbers_from_attrs([],T,E,F,S) ->
+    {T,E,F,S}.
diff --git a/lib/common_test/test/ct_surefire_SUITE_data/surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE_data/surefire_SUITE.erl
new file mode 100644
index 0000000000..677aee46c5
--- /dev/null
+++ b/lib/common_test/test/ct_surefire_SUITE_data/surefire_SUITE.erl
@@ -0,0 +1,92 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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: surefire_SUITE.erl
+%%
+%% Description:
+%%    This file contains the test cases for cth_surefire.
+%%
+%% @author Support
+%% @doc Test  of surefire support in common_test
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(surefire_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+
+all() ->
+    testcases() ++ [{group,g},{group,g_fail}].
+
+groups() ->
+    [{g,testcases()},
+     {g_fail,[tc_ok]}].
+
+testcases() ->
+    [tc_ok,
+     tc_fail,
+     tc_skip,
+     tc_autoskip_require].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_group(g_fail, _Config) ->
+    exit(all_cases_should_be_skipped);
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_Group, Config) ->
+    Config.
+
+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.
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+break(_Config) ->
+    test_server:break(""),
+    ok.
+
+tc_ok(_Config) ->
+    ok.
+
+tc_fail(_Config) ->
+    ct:fail("this test should fail").
+
+tc_skip(_Config) ->
+    {skip,"this test is skipped"}.
+
+tc_autoskip_require() ->
+    [{require,whatever}].
+tc_autoskip_require(Config) ->
+    ct:fail("this test should never be executed - it should be autoskipped").
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index e5e2e68fcb..fc572aa82f 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -117,11 +117,7 @@ end_per_suite(Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     PrivDir = proplists:get_value(priv_dir, Config),
     true = rpc:call(CTNode, code, del_path, [filename:join(PrivDir,"")]),
-    case test_server:is_cover() of
-	true -> cover:flush(CTNode);
-	false -> ok
-    end,
-    slave:stop(CTNode),
+    slave_stop(CTNode),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -152,11 +148,7 @@ end_per_testcase(_TestCase, Config) ->
     case wait_for_ct_stop(CTNode) of
 	%% Common test was not stopped to we restart node.
 	false ->
-	    case test_server:is_cover() of
-		true -> cover:flush(CTNode);
-		false -> ok
-	    end,
-	    slave:stop(CTNode),
+	    slave_stop(CTNode),
 	    start_slave(Config,proplists:get_value(trace_level,Config)),
 	    {fail, "Could not stop common_test"};
 	true ->
@@ -1274,3 +1266,22 @@ rm_files([F | Fs]) ->
 rm_files([]) ->
     ok.
     
+%%%-----------------------------------------------------------------
+%%%
+slave_stop(Node) ->
+    Cover = test_server:is_cover(),
+    if Cover-> cover:flush(Node);
+       true -> ok
+    end,
+    erlang:monitor_node(Node, true),
+    slave:stop(Node),
+    receive
+	{nodedown, Node} ->
+	    if Cover -> cover:stop(Node);
+	       true -> ok
+	    end
+    after 5000 ->
+	    erlang:monitor_node(Node, false),
+	    receive {nodedown, Node} -> ok after 0 -> ok end %flush
+    end,
+    ok.
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index f9bb22867e..c92fb2ca37 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.6.3
+COMMON_TEST_VSN = 1.7
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index 27d750f929..ddaae2655d 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -816,6 +816,32 @@ pi() -> 3.1416.
   </section>
 
   <section>
+    <title>Inlining of list functions</title>
+    <p>The compiler can also inline a variety of list manipulation functions
+      from the stdlib's lists module.</p>
+
+    <p>This feature must be explicitly enabled with a compiler option or a
+      <c>-compile()</c> attribute in the source module.</p>
+
+    <p>To enable inlining of list functions, use the <c>inline_list_funcs</c>
+    option.</p>
+
+    <p>The following functions are inlined:</p>
+    <list type="bulleted">
+      <item><seealso marker="stdlib:lists#all/2">lists:all/2</seealso></item>
+      <item><seealso marker="stdlib:lists#any/2">lists:any/2</seealso></item>
+      <item><seealso marker="stdlib:lists#foreach/2">lists:foreach/2</seealso></item>
+      <item><seealso marker="stdlib:lists#map/2">lists:map/2</seealso></item>
+      <item><seealso marker="stdlib:lists#flatmap/2">lists:flatmap/2</seealso></item>
+      <item><seealso marker="stdlib:lists#filter/2">lists:filter/2</seealso></item>
+      <item><seealso marker="stdlib:lists#foldl/3">lists:foldl/3</seealso></item>
+      <item><seealso marker="stdlib:lists#foldr/3">lists:foldr/3</seealso></item>
+      <item><seealso marker="stdlib:lists#mapfoldl/3">lists:mapfoldl/3</seealso></item>
+      <item><seealso marker="stdlib:lists#mapfoldr/3">lists:mapfoldr/3</seealso></item>
+    </list>
+  </section>
+
+  <section>
     <title>Parse Transformations</title>
 
     <p>Parse transformations are used when a programmer wants to use
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index cbcbf79839..8d54dffd73 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -82,7 +82,6 @@ MODULES =  \
 	sys_core_dsetel \
 	sys_core_fold \
 	sys_core_inline \
-	sys_expand_pmod \
 	sys_pre_attributes \
 	sys_pre_expand \
 	v3_codegen \
@@ -145,19 +144,19 @@ clean:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(EGEN)/beam_opcodes.erl $(EGEN)/beam_opcodes.hrl: genop.tab
-	$(PERL) $(ERL_TOP)/erts/emulator/utils/beam_makeops -compiler -outdir $(EGEN) $<
+	$(gen_verbose)$(PERL) $(ERL_TOP)/erts/emulator/utils/beam_makeops -compiler -outdir $(EGEN) $<
 
 $(EBIN)/beam_asm.beam: $(ESRC)/beam_asm.erl $(EGEN)/beam_opcodes.hrl
-	$(ERLC) $(ERL_COMPILE_FLAGS) -DCOMPILER_VSN='"$(VSN)"' -o$(EBIN) $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) -DCOMPILER_VSN='"$(VSN)"' -o$(EBIN) $<
 
 $(EBIN)/cerl_inline.beam: $(ESRC)/cerl_inline.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) +nowarn_shadow_vars -o$(EBIN) $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) +nowarn_shadow_vars -o$(EBIN) $<
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index df1af36eeb..5f394f0b65 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -248,6 +248,7 @@ format_error({module_name,Mod,Filename}) ->
 		  abstract_code=[],		%Abstract code for debugger.
 		  options=[]  :: [option()],	%Options for compilation
 		  mod_options=[]  :: [option()], %Options for module_info
+                  encoding=none :: none | epp:source_coding(),
 		  errors=[],
 		  warnings=[]}).
 
@@ -734,8 +735,9 @@ collect_asm([X | Rest], R) ->
 beam_consult_asm(St) ->
     case file:consult(St#compile.ifile) of
 	{ok, Forms0} ->
+            Encoding = epp:read_encoding(St#compile.ifile),
 	    {Module, Forms} = preprocess_asm_forms(Forms0),
-	    {ok,St#compile{module=Module, code=Forms}};
+	    {ok,St#compile{module=Module, code=Forms, encoding=Encoding}};
 	{error,E} ->
 	    Es = [{St#compile.ifile,[{none,?MODULE,{open,E}}]}],
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
@@ -777,7 +779,8 @@ parse_module(St) ->
     R =  epp:parse_file(St#compile.ifile, IncludePath, pre_defs(Opts)),
     case R of
 	{ok,Forms} ->
-	    {ok,St#compile{code=Forms}};
+            Encoding = epp:read_encoding(St#compile.ifile),
+	    {ok,St#compile{code=Forms,encoding=Encoding}};
 	{error,E} ->
 	    Es = [{St#compile.ifile,[{none,?MODULE,{epp,E}}]}],
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
@@ -892,7 +895,6 @@ foldl_core_transforms(St, []) -> {ok,St}.
 
 %%% Fetches the module name from a list of forms. The module attribute must
 %%% be present.
-get_module([{attribute,_,module,{M,_As}} | _]) -> M;
 get_module([{attribute,_,module,M} | _]) -> M;
 get_module([_ | Rest]) ->
     get_module(Rest).
@@ -904,11 +906,8 @@ add_default_base(St, Forms) ->
     F = St#compile.filename,
     case F of
 	"" ->
- 	    M = case get_module(Forms) of
- 		    PackageModule when is_list(PackageModule) -> last(PackageModule);
-		    M0 -> M0
- 		end,
-	    St#compile{base = atom_to_list(M)};
+ 	    M = get_module(Forms),
+	    St#compile{base=atom_to_list(M)};
 	_ ->
 	    St
     end.
@@ -1339,16 +1338,12 @@ save_binary(#compile{code=none}=St) -> {ok,St};
 save_binary(#compile{module=Mod,ofile=Outfile,
 		     options=Opts}=St) ->
     %% Test that the module name and output file name match.
-    %% We must take care to not completely break a packaged module
-    %% (even though packages still is as an experimental, unsupported
-    %% feature) - so we will extract the last part of a packaged
-    %% module name and compare only that.
     case member(no_error_module_mismatch, Opts) of
 	true ->
 	    save_binary_1(St);
 	false ->
 	    Base = filename:rootname(filename:basename(Outfile)),
-	    case lists:last(packages:split(Mod)) of
+	    case atom_to_list(Mod) of
 		Base ->
 		    save_binary_1(St);
 		_ ->
@@ -1424,28 +1419,28 @@ report_warnings(#compile{options=Opts,warnings=Ws0}) ->
     end.
 
 format_message(F, P, [{{Line,Column}=Loc,Mod,E}|Es]) ->
-    M = {{F,Loc},io_lib:format("~s:~w:~w ~s~s\n",
+    M = {{F,Loc},io_lib:format("~s:~w:~w ~s~ts\n",
                                 [F,Line,Column,P,Mod:format_error(E)])},
     [M|format_message(F, P, Es)];
 format_message(F, P, [{Line,Mod,E}|Es]) ->
-    M = {{F,{Line,0}},io_lib:format("~s:~w: ~s~s\n",
+    M = {{F,{Line,0}},io_lib:format("~s:~w: ~s~ts\n",
                                 [F,Line,P,Mod:format_error(E)])},
     [M|format_message(F, P, Es)];
 format_message(F, P, [{Mod,E}|Es]) ->
-    M = {none,io_lib:format("~s: ~s~s\n", [F,P,Mod:format_error(E)])},
+    M = {none,io_lib:format("~s: ~s~ts\n", [F,P,Mod:format_error(E)])},
     [M|format_message(F, P, Es)];
 format_message(_, _, []) -> [].
 
 %% list_errors(File, ErrorDescriptors) -> ok
 
 list_errors(F, [{{Line,Column},Mod,E}|Es]) ->
-    io:fwrite("~s:~w:~w: ~s\n", [F,Line,Column,Mod:format_error(E)]),
+    io:fwrite("~s:~w:~w: ~ts\n", [F,Line,Column,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(F, [{Line,Mod,E}|Es]) ->
-    io:fwrite("~s:~w: ~s\n", [F,Line,Mod:format_error(E)]),
+    io:fwrite("~s:~w: ~ts\n", [F,Line,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(F, [{Mod,E}|Es]) ->
-    io:fwrite("~s: ~s\n", [F,Mod:format_error(E)]),
+    io:fwrite("~s: ~ts\n", [F,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(_F, []) -> ok.
 
@@ -1501,10 +1496,12 @@ src_listing(Ext, St) ->
 	    Ext, St).
 
 do_src_listing(Lf, Fs) ->
-    foreach(fun (F) -> io:put_chars(Lf, [erl_pp:form(F),"\n"]) end,
+    Opts = [lists:keyfind(encoding, 1, io:getopts(Lf))],
+    foreach(fun (F) -> io:put_chars(Lf, [erl_pp:form(F, Opts),"\n"]) end,
 	    Fs).
 
-listing(Ext, St) ->
+listing(Ext, St0) ->
+    St = St0#compile{encoding = none},
     listing(fun(Lf, Fs) -> beam_listing:module(Lf, Fs) end, Ext, St).
 
 listing(LFun, Ext, St) ->
@@ -1512,6 +1509,7 @@ listing(LFun, Ext, St) ->
     case file:open(Lfile, [write,delayed_write]) of
 	{ok,Lf} ->
             Code = restore_expanded_types(Ext, St#compile.code),
+            output_encoding(Lf, St),
 	    LFun(Lf, Code),
 	    ok = file:close(Lf),
 	    {ok,St};
@@ -1520,6 +1518,12 @@ listing(LFun, Ext, St) ->
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
     end.
 
+output_encoding(F, #compile{encoding = none}) ->
+    ok = io:setopts(F, [{encoding, epp:default_encoding()}]);
+output_encoding(F, #compile{encoding = Encoding}) ->
+    ok = io:setopts(F, [{encoding, Encoding}]),
+    ok = io:fwrite(F, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
+
 restore_expanded_types("P", Fs) ->
     epp:restore_typed_record_fields(Fs);
 restore_expanded_types("E", {M,I,Fs0}) ->
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index 94c78e68f9..9a02121d8b 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -57,7 +57,6 @@
 	     sys_core_dsetel,
 	     sys_core_fold,
 	     sys_core_inline,
-	     sys_expand_pmod,
 	     sys_pre_attributes,
 	     sys_pre_expand,
 	     v3_codegen,
diff --git a/lib/compiler/src/core_lint.erl b/lib/compiler/src/core_lint.erl
index b513a8965c..21296a8b66 100644
--- a/lib/compiler/src/core_lint.erl
+++ b/lib/compiler/src/core_lint.erl
@@ -247,7 +247,8 @@ gbody(E, Def, Rt, St0) ->
 	false -> St1
     end.
 
-gexpr(#c_var{name=N}, Def, _Rt, St) -> expr_var(N, Def, St);
+gexpr(#c_var{name=N}, Def, _Rt, St) when is_atom(N); is_integer(N) ->
+    expr_var(N, Def, St);
 gexpr(#c_literal{}, _Def, _Rt, St) -> St;
 gexpr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
     gexpr_list([H,T], Def, St);
diff --git a/lib/compiler/src/core_scan.erl b/lib/compiler/src/core_scan.erl
index 5aab8ae855..0ca2f57dde 100644
--- a/lib/compiler/src/core_scan.erl
+++ b/lib/compiler/src/core_scan.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %% 
 %% The 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,16 +32,16 @@
 %% 173 - 176	{ - ~		punctuation
 %% 177		DEL		control
 %% 200 - 237			control
-%% 240 - 277	NBSP - �	punctuation
-%% 300 - 326	� - �		uppercase
-%% 327		�		punctuation
-%% 330 - 336	� - �		uppercase
-%% 337 - 366	� - �		lowercase
-%% 367		�		punctuation
-%% 370 - 377	� - �		lowercase
+%% 240 - 277	NBSP - ¿	punctuation
+%% 300 - 326	À - Ö		uppercase
+%% 327		×		punctuation
+%% 330 - 336	Ø - Þ		uppercase
+%% 337 - 366	ß - ö		lowercase
+%% 367		÷		punctuation
+%% 370 - 377	ø - ÿ		lowercase
 %%
 %% Many punctuation characters region have special meaning.  Must
-%% watch using � \327, bvery close to x \170
+%% watch using × \327, bvery close to x \170
 
 -module(core_scan).
 
@@ -239,11 +240,11 @@ scan1([C|Cs], Toks, Pos) when C >= $\200, C =< $\240 ->
     scan1(Cs, Toks, Pos);
 scan1([C|Cs], Toks, Pos) when C >= $a, C =< $z ->	%Keywords
     scan_key_word(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
+scan1([C|Cs], Toks, Pos) when C >= $ß, C =< $ÿ, C /= $÷ ->
     scan_key_word(C, Cs, Toks, Pos);
 scan1([C|Cs], Toks, Pos) when C >= $A, C =< $Z ->	%Variables
     scan_variable(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
+scan1([C|Cs], Toks, Pos) when C >= $À, C =< $Þ, C /= $× ->
     scan_variable(C, Cs, Toks, Pos);
 scan1([C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Numbers
     scan_number(C, Cs, Toks, Pos);
@@ -308,9 +309,9 @@ scan_name([], Ncs) ->
     {Ncs,[]}.
 
 name_char(C) when C >= $a, C =< $z -> true;
-name_char(C) when C >= $�, C =< $�, C /= $� -> true;
+name_char(C) when C >= $ß, C =< $ÿ, C /= $÷ -> true;
 name_char(C) when C >= $A, C =< $Z -> true;
-name_char(C) when C >= $�, C =< $�, C /= $� -> true;
+name_char(C) when C >= $À, C =< $Þ, C /= $× -> true;
 name_char(C) when C >= $0, C =< $9 -> true;
 name_char($_) -> true;
 name_char($@) -> true;
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 18fba7962b..fbd7452301 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -686,11 +686,14 @@ call_1(#c_call{anno=Anno}, lists, all, [Arg1,Arg2], Sub) ->
     C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_case{arg=#c_apply{anno=Anno, op=F, args=[X]},
 				clauses = [CC1, CC2, CC3]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=true}},
-    Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err2)},
+		   body=match_fail([{function_name,{'lists^all',1}}|Anno], Err2)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -713,11 +716,14 @@ call_1(#c_call{anno=Anno}, lists, any, [Arg1,Arg2], Sub) ->
     C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_case{arg=#c_apply{anno=Anno, op=F, args=[X]},
 				clauses = [CC1, CC2, CC3]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=false}},
-    Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err2)},
+		   body=match_fail([{function_name,{'lists^any',1}}|Anno], Err2)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -733,11 +739,14 @@ call_1(#c_call{anno=Anno}, lists, foreach, [Arg1,Arg2], Sub) ->
     C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_seq{arg=#c_apply{anno=Anno, op=F, args=[X]},
 			       body=#c_apply{anno=Anno, op=Loop, args=[Xs]}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=ok}},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^foreach',1}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -756,14 +765,18 @@ call_1(#c_call{anno=Anno}, lists, map, [Arg1,Arg2], Sub) ->
 						      op=F,
 						      args=[X]},
 			       body=#c_cons{hd=H,
+					    anno=[compiler_generated],
 					    tl=#c_apply{anno=Anno,
 							op=Loop,
 							args=[Xs]}}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=[]}},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^map',1}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -780,18 +793,21 @@ call_1(#c_call{anno=Anno}, lists, flatmap, [Arg1,Arg2], Sub) ->
     C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_let{vars=[H],
 			       arg=#c_apply{anno=Anno, op=F, args=[X]},
-			       body=#c_call{anno=Anno,
+			       body=#c_call{anno=[compiler_generated|Anno],
 					    module=#c_literal{val=erlang},
 					    name=#c_literal{val='++'},
 					    args=[H,
 						  #c_apply{anno=Anno,
 							   op=Loop,
 							   args=[Xs]}]}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=[]}},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^flatmap',1}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -807,7 +823,7 @@ call_1(#c_call{anno=Anno}, lists, filter, [Arg1,Arg2], Sub) ->
     B = #c_var{name='B'},
     Err1 = #c_tuple{es=[#c_literal{val='case_clause'}, X]},
     CC1 = #c_clause{pats=[#c_literal{val=true}], guard=#c_literal{val=true},
-		    body=#c_cons{hd=X, tl=Xs}},
+		    body=#c_cons{anno=[compiler_generated], hd=X, tl=Xs}},
     CC2 = #c_clause{pats=[#c_literal{val=false}], guard=#c_literal{val=true},
 		    body=Xs},
     CC3 = #c_clause{pats=[X], guard=#c_literal{val=true},
@@ -821,11 +837,14 @@ call_1(#c_call{anno=Anno}, lists, filter, [Arg1,Arg2], Sub) ->
 							op=Loop,
 							args=[Xs]},
 					   body=Case}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=[]}},
-    Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err2)},
+		   body=match_fail([{function_name,{'lists^filter',1}}|Anno], Err2)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -845,10 +864,14 @@ call_1(#c_call{anno=Anno}, lists, foldl, [Arg1,Arg2,Arg3], Sub) ->
 				 args=[Xs, #c_apply{anno=Anno,
 						    op=F,
 						    args=[X, A]}]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true}, body=A},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=2}]},
+		   body=A},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, A, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^foldl',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, A],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -868,10 +891,14 @@ call_1(#c_call{anno=Anno}, lists, foldr, [Arg1,Arg2,Arg3], Sub) ->
 				 args=[X, #c_apply{anno=Anno,
 						   op=Loop,
 						   args=[Xs, A]}]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true}, body=A},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=2}]},
+		   body=A},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, A, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^foldr',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, A],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -901,7 +928,10 @@ call_1(#c_call{anno=Anno}, lists, mapfoldl, [Arg1,Arg2,Arg3], Sub) ->
 					     op=Loop,
 					     args=[Xs, Avar]},
 				    #c_tuple{es=[Xs, Avar]},
-				    #c_tuple{es=[#c_cons{hd=X, tl=Xs}, Avar]})
+				    #c_tuple{anno=[compiler_generated],
+					     es=[#c_cons{anno=[compiler_generated],
+							 hd=X, tl=Xs},
+						 Avar]})
 %%% Multiple-value version
 %%% 			      #c_let{vars=[Xs,A],
 %%% 				     %% The tuple here will be optimised
@@ -910,14 +940,18 @@ call_1(#c_call{anno=Anno}, lists, mapfoldl, [Arg1,Arg2,Arg3], Sub) ->
 %%% 				     body=#c_values{es=[#c_cons{hd=X, tl=Xs},
 %%% 							A]}}
 			     )},
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=2}]},
 %%% Tuple passing version
-		   body=#c_tuple{es=[#c_literal{val=[]}, Avar]}},
+		   body=#c_tuple{anno=[compiler_generated],
+				 es=[#c_literal{val=[]}, Avar]}},
 %%% Multiple-value version
 %%% 		   body=#c_values{es=[#c_literal{val=[]}, A]}},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Avar, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^mapfoldl',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, Avar],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -955,7 +989,9 @@ call_1(#c_call{anno=Anno}, lists, mapfoldr, [Arg1,Arg2,Arg3], Sub) ->
 			      #c_tuple{es=[Xs, Avar]},
 			      Match(#c_apply{anno=Anno, op=F, args=[X, Avar]},
 				    #c_tuple{es=[X, Avar]},
-				    #c_tuple{es=[#c_cons{hd=X, tl=Xs}, Avar]}))
+				    #c_tuple{anno=[compiler_generated],
+					     es=[#c_cons{anno=[compiler_generated],
+							 hd=X, tl=Xs}, Avar]}))
 %%% Multiple-value version
 %%% 		   body=#c_let{vars=[Xs,A],
 %%% 			       %% The tuple will be optimised away
@@ -965,14 +1001,18 @@ call_1(#c_call{anno=Anno}, lists, mapfoldr, [Arg1,Arg2,Arg3], Sub) ->
 %%% 					  #c_values{es=[#c_cons{hd=X, tl=Xs},
 %%% 						        A]})}
 		  },
-    C2 = #c_clause{pats=[#c_literal{val=[]}], guard=#c_literal{val=true},
+    C2 = #c_clause{pats=[#c_literal{val=[]}],
+		   guard=#c_call{module=#c_literal{val=erlang},
+				 name=#c_literal{val=is_function},
+				 args=[F, #c_literal{val=2}]},
 %%% Tuple passing version
-		   body=#c_tuple{es=[#c_literal{val=[]}, Avar]}},
+		   body=#c_tuple{anno=[compiler_generated],
+				 es=[#c_literal{val=[]}, Avar]}},
 %%% Multiple-value version
 %%% 		   body=#c_values{es=[#c_literal{val=[]}, A]}},
-    Err = #c_tuple{es=[#c_literal{val='function_clause'}, Xs]},
+    Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Avar, Xs]},
     C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
-		   body=match_fail(Anno, Err)},
+		   body=match_fail([{function_name,{'lists^mapfoldr',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, Avar],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
     L = #c_var{name='L'},
@@ -2632,16 +2672,19 @@ bsm_nonempty([#c_clause{pats=Ps}|Cs], Pos) ->
 bsm_nonempty([], _ ) -> false.
 
 %% bsm_ensure_no_partition(Cs, Pos) -> ok     (exception if problem)
-%%  We must make sure that binary matching is not partitioned between
+%%  We must make sure that matching is not partitioned between
 %%  variables like this:
 %%             foo(<<...>>) -> ...
-%%             foo(Var) when ... -> ...
-%%             foo(<<...>>) ->
+%%             foo(<Variable>) when ... -> ...
+%%             foo(<Any non-variable pattern>) ->
 %%  If there is such partition, we are not allowed to reuse the binary variable
-%%  for the match context. Also, arguments to the left of the argument that
-%%  is matched against a binary, are only allowed to be simple variables, not
-%%  used in guards. The reason is that we must know that the binary is only
-%%  matched in one place.
+%%  for the match context.
+%%
+%%  Also, arguments to the left of the argument that is matched
+%%  against a binary, are only allowed to be simple variables, not
+%%  used in guards. The reason is that we must know that the binary is
+%%  only matched in one place (i.e. there must be only one bs_start_match2
+%%  instruction emitted).
 
 bsm_ensure_no_partition(Cs, Pos) ->
     bsm_ensure_no_partition_1(Cs, Pos, before).
@@ -2649,6 +2692,12 @@ bsm_ensure_no_partition(Cs, Pos) ->
 %% Loop through each clause.
 bsm_ensure_no_partition_1([#c_clause{pats=Ps,guard=G}|Cs], Pos, State0) ->
     State = bsm_ensure_no_partition_2(Ps, Pos, G, simple_vars, State0),
+    case State of
+	'after' ->
+	    bsm_ensure_no_partition_after(Cs, Pos);
+	_ ->
+	    ok
+    end,
     bsm_ensure_no_partition_1(Cs, Pos, State);
 bsm_ensure_no_partition_1([], _, _) -> ok.
 
@@ -2658,8 +2707,7 @@ bsm_ensure_no_partition_2([#c_binary{}=Where|_], 1, _, Vstate, State) ->
 	before when Vstate =:= simple_vars -> within;
 	before -> bsm_problem(Where, Vstate);
 	within when Vstate =:= simple_vars -> within;
-	within -> bsm_problem(Where, Vstate);
-	'after' -> bsm_problem(Where, bin_partition)
+	within -> bsm_problem(Where, Vstate)
     end;
 bsm_ensure_no_partition_2([#c_alias{}=Alias|_], 1, N, Vstate, State) ->
     %% Retrieve the real pattern that the alias refers to and check that.
@@ -2708,6 +2756,15 @@ bsm_ensure_no_partition_2([#c_var{name=V}|Ps], N, G, Vstate, S) ->
 bsm_ensure_no_partition_2([_|Ps], N, G, _, S) ->
     bsm_ensure_no_partition_2(Ps, N-1, G, bin_argument_order, S).
 
+bsm_ensure_no_partition_after([#c_clause{pats=Ps}|Cs], Pos) ->
+    case nth(Pos, Ps) of
+	#c_var{} ->
+	    bsm_ensure_no_partition_after(Cs, Pos);
+	P ->
+	    bsm_problem(P, bin_partition)
+    end;
+bsm_ensure_no_partition_after([], _) -> ok.
+    
 bsm_could_match_binary(#c_alias{pat=P}) -> bsm_could_match_binary(P);
 bsm_could_match_binary(#c_cons{}) -> false;
 bsm_could_match_binary(#c_tuple{}) -> false;
@@ -2832,7 +2889,7 @@ format_error(useless_building) ->
 format_error(bin_opt_alias) ->
     "INFO: the '=' operator will prevent delayed sub binary optimization";
 format_error(bin_partition) ->
-    "INFO: non-consecutive clauses that match binaries "
+    "INFO: matching non-variables after a previous clause matching a variable "
 	"will prevent delayed sub binary optimization";
 format_error(bin_left_var_used_in_guard) ->
     "INFO: a variable to the left of the binary pattern is used in a guard; "
diff --git a/lib/compiler/src/sys_expand_pmod.erl b/lib/compiler/src/sys_expand_pmod.erl
deleted file mode 100644
index da644b4f0b..0000000000
--- a/lib/compiler/src/sys_expand_pmod.erl
+++ /dev/null
@@ -1,433 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, 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(sys_expand_pmod).
-
-%% Expand function definition forms of parameterized module. We assume
-%% all record definitions, imports, queries, etc., have been expanded
-%% away. Any calls on the form 'foo(...)' must be calls to local
-%% functions. Auto-generated functions (module_info,...) have not yet
-%% been added to the function definitions, but are listed in 'defined'
-%% and 'exports'. The automatic 'new/N' function is neither added to the
-%% definitions nor to the 'exports'/'defines' lists yet.
-
--export([forms/4]).
-
--record(pmod, {parameters, exports, defined, predef}).
-
-%% TODO: more abstract handling of predefined/static functions.
-
-forms(Fs0, Ps, Es0, Ds0) ->
-    PreDef = [{module_info,0},{module_info,1}],
-    forms(Fs0, Ps, Es0, Ds0, PreDef).
-
-forms(Fs0, Ps, Es0, Ds0, PreDef) ->
-    St0 = #pmod{parameters=Ps,exports=Es0,defined=Ds0, predef=PreDef},
-    {Fs1, St1} = forms(Fs0, St0),
-    Es1 = update_function_names(Es0, St1),
-    Ds1 = update_function_names(Ds0, St1),
-    Fs2 = update_forms(Fs1, St1),
-    {Fs2,Es1,Ds1}.
-
-%% This is extremely simplistic for now; all functions get an extra
-%% parameter, whether they need it or not, except for static functions.
-
-update_function_names(Es, St) ->
-    [update_function_name(E, St) || E <- Es].
-
-update_function_name(E={F,A}, St) when F =/= new ->
-    case ordsets:is_element(E, St#pmod.predef) of
-	true -> E;
-	false -> {F, A + 1}
-    end;
-update_function_name(E, _St) ->
-    E.
-
-update_forms([{function,L,N,A,Cs}|Fs],St) when N =/= new ->
-    [{function,L,N,A+1,Cs}|update_forms(Fs,St)];
-update_forms([F|Fs],St) ->
-    [F|update_forms(Fs,St)];
-update_forms([],_St) ->
-    [].
-
-%% Process the program forms.
-
-forms([F0|Fs0],St0) ->
-    {F1,St1} = form(F0,St0),
-    {Fs1,St2} = forms(Fs0,St1),
-    {[F1|Fs1],St2};
-forms([], St0) ->
-    {[], St0}.
-
-%% Only function definitions are of interest here. State is not updated.
-form({function,Line,Name0,Arity0,Clauses0},St) when Name0 =/= new ->
-    {Name,Arity,Clauses} = function(Name0, Arity0, Clauses0, St),
-    {{function,Line,Name,Arity,Clauses},St};
-%% Pass anything else through
-form(F,St) -> {F,St}.
-
-function(Name, Arity, Clauses0, St) ->
-    Clauses1 = clauses(Clauses0,St),
-    {Name,Arity,Clauses1}.
-
-clauses([C|Cs],St) ->
-    {clause,L,H,G,B} = clause(C,St),
-    T = {tuple,L,[{var,L,V} || V <- ['_'|St#pmod.parameters]]},
-    [{clause,L,H++[{match,L,T,{var,L,'THIS'}}],G,B}|clauses(Cs,St)];
-clauses([],_St) -> [].
-
-clause({clause,Line,H0,G0,B0},St) ->
-    H1 = head(H0,St),
-    G1 = guard(G0,St),
-    B1 = exprs(B0,St),
-    {clause,Line,H1,G1,B1}.
-
-head(Ps,St) -> patterns(Ps,St).
-
-patterns([P0|Ps],St) ->
-    P1 = pattern(P0,St),
-    [P1|patterns(Ps,St)];
-patterns([],_St) -> [].
-
-string_to_conses([], _Line, Tail) ->
-    Tail;
-string_to_conses([E|Rest], Line, Tail) ->
-    {cons, Line, {integer, Line, E}, string_to_conses(Rest, Line, Tail)}.
-
-pattern({var,_Line,_V}=Var,_St) -> Var;
-pattern({match,Line,L0,R0},St) ->
-    L1 = pattern(L0,St),
-    R1 = pattern(R0,St),
-    {match,Line,L1,R1};
-pattern({integer,_Line,_I}=Integer,_St) -> Integer;
-pattern({char,_Line,_C}=Char,_St) -> Char;
-pattern({float,_Line,_F}=Float,_St) -> Float;
-pattern({atom,_Line,_A}=Atom,_St) -> Atom;
-pattern({string,_Line,_S}=String,_St) -> String;
-pattern({nil,_Line}=Nil,_St) -> Nil;
-pattern({cons,Line,H0,T0},St) ->
-    H1 = pattern(H0,St),
-    T1 = pattern(T0,St),
-    {cons,Line,H1,T1};
-pattern({tuple,Line,Ps0},St) ->
-    Ps1 = pattern_list(Ps0,St),
-    {tuple,Line,Ps1};
-pattern({bin,Line,Fs},St) ->
-    Fs2 = pattern_grp(Fs,St),
-    {bin,Line,Fs2};
-pattern({op,_Line,'++',{nil,_},R},St) ->
-    pattern(R,St);
-pattern({op,_Line,'++',{cons,Li,{char,_C2,_I}=Char,T},R},St) ->
-    pattern({cons,Li,Char,{op,Li,'++',T,R}},St);
-pattern({op,_Line,'++',{cons,Li,{integer,_L2,_I}=Integer,T},R},St) ->
-    pattern({cons,Li,Integer,{op,Li,'++',T,R}},St);
-pattern({op,_Line,'++',{string,Li,L},R},St) ->
-    pattern(string_to_conses(L, Li, R),St);
-pattern({op,_Line,_Op,_A}=Op4,_St) -> Op4;
-pattern({op,_Line,_Op,_L,_R}=Op5,_St) -> Op5.
-
-pattern_grp([{bin_element,L1,E1,S1,T1} | Fs],St) ->
-    S2 = case S1 of
-	     default ->
-		 default;
-	     _ ->
-		 expr(S1,St)
-	 end,
-    T2 = case T1 of
-	     default ->
-		 default;
-	     _ ->
-		 bit_types(T1)
-	 end,
-    [{bin_element,L1,expr(E1,St),S2,T2} | pattern_grp(Fs,St)];
-pattern_grp([],_St) ->
-    [].
-
-bit_types([]) ->
-    [];
-bit_types([Atom | Rest]) when is_atom(Atom) ->
-    [Atom | bit_types(Rest)];
-bit_types([{Atom, Integer} | Rest]) when is_atom(Atom), is_integer(Integer) ->
-    [{Atom, Integer} | bit_types(Rest)].
-
-pattern_list([P0|Ps],St) ->
-    P1 = pattern(P0,St),
-    [P1|pattern_list(Ps,St)];
-pattern_list([],_St) -> [].
-
-guard([G0|Gs],St) when is_list(G0) ->
-    [guard0(G0,St) | guard(Gs,St)];
-guard(L,St) ->
-    guard0(L,St).
-
-guard0([G0|Gs],St) ->
-    G1 = guard_test(G0,St),
-    [G1|guard0(Gs,St)];
-guard0([],_St) -> [].
-
-guard_test(Expr={call,Line,{atom,La,F},As0},St) ->
-    case erl_internal:type_test(F, length(As0)) of
-	true ->
-	    As1 = gexpr_list(As0,St),
-	    {call,Line,{atom,La,F},As1};
-	_ ->
-	    gexpr(Expr,St)
-    end;
-guard_test(Any,St) ->
-    gexpr(Any,St).
-
-gexpr({var,_L,_V}=Var,_St) -> Var;
-% %% alternative implementation of accessing module parameters
-%     case index(V,St#pmod.parameters) of
-% 	N when N > 0 ->
-% 	    {call,L,{remote,L,{atom,L,erlang},{atom,L,element}},
-% 	     [{integer,L,N+1},{var,L,'THIS'}]};
-% 	_ ->
-% 	    Var
-%     end;
-gexpr({integer,_Line,_I}=Integer,_St) -> Integer;
-gexpr({char,_Line,_C}=Char,_St) -> Char;
-gexpr({float,_Line,_F}=Float,_St) -> Float;
-gexpr({atom,_Line,_A}=Atom,_St) -> Atom;
-gexpr({string,_Line,_S}=String,_St) -> String;
-gexpr({nil,_Line}=Nil,_St) -> Nil;
-gexpr({cons,Line,H0,T0},St) ->
-    H1 = gexpr(H0,St),
-    T1 = gexpr(T0,St),
-    {cons,Line,H1,T1};
-gexpr({tuple,Line,Es0},St) ->
-    Es1 = gexpr_list(Es0,St),
-    {tuple,Line,Es1};
-gexpr({call,Line,{atom,_La,F}=Atom,As0},St) ->
-    true = erl_internal:guard_bif(F, length(As0)),
-    As1 = gexpr_list(As0,St),
-    {call,Line,Atom,As1};
-%% Pre-expansion generated calls to erlang:is_record/3 must also be handled
-gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,is_record}},[_,_,_]=As0},St) ->
-    As1 = gexpr_list(As0,St),
-    {call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,is_record}},As1};
-%% Guard BIFs can be remote, but only in the module erlang...
-gexpr({call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As0},St) ->
-    A = length(As0),
-    true =
-	erl_internal:guard_bif(F, A) orelse erl_internal:arith_op(F, A) orelse
-	erl_internal:comp_op(F, A) orelse erl_internal:bool_op(F, A),
-    As1 = gexpr_list(As0,St),
-    {call,Line,{remote,La,{atom,Lb,erlang},{atom,Lc,F}},As1};
-%% Unfortunately, writing calls as {M,F}(...) is also allowed.
-gexpr({call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As0},St) ->
-    A = length(As0),
-    true =
-	erl_internal:guard_bif(F, A) orelse erl_internal:arith_op(F, A) orelse 
-	erl_internal:comp_op(F, A) orelse erl_internal:bool_op(F, A),
-    As1 = gexpr_list(As0,St),
-    {call,Line,{tuple,La,[{atom,Lb,erlang},{atom,Lc,F}]},As1};
-gexpr({bin,Line,Fs},St) ->
-    Fs2 = pattern_grp(Fs,St),
-    {bin,Line,Fs2};
-gexpr({op,Line,Op,A0},St) ->
-    true = erl_internal:arith_op(Op, 1) orelse erl_internal:bool_op(Op, 1),
-    A1 = gexpr(A0,St),
-    {op,Line,Op,A1};
-gexpr({op,Line,Op,L0,R0},St) ->
-    true =
-	Op =:= 'andalso' orelse Op =:= 'orelse' orelse
-	erl_internal:arith_op(Op, 2) orelse
-	erl_internal:bool_op(Op, 2) orelse erl_internal:comp_op(Op, 2),
-    L1 = gexpr(L0,St),
-    R1 = gexpr(R0,St),
-    {op,Line,Op,L1,R1}.
-
-gexpr_list([E0|Es],St) ->
-    E1 = gexpr(E0,St),
-    [E1|gexpr_list(Es,St)];
-gexpr_list([],_St) -> [].
-
-exprs([E0|Es],St) ->
-    E1 = expr(E0,St),
-    [E1|exprs(Es,St)];
-exprs([],_St) -> [].
-
-expr({var,_L,_V}=Var,_St) ->
-    Var;
-%     case index(V,St#pmod.parameters) of
-% 	N when N > 0 ->
-% 	    {call,L,{remote,L,{atom,L,erlang},{atom,L,element}},
-% 	     [{integer,L,N+1},{var,L,'THIS'}]};
-% 	_ ->
-% 	    Var
-%     end;
-expr({integer,_Line,_I}=Integer,_St) -> Integer;
-expr({float,_Line,_F}=Float,_St) -> Float;
-expr({atom,_Line,_A}=Atom,_St) -> Atom;
-expr({string,_Line,_S}=String,_St) -> String;
-expr({char,_Line,_C}=Char,_St) -> Char;
-expr({nil,_Line}=Nil,_St) -> Nil;
-expr({cons,Line,H0,T0},St) ->
-    H1 = expr(H0,St),
-    T1 = expr(T0,St),
-    {cons,Line,H1,T1};
-expr({lc,Line,E0,Qs0},St) ->
-    Qs1 = lc_bc_quals(Qs0,St),
-    E1 = expr(E0,St),
-    {lc,Line,E1,Qs1};
-expr({bc,Line,E0,Qs0},St) ->
-    Qs1 = lc_bc_quals(Qs0,St),
-    E1 = expr(E0,St),
-    {bc,Line,E1,Qs1};
-expr({tuple,Line,Es0},St) ->
-    Es1 = expr_list(Es0,St),
-    {tuple,Line,Es1};
-expr({block,Line,Es0},St) ->
-    Es1 = exprs(Es0,St),
-    {block,Line,Es1};
-expr({'if',Line,Cs0},St) ->
-    Cs1 = icr_clauses(Cs0,St),
-    {'if',Line,Cs1};
-expr({'case',Line,E0,Cs0},St) ->
-    E1 = expr(E0,St),
-    Cs1 = icr_clauses(Cs0,St),
-    {'case',Line,E1,Cs1};
-expr({'receive',Line,Cs0},St) ->
-    Cs1 = icr_clauses(Cs0,St),
-    {'receive',Line,Cs1};
-expr({'receive',Line,Cs0,To0,ToEs0},St) ->
-    To1 = expr(To0,St),
-    ToEs1 = exprs(ToEs0,St),
-    Cs1 = icr_clauses(Cs0,St),
-    {'receive',Line,Cs1,To1,ToEs1};
-expr({'try',Line,Es0,Scs0,Ccs0,As0},St) ->
-    Es1 = exprs(Es0,St),
-    Scs1 = icr_clauses(Scs0,St),
-    Ccs1 = icr_clauses(Ccs0,St),
-    As1 = exprs(As0,St),
-    {'try',Line,Es1,Scs1,Ccs1,As1};
-expr({'fun',_,{function,_,_,_}}=ExtFun,_St) ->
-    ExtFun;
-expr({'fun',Line,Body,Info},St) ->
-    case Body of
-	{clauses,Cs0} ->
-	    Cs1 = fun_clauses(Cs0,St),
-	    {'fun',Line,{clauses,Cs1},Info};
-	{function,F,A} = Function ->
-	    {F1,A1} = update_function_name({F,A},St),
-	    if A1 =:= A ->
-		    {'fun',Line,Function,Info};
-	       true ->
-		    %% Must rewrite local fun-name to a fun that does a
-		    %% call with the extra THIS parameter.
-		    As = make_vars(A, Line),
-		    As1 = As ++ [{var,Line,'THIS'}],
-		    Call = {call,Line,{atom,Line,F1},As1},
-		    Cs = [{clause,Line,As,[],[Call]}],
-		    {'fun',Line,{clauses,Cs},Info}
-	    end;
-	{function,_M,_F,_A} = Fun4 ->		%This is an error in lint!
-	    {'fun',Line,Fun4,Info}
-    end;
-expr({call,Lc,{atom,_,instance}=Name,As0},St) ->
-    %% All local functions 'instance(...)' are static by definition,
-    %% so they do not take a 'THIS' argument when called
-    As1 = expr_list(As0,St),
-    {call,Lc,Name,As1};
-expr({call,Lc,{atom,_,new}=Name,As0},St) ->
-    %% All local functions 'new(...)' are static by definition,
-    %% so they do not take a 'THIS' argument when called
-    As1 = expr_list(As0,St),
-    {call,Lc,Name,As1};
-expr({call,Lc,{atom,_,module_info}=Name,As0},St)
-  when length(As0) =:= 0; length(As0) =:= 1 ->
-    %% The module_info/0 and module_info/1 functions are also static.
-    As1 = expr_list(As0,St),
-    {call,Lc,Name,As1};
-expr({call,Lc,{atom,_Lf,_F}=Atom,As0},St) ->
-    %% Local function call - needs THIS parameter.
-    As1 = expr_list(As0,St),
-    {call,Lc,Atom,As1 ++ [{var,0,'THIS'}]};
-expr({call,Line,F0,As0},St) ->
-    %% Other function call
-    F1 = expr(F0,St),
-    As1 = expr_list(As0,St),
-    {call,Line,F1,As1};
-expr({'catch',Line,E0},St) ->
-    E1 = expr(E0,St),
-    {'catch',Line,E1};
-expr({match,Line,P0,E0},St) ->
-    E1 = expr(E0,St),
-    P1 = pattern(P0,St),
-    {match,Line,P1,E1};
-expr({bin,Line,Fs},St) ->
-    Fs2 = pattern_grp(Fs,St),
-    {bin,Line,Fs2};
-expr({op,Line,Op,A0},St) ->
-    A1 = expr(A0,St),
-    {op,Line,Op,A1};
-expr({op,Line,Op,L0,R0},St) ->
-    L1 = expr(L0,St),
-    R1 = expr(R0,St),
-    {op,Line,Op,L1,R1};
-%% The following are not allowed to occur anywhere!
-expr({remote,Line,M0,F0},St) ->
-    M1 = expr(M0,St),
-    F1 = expr(F0,St),
-    {remote,Line,M1,F1}.
-
-expr_list([E0|Es],St) ->
-    E1 = expr(E0,St),
-    [E1|expr_list(Es,St)];
-expr_list([],_St) -> [].
-
-icr_clauses([C0|Cs],St) ->
-    C1 = clause(C0,St),
-    [C1|icr_clauses(Cs,St)];
-icr_clauses([],_St) -> [].
-
-lc_bc_quals([{generate,Line,P0,E0}|Qs],St) ->
-    E1 = expr(E0,St),
-    P1 = pattern(P0,St),
-    [{generate,Line,P1,E1}|lc_bc_quals(Qs,St)];
-lc_bc_quals([{b_generate,Line,P0,E0}|Qs],St) ->
-    E1 = expr(E0,St),
-    P1 = pattern(P0,St),
-    [{b_generate,Line,P1,E1}|lc_bc_quals(Qs,St)];
-lc_bc_quals([E0|Qs],St) ->
-    E1 = expr(E0,St),
-    [E1|lc_bc_quals(Qs,St)];
-lc_bc_quals([],_St) -> [].
-
-fun_clauses([C0|Cs],St) ->
-    C1 = clause(C0,St),
-    [C1|fun_clauses(Cs,St)];
-fun_clauses([],_St) -> [].
-
-%% %% Return index from 1 upwards, or 0 if not in the list.
-%%
-%% index(X,Ys) -> index(X,Ys,1).
-%%
-%% index(X,[X|Ys],A) -> A;
-%% index(X,[Y|Ys],A) -> index(X,Ys,A+1);
-%% index(X,[],A) -> 0.
-
-make_vars(N, L) ->
-    make_vars(1, N, L).
-
-make_vars(N, M, L) when N =< M ->
-    V = list_to_atom("X"++integer_to_list(N)),
-    [{var,L,V} | make_vars(N + 1, M, L)];
-make_vars(_, _, _) ->
-    [].
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index e55fb2a037..7d918a55ed 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -28,17 +28,14 @@
 %% Main entry point.
 -export([module/2]).
 
--import(ordsets, [from_list/1,add_element/2,union/2]).
+-import(ordsets, [from_list/1,union/2]).
 -import(lists,   [member/2,foldl/3,foldr/3]).
 
 -include("../include/erl_bits.hrl").
 
 -record(expand, {module=[],                     %Module name
-                 parameters=undefined,          %Module parameters
-                 package="",                    %Module package
                  exports=[],                    %Exports
                  imports=[],                    %Imports
-                 mod_imports,                   %Module Imports
                  compile=[],                    %Compile flags
                  attributes=[],                 %Attributes
                  callbacks=[],                  %Callbacks
@@ -67,12 +64,8 @@ module(Fs0, Opts0) ->
     %% Set pre-defined exported functions.
     PreExp = [{module_info,0},{module_info,1}],
 
-    %% Set pre-defined module imports.
-    PreModImp = [{erlang,erlang},{packages,packages}],
-
     %% Build initial expand record.
     St0 = #expand{exports=PreExp,
-                  mod_imports=dict:from_list(PreModImp),
                   compile=Opts,
                   defined=PreExp,
                   bitdefault = erl_bits:system_bitdefault(),
@@ -80,88 +73,20 @@ module(Fs0, Opts0) ->
                  },
     %% Expand the functions.
     {Tfs,St1} = forms(Fs, define_functions(Fs, St0)),
-    {Efs,St2} = expand_pmod(Tfs, St1),
     %% Get the correct list of exported functions.
-    Exports = case member(export_all, St2#expand.compile) of
-                  true -> gb_sets:to_list(St2#expand.defined);
-                  false -> St2#expand.exports
+    Exports = case member(export_all, St1#expand.compile) of
+                  true -> gb_sets:to_list(St1#expand.defined);
+                  false -> St1#expand.exports
               end,
     %% Generate all functions from stored info.
-    {Ats,St3} = module_attrs(St2#expand{exports = Exports}),
+    {Ats,St3} = module_attrs(St1#expand{exports = Exports}),
     {Mfs,St4} = module_predef_funcs(St3),
-    {St4#expand.module, St4#expand.exports, Ats ++ Efs ++ Mfs,
+    {St4#expand.module, St4#expand.exports, Ats ++ Tfs ++ Mfs,
      St4#expand.compile}.
 
 compiler_options(Forms) ->
     lists:flatten([C || {attribute,_,compile,C} <- Forms]).
     
-expand_pmod(Fs0, St0) ->
-    case St0#expand.parameters of
-        undefined ->
-            {Fs0,St0};
-        Ps0 ->
-	    Base = get_base(St0#expand.attributes),
-	    Ps = if is_atom(Base) ->
-			 ['BASE' | Ps0];
-		    true ->
-			 Ps0
-		 end,
-	    Def = gb_sets:to_list(St0#expand.defined),
-            {Fs1,Xs,Ds} = sys_expand_pmod:forms(Fs0, Ps,
-                                                St0#expand.exports,
-						Def),
-	    St1 = St0#expand{exports=Xs,defined=gb_sets:from_list(Ds)},
-	    {Fs2,St2} = add_instance(Ps, Fs1, St1),
-	    {Fs3,St3} = ensure_new(Base, Ps0, Fs2, St2),
-            {Fs3,St3#expand{attributes = [{abstract, 0, [true]}
-					  | St3#expand.attributes]}}
-    end.
-
-get_base(As) ->
-    case lists:keyfind(extends, 1, As) of
-	{extends,_,[Base]} when is_atom(Base) ->
-	    Base;
-	_ ->
-	    []
-    end.
-
-ensure_new(Base, Ps, Fs, St) ->
-    case has_new(Fs) of
-	true ->
-	    {Fs, St};
-	false ->
-	    add_new(Base, Ps, Fs, St)
-    end.
-
-has_new([{function,_L,new,_A,_Cs} | _Fs]) ->
-    true;
-has_new([_ | Fs]) ->
-    has_new(Fs);
-has_new([]) ->
-    false.
-
-add_new(Base, Ps, Fs, St) ->
-    Vs = [{var,0,V} || V <- Ps],
-    As = if is_atom(Base) ->
-		 [{call,0,{remote,0,{atom,0,Base},{atom,0,new}},Vs} | Vs];
-	    true ->
-		 Vs
-	 end,
-    Body = [{call,0,{atom,0,instance},As}],
-    add_func(new, Vs, Body, Fs, St).
-
-add_instance(Ps, Fs, St) ->
-    Vs = [{var,0,V} || V <- Ps],
-    AbsMod = [{tuple,0,[{atom,0,St#expand.module}|Vs]}],
-    add_func(instance, Vs, AbsMod, Fs, St).
-
-add_func(Name, Args, Body, Fs, St) ->
-    A = length(Args), 
-    F = {function,0,Name,A,[{clause,0,Args,[],Body}]},
-    NA = {Name,A},
-    {[F|Fs],St#expand{exports=add_element(NA, St#expand.exports),
-		      defined=gb_sets:add_element(NA, St#expand.defined)}}.
-
 %% define_function(Form, State) -> State.
 %%  Add function to defined if form is a function.
 
@@ -241,15 +166,9 @@ forms([], St) -> {[],St}.
 %% attribute(Attribute, Value, Line, State) -> State'.
 %%  Process an attribute, this just affects the state.
 
-attribute(module, {Module, As}, _L, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-              package=packages:strip_last(M),
-              parameters=As};
 attribute(module, Module, _L, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-              package=packages:strip_last(M)};
+    true = is_atom(Module),
+    St#expand{module=Module};
 attribute(export, Es, _L, St) ->
     St#expand{exports=union(from_list(Es), St#expand.exports)};
 attribute(import, Is, _L, St) ->
@@ -312,8 +231,6 @@ pattern({tuple,Line,Ps}, St0) ->
 %%pattern({struct,Line,Tag,Ps}, St0) ->
 %%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
-pattern({record_field,_,_,_}=M, St) ->
-    {expand_package(M, St),St};  % must be a package name
 pattern({bin,Line,Es0}, St0) ->
     {Es1,St1} = pattern_bin(Es0, St0),
     {{bin,Line,Es1},St1};
@@ -404,8 +321,6 @@ expr({tuple,Line,Es0}, St0) ->
 %%expr({struct,Line,Tag,Es0}, Vs, St0) ->
 %%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
-expr({record_field,_,_,_}=M, St) ->
-    {expand_package(M, St),St};  % must be a package name
 expr({bin,Line,Es0}, St0) ->
     {Es1,St1} = expr_bin(Es0, St0),
     {{bin,Line,Es1},St1};
@@ -448,12 +363,9 @@ expr({call,Line,{atom,La,N}=Atom,As0}, St0) ->
 		    end
 	    end
     end;
-expr({call,Line,{record_field,_,_,_}=M,As0}, St0) ->
-    expr({call,Line,expand_package(M, St0),As0}, St0);
-expr({call,Line,{remote,Lr,M,F},As0}, St0) ->
-    M1 = expand_package(M, St0),
-    {[M2,F1|As1],St1} = expr_list([M1,F|As0], St0),
-    {{call,Line,{remote,Lr,M2,F1},As1},St1};
+expr({call,Line,{remote,Lr,M0,F},As0}, St0) ->
+    {[M1,F1|As1],St1} = expr_list([M0,F|As0], St0),
+    {{call,Line,{remote,Lr,M1,F1},As1},St1};
 expr({call,Line,F,As0}, St0) ->
     {[Fun1|As1],St1} = expr_list([F|As0], St0),
     {{call,Line,Fun1,As1},St1};
@@ -666,32 +578,6 @@ string_to_conses(Line, Cs, Tail) ->
     foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
 
 
-%% In syntax trees, module/package names are atoms or lists of atoms.
-
-package_to_string(A) when is_atom(A) -> atom_to_list(A);
-package_to_string(L) when is_list(L) -> packages:concat(L).
-
-expand_package({atom,L,A} = M, St) ->
-    case dict:find(A, St#expand.mod_imports) of
-        {ok, A1} ->
-            {atom,L,A1};
-        error ->
-            case packages:is_segmented(A) of
-                true ->
-                    M;
-                false -> 
-                    M1 = packages:concat(St#expand.package, A),
-                    {atom,L,list_to_atom(M1)}
-            end
-    end;
-expand_package(M, _St) ->
-    case erl_parse:package_segments(M) of
-        error ->
-            M;
-        M1 ->
-            {atom,element(2,M),list_to_atom(package_to_string(M1))}
-    end.
-
 %% import(Line, Imports, State) ->
 %%      State'
 %% imported(Name, Arity, State) ->
@@ -699,15 +585,10 @@ expand_package(M, _St) ->
 %%  Handle import declarations and test for imported functions. No need to
 %%  check when building imports as code is correct.
 
-import({Mod0,Fs}, St) ->
-    Mod = list_to_atom(package_to_string(Mod0)),
+import({Mod,Fs}, St) ->
+    true = is_atom(Mod),
     Mfs = from_list(Fs),
-    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)};
-import(Mod0, St) ->
-    Mod = package_to_string(Mod0),
-    Key = list_to_atom(packages:last(Mod)),
-    St#expand{mod_imports=dict:store(Key, list_to_atom(Mod),
-                                     St#expand.mod_imports)}.
+    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)}.
 
 add_imports(Mod, [F|Fs], Is) ->
     add_imports(Mod, Fs, orddict:store(F, Mod, Is));
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 3b065ec3b9..b9c5be09ce 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -29,7 +29,6 @@ MODULES= \
 	match_SUITE \
 	misc_SUITE \
 	num_bif_SUITE \
-	pmod_SUITE \
 	receive_SUITE \
 	record_SUITE \
 	trycatch_SUITE \
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index d63d2235d7..e8a92c509e 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -33,7 +33,8 @@
 	 matching_meets_construction/1,simon/1,matching_and_andalso/1,
 	 otp_7188/1,otp_7233/1,otp_7240/1,otp_7498/1,
 	 match_string/1,zero_width/1,bad_size/1,haystack/1,
-	 cover_beam_bool/1,matched_out_size/1,follow_fail_branch/1]).
+	 cover_beam_bool/1,matched_out_size/1,follow_fail_branch/1,
+	 no_partition/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -57,7 +58,8 @@ groups() ->
        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,matched_out_size,follow_fail_branch]}].
+       cover_beam_bool,matched_out_size,follow_fail_branch,
+       no_partition]}].
 
 
 init_per_suite(Config) ->
@@ -1133,6 +1135,48 @@ ffb_2(<<_,T/bitstring>>, List, A) ->
 	[_|_] -> bit_size(T)
     end.
 
+no_partition(_) ->
+    one = no_partition_1(<<"string">>, a1),
+    {two,<<"string">>} = no_partition_1(<<"string">>, a2),
+    {two,<<>>} = no_partition_1(<<>>, a2),
+    {two,a} = no_partition_1(a, a2),
+    three = no_partition_1(undefined, a3),
+    {four,a,[]} = no_partition_1([a], a4),
+    {five,a,b} = no_partition_1({a,b}, a5),
+
+    one = no_partition_2(<<"string">>, a1),
+    two = no_partition_2(<<"string">>, a2),
+    two = no_partition_2(<<>>, a2),
+    two = no_partition_2(a, a2),
+    three = no_partition_2(undefined, a3),
+    four = no_partition_2(42, a4),
+    five = no_partition_2([], a5),
+    six = no_partition_2(42.0, a6),
+    ok.
+
+no_partition_1(<<"string">>, a1) ->
+    one;
+no_partition_1(V, a2) ->
+    {two,V};
+no_partition_1(undefined, a3) ->
+    three;
+no_partition_1([H|T], a4) ->
+    {four,H,T};
+no_partition_1({A,B}, a5) ->
+    {five,A,B}.
+
+no_partition_2(<<"string">>, a1) ->
+    one;
+no_partition_2(_, a2) ->
+    two;
+no_partition_2(undefined, a3) ->
+    three;
+no_partition_2(42, a4) ->
+    four;
+no_partition_2([], a5) ->
+    five;
+no_partition_2(42.0, a6) ->
+    six.
 
 check(F, R) ->
     R = F().
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index bec97b0199..f8f74e6f7a 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -44,7 +44,7 @@ groups() ->
        {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,
+       live_var,convopts,
        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,
@@ -143,7 +143,6 @@ split({int, N}, <<N:16,B:N/binary,T/binary>>) ->
 ?comp(live_var).
 
 ?comp(trycatch_4).
-?comp(bad_functional_value).
 
 ?comp(catch_in_catch).
 
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 2cd75944f4..229e5a98a1 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -27,7 +27,7 @@
 	 app_test/1,
 	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
-	 other_output/1, package_forms/1, encrypted_abstr/1,
+	 other_output/1, encrypted_abstr/1,
 	 bad_record_use1/1, bad_record_use2/1, strict_record/1,
 	 missing_testheap/1, cover/1, env/1, core/1, asm/1,
 	 sys_pre_attributes/1]).
@@ -44,7 +44,7 @@ all() ->
     test_lib:recompile(?MODULE),
     [app_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
-     other_output, package_forms, encrypted_abstr,
+     other_output, encrypted_abstr,
      {group, bad_record_use}, strict_record,
      missing_testheap, cover, env, core, asm,
      sys_pre_attributes].
@@ -410,32 +410,6 @@ other_output(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-package_forms(Config) when is_list(Config) ->
-    Fs = [{attribute,1,file,{"./p.erl",1}},
-	  {attribute,1,module,[p,p]},
-	  {attribute,3,compile,export_all},
-	  {attribute,1,file,
-	   {"/clearcase/otp/erts/lib/stdlib/include/qlc.hrl",1}},
-	  {attribute,6,file,{"./p.erl",6}},
-	  {function,7,q,0,
-	   [{clause,7,[],[],
-	     [{call,8,
-	       {remote,8,{atom,8,qlc},{atom,8,q}},
-	       [{tuple,-8,
-		 [{atom,-8,qlc_lc},
-		  {'fun',-8,
-		   {clauses,
-		    [{clause,-8,[],[],
-		      [{tuple,-8,
-			[{atom,-8,simple_v1},
-			 {atom,-8,'X'},
-			 {'fun',-8,{clauses,[{clause,-8,[],[],[{nil,8}]}]}},
-			 {integer,-8,8}]}]}]}},
-		  {atom,-8,undefined}]}]}]}]},
-	  {eof,9}],
-    {ok,'p.p',_} = compile:forms(Fs, ['S',report]),
-    ok.
-
 encrypted_abstr(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(10)),
     ?line {Simple,Target} = files(Config, "encrypted_abstr"),
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index e2eb6a0dec..6dc7548437 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -258,6 +258,49 @@ lists(Config) when is_list(Config) ->
 
     %% Cleanup.
     erase(?MODULE),
+
+    {'EXIT',{function_clause,[{?MODULE,_,[_,not_a_list],_}|_]}} =
+        (catch lists:map(fun (X) -> X end, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,not_a_list],_}|_]}} =
+        (catch lists:flatmap(fun (X) -> X end, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,not_a_list],_}|_]}} =
+        (catch lists:foreach(fun (X) -> X end, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,not_a_list],_}|_]}} =
+        (catch lists:filter(fun (_) -> true end, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,not_a_list],_}|_]}} =
+        (catch lists:any(fun (_) -> false end, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,not_a_list],_}|_]}} =
+        (catch lists:all(fun (_) -> true end, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,acc,not_a_list],_}|_]}} =
+        (catch lists:foldl(fun (X, Acc) -> {X,Acc} end, acc, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,acc,not_a_list],_}|_]}} =
+        (catch lists:foldr(fun (X, Acc) -> {X,Acc} end, acc, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,acc,not_a_list],_}|_]}} =
+        (catch lists:mapfoldl(fun (X, Acc) -> {X,Acc} end, acc, not_a_list)),
+    {'EXIT',{function_clause,[{?MODULE,_,[_,acc,not_a_list],_}|_]}} =
+        (catch lists:mapfoldr(fun (X, Acc) -> {X,Acc} end, acc, not_a_list)),
+
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,[]],_}|_]}} =
+        (catch lists:map(not_a_function, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,[]],_}|_]}} =
+        (catch lists:flatmap(not_a_function, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,[]],_}|_]}} =
+        (catch lists:foreach(not_a_function, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,[]],_}|_]}} =
+        (catch lists:filter(not_a_function, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,[]],_}|_]}} =
+        (catch lists:any(not_a_function, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,[]],_}|_]}} =
+        (catch lists:all(not_a_function, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,acc,[]],_}|_]}} =
+        (catch lists:foldl(not_a_function, acc, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,acc,[]],_}|_]}} =
+        (catch lists:foldr(not_a_function, acc, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,acc,[]],_}|_]}} =
+        (catch lists:mapfoldl(not_a_function, acc, [])),
+    {'EXIT',{function_clause,[{?MODULE,_,[not_a_function,acc,[]],_}|_]}} =
+        (catch lists:mapfoldr(not_a_function, acc, [])),
+
     ok.
 		       
 my_apply(M, F, A, Init) ->
diff --git a/lib/compiler/test/pmod_SUITE.erl b/lib/compiler/test/pmod_SUITE.erl
deleted file mode 100644
index 5dd09a7245..0000000000
--- a/lib/compiler/test/pmod_SUITE.erl
+++ /dev/null
@@ -1,121 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, 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(pmod_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,
-	 basic/1, otp_8447/1]).
-
--include_lib("test_server/include/test_server.hrl").
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    test_lib:recompile(?MODULE),
-    [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].
-
-end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-basic(Config) when is_list(Config) ->
-    ?line basic_1(Config, []),
-    ?line basic_1(Config, [inline]),
-    ?line basic_1(Config, [{inline,500},inline]),
-    ok.
-
-basic_1(Config, Opts) ->
-    io:format("Options: ~p\n", [Opts]),
-    ?line ok = compile_load(pmod_basic, Config, Opts),
-
-    ?line Prop1 = pmod_basic:new([{a,xb},{b,true},{c,false}]),
-    ?line Prop2 = pmod_basic:new([{y,zz}]),
-    ?line io:format("Prop1 = ~p\n", [Prop1]),
-    ?line io:format("Prop2 = ~p\n", [Prop2]),
-
-    ?line {a,xb} = Prop1:lookup(a),
-    ?line none = Prop1:lookup(glurf),
-    ?line false = Prop1:or_props([]),
-    ?line true = Prop1:or_props([b,c]),
-    ?line true = Prop1:or_props([b,d]),
-    ?line false = Prop1:or_props([d]),
-
-    ?line none = Prop2:lookup(kalle),
-    ?line {y,zz} = Prop2:lookup(y),
-    ?line {a,xb} = Prop1:lookup(a),
-
-    ?line Prop3 = Prop1:prepend({blurf,true}),
-    ?line io:format("Prop3 = ~p\n", [Prop3]),
-    ?line {blurf,true} = Prop3:lookup(blurf),
-
-    Prop4 = Prop3:append(42),
-    ?line io:format("Prop4 = ~p\n", [Prop4]),
-    ?line {42,5} = Prop4:stupid_sum(),
-
-    %% Some record guards.
-    ?line ok = Prop4:bar({s,0}),
-    ?line ok = Prop4:bar_bar({s,blurf}),
-    ?line error = Prop4:bar_bar({s,a,b}),
-    ?line error = Prop4:bar_bar([]),
-
-    %% Call from a fun.
-    Fun = fun(Arg) -> Prop4:bar(Arg) end,
-    ?line ok = Fun({s,0}),
-
-    [{y,[1,2]},{x,[5,19]}] = Prop4:collapse([{y,[2,1]},{x,[19,5]}]),
-    ok.
-
-otp_8447(Config) when is_list(Config) ->
-    ?line P = pmod_basic:new(foo),
-    ?line [0,0,1,1,1,0,0,1] = P:bc1(),
-    ?line <<10:4>> = P:bc2(),
-    ok.
-
-compile_load(Module, Conf, Opts) ->
-    ?line Dir = ?config(data_dir,Conf),
-    ?line Src = filename:join(Dir, atom_to_list(Module)),
-    ?line Out = ?config(priv_dir,Conf),
-    ?line CompRc = compile:file(Src, [report,{outdir,Out}|Opts]),
-    ?line {ok,Module} = CompRc,
-    ?line code:purge(Module),
-    ?line {module,Module} =
-	code:load_abs(filename:join(Out, atom_to_list(Module))),
-    ok.
diff --git a/lib/compiler/test/pmod_SUITE_data/pmod_basic.erl b/lib/compiler/test/pmod_SUITE_data/pmod_basic.erl
deleted file mode 100644
index 19cce452dc..0000000000
--- a/lib/compiler/test/pmod_SUITE_data/pmod_basic.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, 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(pmod_basic, [Props]).
-
--export([lookup/1,or_props/1,prepend/1,append/1,stupid_sum/0]).
--export([bar/1,bar_bar/1]).
--export([bc1/0, bc2/0]).
--export([collapse/1]).
-
-lookup(Key) ->
-    proplists:lookup(Key, Props).
-
-or_props(Keys) ->    
-    Res = or_props_1(Keys, false),
-    true = is_bool(Res),			%is_bool/1 does not use Props.
-    Res.
-
-prepend(Term) ->
-    new([Term|Props]).
-
-append(Term) ->
-    pmod_basic:new(Props++[Term]).
-
-or_props_1([K|Ks], Acc) ->
-    or_props_1(Ks, proplists:get_bool(K, Props) or Acc);
-or_props_1([], Acc) -> Acc.
-
-is_bool(true) -> true;
-is_bool(false) -> true;
-is_bool(_) -> false.
-
-stupid_sum() ->
-    put(counter, 0),
-    Res = stupid_sum_1(Props, 0),
-    {Res,get(counter)}.
-
-stupid_sum_1([H|T], Sum0) ->
-    try add(Sum0, H) of
-	Sum -> stupid_sum_1(T, Sum)
-    catch
-	error:_ -> stupid_sum_1(T, Sum0)
-    after
-	bump()
-    end;
-stupid_sum_1([], Sum) -> Sum.
-
-bump() ->
-    put(counter, get(counter)+1).
-
-add(A, B) ->
-    A+B.
-
--record(s, {a}).
-
-bar(S) when S#s.a == 0 -> ok.
-
-bar_bar(S) when is_record(S, s) -> ok;
-bar_bar(_) -> error.
-
-bc1() ->
-    [A || <<A:1>> <= <<"9">> ].
-
-bc2() ->
-    << <<A:1>> || A <- [1,0,1,0] >>.
-
-collapse(L) ->
-    lists:keymap(fun lists:sort/1, 2, L).
diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
index 7787fad786..2864ee0538 100644
--- a/lib/cosEvent/src/Makefile
+++ b/lib/cosEvent/src/Makefile
@@ -168,9 +168,9 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
 $(APPUP_TARGET): $(APPUP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(APPUP_SRC) > $(APPUP_TARGET)
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APPUP_SRC) > $(APPUP_TARGET)
 
 docs:
 
@@ -179,12 +179,12 @@ docs:
 # ----------------------------------------------------
 
 IDL-GENERATED: CosEventChannelAdmin.idl cosEventApp.idl CosEventComm.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventChannelAdmin.cfg"}' CosEventChannelAdmin.idl
-	mv $(GEN_HRL_FILES1) $(EXTERNAL_INC_PATH)
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosEventApp.cfg"}' cosEventApp.idl
-	erlc $(ERL_IDL_FLAGS) CosEventComm.idl
-	mv $(GEN_HRL_FILES3) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventChannelAdmin.cfg"}' CosEventChannelAdmin.idl
+	$(V_at)mv $(GEN_HRL_FILES1) $(EXTERNAL_INC_PATH)
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosEventApp.cfg"}' cosEventApp.idl
+	$(V_at)erlc $(ERL_IDL_FLAGS) CosEventComm.idl
+	$(V_at)mv $(GEN_HRL_FILES3) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
index 213d433c72..b4b74bd192 100644
--- a/lib/cosEventDomain/src/Makefile
+++ b/lib/cosEventDomain/src/Makefile
@@ -141,9 +141,9 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
 $(APPUP_TARGET): $(APPUP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(APPUP_SRC) > $(APPUP_TARGET)
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APPUP_SRC) > $(APPUP_TARGET)
 
 docs:
 
@@ -151,9 +151,9 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 IDL-GENERATED: CosEventDomainAdmin.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventDomainAdmin.cfg"}' CosEventDomainAdmin.idl
-	mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventDomainAdmin.cfg"}' CosEventDomainAdmin.idl
+	$(V_at)mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
index d552349ede..9d3abb9bba 100644
--- a/lib/cosFileTransfer/src/Makefile
+++ b/lib/cosFileTransfer/src/Makefile
@@ -151,10 +151,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
@@ -162,9 +162,9 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 IDL-GENERATED: CosFileTransfer.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosFileTransfer.cfg"}' CosFileTransfer.idl
-	mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosFileTransfer.cfg"}' CosFileTransfer.idl
+	$(V_at)mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
index decf598bbf..13153bd7a1 100644
--- a/lib/cosNotification/src/Makefile
+++ b/lib/cosNotification/src/Makefile
@@ -332,10 +332,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
@@ -344,16 +344,16 @@ docs:
 # ----------------------------------------------------
 IDL-GENERATED: CosNotification.idl CosNotifyChannelAdmin.idl \
   CosNotifyFilter.idl cosNotificationAppComm.idl CosNotifyComm.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotification.cfg"}' CosNotification.idl
-	mv $(GEN_NOTIFICATION_HRL_FILES) $(EXTERNAL_INC_PATH)
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyChannelAdmin.cfg"}' CosNotifyChannelAdmin.idl
-	mv $(GEN_CHANNELADMIN_HRL_FILES) $(EXTERNAL_INC_PATH)
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyFilter.cfg"}' CosNotifyFilter.idl
-	mv $(GEN_NOTIFYFILTER_HRL_FILES) $(EXTERNAL_INC_PATH)
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosNotificationComm.cfg"}' cosNotificationAppComm.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyComm.cfg"}' CosNotifyComm.idl
-	mv $(GEN_NOTIFYCOMM_HRL_FILES) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotification.cfg"}' CosNotification.idl
+	$(V_at)mv $(GEN_NOTIFICATION_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyChannelAdmin.cfg"}' CosNotifyChannelAdmin.idl
+	$(V_at)mv $(GEN_CHANNELADMIN_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyFilter.cfg"}' CosNotifyFilter.idl
+	$(V_at)mv $(GEN_NOTIFYFILTER_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosNotificationComm.cfg"}' cosNotificationAppComm.idl
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyComm.cfg"}' CosNotifyComm.idl
+	$(V_at)mv $(GEN_NOTIFYCOMM_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(IDL_GEN_ERL_FILES) $(IDL_GEN_HRL_FILES): IDL-GENERATED
 
diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
index 54d1b6021c..d7b75d8bc5 100644
--- a/lib/cosProperty/src/Makefile
+++ b/lib/cosProperty/src/Makefile
@@ -151,10 +151,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
@@ -162,9 +162,9 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 IDL-GENERATED: CosProperty.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosProperty.cfg"}' CosProperty.idl
-	mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosProperty.cfg"}' CosProperty.idl
+	$(V_at)mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
index e8536a3f0a..0ab2b414ce 100644
--- a/lib/cosTime/src/Makefile
+++ b/lib/cosTime/src/Makefile
@@ -166,10 +166,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
@@ -177,13 +177,13 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 IDL-GENERATED: TimeBase.idl CosTime.idl CosTimerEvent.idl
-	erlc $(ERL_IDL_FLAGS) TimeBase.idl
-	mv $(GEN_TIMEBASE_HRL_FILES) $(EXTERNAL_INC_PATH)
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTime.cfg"}' CosTime.idl
-	mv $(GEN_COSTIME_HRL_FILES) $(EXTERNAL_INC_PATH)
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTimerEvent.cfg"}' CosTimerEvent.idl
-	mv $(GEN_COSTIMEREVENT_HRL_FILES) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) TimeBase.idl
+	$(V_at)mv $(GEN_TIMEBASE_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTime.cfg"}' CosTime.idl
+	$(V_at)mv $(GEN_COSTIME_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTimerEvent.cfg"}' CosTimerEvent.idl
+	$(V_at)mv $(GEN_COSTIMEREVENT_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
index 1d935c4d1d..7b4a9cf858 100644
--- a/lib/cosTransactions/src/Makefile
+++ b/lib/cosTransactions/src/Makefile
@@ -145,10 +145,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
@@ -156,9 +156,9 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 IDL-GENERATED: CosTransactions.idl
-	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTransactions.cfg"}' CosTransactions.idl
-	mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTransactions.cfg"}' CosTransactions.idl
+	$(V_at)mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index e19d6617f3..a20ddff05c 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -108,16 +108,16 @@ _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 debug opt valgrind: $(NIF_LIB) $(CALLBACK_LIB)
 
 $(OBJDIR)/%$(TYPEMARKER).o: %.c
-	$(INSTALL_DIR) $(OBJDIR)
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_at)$(INSTALL_DIR) $(OBJDIR)
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(LIBDIR)/crypto$(TYPEMARKER).so: $(CRYPTO_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB)
+	$(V_at)$(INSTALL_DIR) $(LIBDIR)
+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB)
 
 $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRYPTO_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(CRYPTO_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
+	$(V_at)$(INSTALL_DIR) $(LIBDIR)
+	$(V_LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(CRYPTO_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 $(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS)
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 72c9e5b8e8..e77e5fb8f0 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -44,6 +44,7 @@
 #include <openssl/md5.h>
 #include <openssl/md4.h>
 #include <openssl/sha.h>
+#include <openssl/ripemd.h>
 #include <openssl/bn.h>
 #include <openssl/objects.h>
 #include <openssl/rc4.h>
@@ -139,6 +140,10 @@ static ERL_NIF_TERM md5(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM md5_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM md5_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM md5_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM ripemd160(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM ripemd160_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM ripemd160_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM ripemd160_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM sha_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -246,6 +251,10 @@ static ErlNifFunc nif_funcs[] = {
     {"md5_init", 0, md5_init},
     {"md5_update", 2, md5_update},
     {"md5_final", 1, md5_final},
+    {"ripemd160", 1, ripemd160},
+    {"ripemd160_init", 0, ripemd160_init},
+    {"ripemd160_update", 2, ripemd160_update},
+    {"ripemd160_final", 1, ripemd160_final},
     {"sha", 1, sha},
     {"sha_init", 0, sha_init},
     {"sha_update", 2, sha_update},
@@ -326,6 +335,8 @@ ERL_NIF_INIT(crypto,nif_funcs,load,NULL,upgrade,unload)
 #define MD5_LEN_96      12
 #define MD4_CTX_LEN     (sizeof(MD4_CTX))
 #define MD4_LEN         16
+#define RIPEMD160_CTX_LEN (sizeof(RIPEMD160_CTX))
+#define RIPEMD160_LEN   20
 #define SHA_CTX_LEN     (sizeof(SHA_CTX))
 #define SHA_LEN         20
 #define SHA_LEN_96      12
@@ -600,6 +611,53 @@ static ERL_NIF_TERM md5_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     return ret;
 }
 
+static ERL_NIF_TERM ripemd160(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Data) */
+    ErlNifBinary ibin;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
+  return enif_make_badarg(env);
+    }
+    RIPEMD160((unsigned char *) ibin.data, ibin.size,
+  enif_make_new_binary(env,RIPEMD160_LEN, &ret));
+    return ret;
+}
+static ERL_NIF_TERM ripemd160_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+    ERL_NIF_TERM ret;
+    RIPEMD160_Init((RIPEMD160_CTX *) enif_make_new_binary(env, RIPEMD160_CTX_LEN, &ret));
+    return ret;
+}
+static ERL_NIF_TERM ripemd160_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+    RIPEMD160_CTX* new_ctx;
+    ErlNifBinary ctx_bin, data_bin;
+    ERL_NIF_TERM ret;
+    if (!enif_inspect_binary(env, argv[0], &ctx_bin)
+  || ctx_bin.size != RIPEMD160_CTX_LEN
+  || !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+  return enif_make_badarg(env);
+    }
+    new_ctx = (RIPEMD160_CTX*) enif_make_new_binary(env,RIPEMD160_CTX_LEN, &ret);
+    memcpy(new_ctx, ctx_bin.data, RIPEMD160_CTX_LEN);
+    RIPEMD160_Update(new_ctx, data_bin.data, data_bin.size);
+    return ret;
+}
+static ERL_NIF_TERM ripemd160_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context) */
+    ErlNifBinary ctx_bin;
+    RIPEMD160_CTX ctx_clone;
+    ERL_NIF_TERM ret;
+    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != RIPEMD160_CTX_LEN) {
+  return enif_make_badarg(env);
+    }
+    memcpy(&ctx_clone, ctx_bin.data, RIPEMD160_CTX_LEN); /* writable */
+    RIPEMD160_Final(enif_make_new_binary(env, RIPEMD160_LEN, &ret), &ctx_clone);
+    return ret;
+}
+
+
 static ERL_NIF_TERM sha(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Data) */    
     ErlNifBinary ibin;
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 3e533158c8..14c77c873f 100644..100755
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -265,7 +265,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <name>hash(Type, Data) -> Digest</name>
       <fsummary></fsummary>
       <type>
-	<v>Type = md4 | md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+	<v>Type = md4 | md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512</v>
 	<v>Data = iodata()</v>
 	<v>Digest = binary()</v>
       </type>
@@ -279,7 +279,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       <name>hash_init(Type) -> Context</name>
       <fsummary></fsummary>
       <type>
-	<v>Type = md4 | md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+	<v>Type = md4 | md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512</v>
       </type>
       <desc>
         <p>Initializes the context for streaming hash operations. <c>Type</c> determines
@@ -343,10 +343,27 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       </desc>
     </func>
     <func>
+      <name>hmac(Type, Key, Data) -> Mac</name>
+      <name>hmac(Type, Key, Data, MacLength) -> Mac</name>
+      <fsummary></fsummary>
+      <type>
+	<v>Type = md5 | sha | sha224 | sha256 | sha384 | sha512</v>
+        <v>Key = iodata()</v>
+	<v>Data = iodata()</v>
+        <v>MacLength = integer()</v>
+	<v>Mac = binary()</v>
+      </type>
+      <desc>
+        <p>Computes a HMAC of type <c>Type</c> from <c>Data</c> using
+        <c>Key</c> as the authentication key.</p> <c>MacLength</c>
+        will limit the size of the resultant <c>Mac</c>.
+      </desc>
+    </func>
+    <func>
       <name>hmac_init(Type, Key) -> Context</name>
       <fsummary></fsummary>
       <type>
-        <v>Type = sha | md5 | ripemd160</v>
+        <v>Type = md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512</v>
         <v>Key = iolist() | binary()</v>
         <v>Context = binary()</v>
       </type>
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index 910e89363c..5c200742ac 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -70,10 +70,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 461558a79e..aa89f6cc61 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -35,7 +35,7 @@
 -export([sha256_mac/2, sha256_mac/3]).
 -export([sha384_mac/2, sha384_mac/3]).
 -export([sha512_mac/2, sha512_mac/3]).
--export([hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
+-export([hmac/3, hmac/4, hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
 -export([des_cbc_encrypt/3, des_cbc_decrypt/3, des_cbc_ivec/1]).
 -export([des_ecb_encrypt/2, des_ecb_decrypt/2]).
 -export([des_cfb_encrypt/3, des_cfb_decrypt/3, des_cfb_ivec/2]).
@@ -107,7 +107,7 @@
 		    blowfish_ecb_encrypt, blowfish_ecb_decrypt, blowfish_ofb64_encrypt,
 		    des_cbc_ivec, des_cfb_ivec, erlint, mpint,
 		    hash, hash_init, hash_update, hash_final,
-		    hmac_init, hmac_update, hmac_final, hmac_final_n, info,
+		    hmac, hmac_init, hmac_update, hmac_final, hmac_final_n, info,
 		    rc2_cbc_encrypt, rc2_cbc_decrypt,
 		    info_lib]).
 
@@ -197,43 +197,48 @@ version() -> ?CRYPTO_VSN.
 %%
 
 -spec hash(_, iodata()) -> binary().
-hash(md5, Data)    -> md5(Data);
-hash(md4, Data)    -> md4(Data);
-hash(sha, Data)    -> sha(Data);
-hash(sha224, Data) -> sha224(Data);
-hash(sha256, Data) -> sha256(Data);
-hash(sha384, Data) -> sha384(Data);
-hash(sha512, Data) -> sha512(Data).
-
--spec hash_init('md5'|'md4'|'sha'|'sha224'|'sha256'|'sha384'|'sha512') -> any().
-
-hash_init(md5) -> {md5, md5_init()};
-hash_init(md4) -> {md4, md4_init()};
-hash_init(sha) -> {sha, sha_init()};
-hash_init(sha224) -> {sha224, sha224_init()};
-hash_init(sha256) -> {sha256, sha256_init()};
-hash_init(sha384) -> {sha384, sha384_init()};
-hash_init(sha512) -> {sha512, sha512_init()}.
+hash(md5, Data)          -> md5(Data);
+hash(md4, Data)          -> md4(Data);
+hash(sha, Data)          -> sha(Data);
+hash(ripemd160, Data)    -> ripemd160(Data);
+hash(sha224, Data)       -> sha224(Data);
+hash(sha256, Data)       -> sha256(Data);
+hash(sha384, Data)       -> sha384(Data);
+hash(sha512, Data)       -> sha512(Data).
+
+-spec hash_init('md5'|'md4'|'ripemd160'|
+                'sha'|'sha224'|'sha256'|'sha384'|'sha512') -> any().
+
+hash_init(md5)       -> {md5, md5_init()};
+hash_init(md4)       -> {md4, md4_init()};
+hash_init(sha)       -> {sha, sha_init()};
+hash_init(ripemd160) -> {ripemd160, ripemd160_init()};
+hash_init(sha224)    -> {sha224, sha224_init()};
+hash_init(sha256)    -> {sha256, sha256_init()};
+hash_init(sha384)    -> {sha384, sha384_init()};
+hash_init(sha512)    -> {sha512, sha512_init()}.
 
 -spec hash_update(_, iodata()) -> any().
 
-hash_update({md5,Context}, Data) -> {md5, md5_update(Context,Data)};
-hash_update({md4,Context}, Data) -> {md4, md4_update(Context,Data)};
-hash_update({sha,Context}, Data) -> {sha, sha_update(Context,Data)};
-hash_update({sha224,Context}, Data) -> {sha224, sha224_update(Context,Data)};
-hash_update({sha256,Context}, Data) -> {sha256, sha256_update(Context,Data)};
-hash_update({sha384,Context}, Data) -> {sha384, sha384_update(Context,Data)};
-hash_update({sha512,Context}, Data) -> {sha512, sha512_update(Context,Data)}.
+hash_update({md5,Context}, Data)       -> {md5, md5_update(Context,Data)};
+hash_update({md4,Context}, Data)       -> {md4, md4_update(Context,Data)};
+hash_update({sha,Context}, Data)       -> {sha, sha_update(Context,Data)};
+hash_update({ripemd160,Context}, Data) -> {ripemd160, ripemd160_update(Context,Data)};
+hash_update({sha224,Context}, Data)    -> {sha224, sha224_update(Context,Data)};
+hash_update({sha256,Context}, Data)    -> {sha256, sha256_update(Context,Data)};
+hash_update({sha384,Context}, Data)    -> {sha384, sha384_update(Context,Data)};
+hash_update({sha512,Context}, Data)    -> {sha512, sha512_update(Context,Data)}.
 
 -spec hash_final(_) -> binary().
 
-hash_final({md5,Context}) -> md5_final(Context);
-hash_final({md4,Context}) -> md4_final(Context);
-hash_final({sha,Context}) -> sha_final(Context);
-hash_final({sha224,Context}) -> sha224_final(Context);
-hash_final({sha256,Context}) -> sha256_final(Context);
-hash_final({sha384,Context}) -> sha384_final(Context);
-hash_final({sha512,Context}) -> sha512_final(Context).
+hash_final({md5,Context})       -> md5_final(Context);
+hash_final({md4,Context})       -> md4_final(Context);
+hash_final({sha,Context})       -> sha_final(Context);
+hash_final({ripemd160,Context}) -> ripemd160_final(Context);
+hash_final({sha224,Context})    -> sha224_final(Context);
+hash_final({sha256,Context})    -> sha256_final(Context);
+hash_final({sha384,Context})    -> sha384_final(Context);
+hash_final({sha512,Context})    -> sha512_final(Context).
 
 %%
 %%  MD5
@@ -263,6 +268,20 @@ md4_update(_Context, _Data) -> ?nif_stub.
 md4_final(_Context) -> ?nif_stub.
 
 %%
+%%  RIPEMD160
+%%
+
+-spec ripemd160(iodata()) -> binary().
+-spec ripemd160_init() -> binary().
+-spec ripemd160_update(binary(), iodata()) -> binary().
+-spec ripemd160_final(binary()) -> binary().
+
+ripemd160(_Data) -> ?nif_stub.
+ripemd160_init() -> ?nif_stub.
+ripemd160_update(_Context, _Data) -> ?nif_stub.
+ripemd160_final(_Context) -> ?nif_stub.
+
+%%
 %% SHA
 %%
 -spec sha(iodata()) -> binary().
@@ -418,11 +437,28 @@ sha512_final_nif(_Context) -> ?nif_stub.
 %%
 %%  HMAC (multiple hash options)
 %%
+
+-spec hmac(_, iodata(), iodata()) -> binary().
+-spec hmac(_, iodata(), iodata(), integer()) -> binary().
 -spec hmac_init(atom(), iodata()) -> binary().                             
 -spec hmac_update(binary(), iodata()) -> binary().
 -spec hmac_final(binary()) -> binary().                             
 -spec hmac_final_n(binary(), integer()) -> binary().                             
 
+hmac(md5, Key, Data)    -> md5_mac(Key, Data);
+hmac(sha, Key, Data)    -> sha_mac(Key, Data);
+hmac(sha224, Key, Data) -> sha224_mac(Key, Data);
+hmac(sha256, Key, Data) -> sha256_mac(Key, Data);
+hmac(sha384, Key, Data) -> sha384_mac(Key, Data);
+hmac(sha512, Key, Data) -> sha512_mac(Key, Data).
+
+hmac(md5, Key, Data, Size)    -> md5_mac_n(Key, Data, Size);
+hmac(sha, Key, Data, Size)    -> sha_mac(Key, Data, Size);
+hmac(sha224, Key, Data, Size) -> sha224_mac(Key, Data, Size);
+hmac(sha256, Key, Data, Size) -> sha256_mac(Key, Data, Size);
+hmac(sha384, Key, Data, Size) -> sha384_mac(Key, Data, Size);
+hmac(sha512, Key, Data, Size) -> sha512_mac(Key, Data, Size).
+
 hmac_init(_Type, _Key) -> ?nif_stub.
 hmac_update(_Context, _Data) -> ? nif_stub.
 hmac_final(_Context) -> ? nif_stub.
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 8965ab6b94..142f06677a 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -38,7 +38,10 @@
          hmac_update_md5/1,
          hmac_update_md5_io/1,
          hmac_update_md5_n/1,
+         hmac_rfc2202/1,
 	 hmac_rfc4231/1,
+   ripemd160/1,
+   ripemd160_update/1,
 	 sha256/1,
 	 sha256_update/1,
 	 sha512/1,
@@ -86,11 +89,11 @@ groups() ->
     [{info, [sequence],[info, {group, rest}]},
      {rest, [],
       [md5, md5_update, md4, md4_update, md5_mac,
-       md5_mac_io, sha, sha_update,
+       md5_mac_io, ripemd160, ripemd160_update, sha, sha_update,
        sha256, sha256_update, sha512, sha512_update,
        hmac_update_sha, hmac_update_sha_n, hmac_update_sha256, hmac_update_sha512,
        hmac_update_md5_n, hmac_update_md5_io, hmac_update_md5,
-       hmac_rfc4231,
+       hmac_rfc2202, hmac_rfc4231,
        des_cbc, aes_cfb, aes_cbc,
        des_cfb, des_cfb_iter, des3_cbc, des3_cfb, rc2_cbc,
        aes_cbc_iter, aes_ctr, aes_ctr_stream, des_cbc_iter, des_ecb,
@@ -418,8 +421,169 @@ hmac_update_md5(Config) when is_list(Config) ->
     ?line Exp2 = crypto:md5_mac(Key2, lists:flatten([Long1, Long2, Long3])), 
     ?line m(Exp2, Mac2).
 
+hmac_rfc2202(doc) ->
+    ["Generate an HMAC using hmac, md5_mac, and sha_mac."
+     "Test vectors are taken from RFC-2202."];
+hmac_rfc2202(suite) ->
+    [];
+hmac_rfc2202(Config) when is_list(Config) ->
+    hmac_rfc2202_md5(),
+    hmac_rfc2202_sha().
+
+hmac_rfc2202_md5() ->
+    %% Test case 1
+    Case1Key = binary:copy(<<16#0b>>, 16),
+    Case1Data = <<"Hi There">>,
+    Case1Exp = hexstr2bin("9294727a3638bb1c13f48ef8158bfc9d"),
+
+    ?line Case1Mac_1 = crypto:md5_mac(Case1Key, Case1Data),
+    ?line Case1Mac_2 = crypto:hmac(md5, Case1Key, Case1Data),
+    ?line m(Case1Exp, Case1Mac_1),
+    ?line m(Case1Exp, Case1Mac_2),
+
+    %% Test case 2
+    Case2Key = <<"Jefe">>,
+    Case2Data = <<"what do ya want for nothing?">>,
+    Case2Exp = hexstr2bin("750c783e6ab0b503eaa86e310a5db738"),
+
+    ?line Case2Mac_1 = crypto:md5_mac(Case2Key, Case2Data),
+    ?line Case2Mac_2 = crypto:hmac(md5, Case2Key, Case2Data),
+    ?line m(Case2Exp, Case2Mac_1),
+    ?line m(Case2Exp, Case2Mac_2),
+
+    %% Test case 3
+    Case3Key = binary:copy(<<16#aa>>, 16),
+    Case3Data = binary:copy(<<16#dd>>, 50),
+    Case3Exp = hexstr2bin("56be34521d144c88dbb8c733f0e8b3f6"),
+
+    ?line Case3Mac_1 = crypto:md5_mac(Case3Key, Case3Data),
+    ?line Case3Mac_2 = crypto:hmac(md5, Case3Key, Case3Data),
+    ?line m(Case3Exp, Case3Mac_1),
+    ?line m(Case3Exp, Case3Mac_2),
+
+    %% Test case 4
+    Case4Key = list_to_binary(lists:seq(1, 16#19)),
+    Case4Data = binary:copy(<<16#cd>>, 50),
+    Case4Exp = hexstr2bin("697eaf0aca3a3aea3a75164746ffaa79"),
+
+    ?line Case4Mac_1 = crypto:md5_mac(Case4Key, Case4Data),
+    ?line Case4Mac_2 = crypto:hmac(md5, Case4Key, Case4Data),
+    ?line m(Case4Exp, Case4Mac_1),
+    ?line m(Case4Exp, Case4Mac_2),
+
+    %% Test case 5
+    Case5Key = binary:copy(<<16#0c>>, 16),
+    Case5Data = "Test With Truncation",
+    Case5Exp = hexstr2bin("56461ef2342edc00f9bab995690efd4c"),
+    Case5Exp96 = hexstr2bin("56461ef2342edc00f9bab995"),
+
+    ?line Case5Mac_1 = crypto:md5_mac(Case5Key, Case5Data),
+    ?line Case5Mac_2 = crypto:hmac(md5, Case5Key, Case5Data),
+    ?line Case5Mac96_1 = crypto:md5_mac_96(Case5Key, Case5Data),
+    ?line Case5Mac96_2 = crypto:hmac(md5, Case5Key, Case5Data, 12),
+    ?line m(Case5Exp, Case5Mac_1),
+    ?line m(Case5Exp, Case5Mac_2),
+    ?line m(Case5Exp96, Case5Mac96_1),
+    ?line m(Case5Exp96, Case5Mac96_2),
+
+    %% Test case 6
+    Case6Key = binary:copy(<<16#aa>>, 80),
+    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+    Case6Exp = hexstr2bin("6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"),
+
+    ?line Case6Mac_1 = crypto:md5_mac(Case6Key, Case6Data),
+    ?line Case6Mac_2 = crypto:hmac(md5, Case6Key, Case6Data),
+    ?line m(Case6Exp, Case6Mac_1),
+    ?line m(Case6Exp, Case6Mac_2),
+
+    %% Test case 7
+    Case7Key = binary:copy(<<16#aa>>, 80),
+    Case7Data = <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>,
+    Case7Exp = hexstr2bin("6f630fad67cda0ee1fb1f562db3aa53e"),
+
+    ?line Case7Mac_1 = crypto:md5_mac(Case7Key, Case7Data),
+    ?line Case7Mac_2 = crypto:hmac(md5, Case7Key, Case7Data),
+    ?line m(Case7Exp, Case7Mac_1),
+    ?line m(Case7Exp, Case7Mac_2).
+
+hmac_rfc2202_sha() ->
+    %% Test case 1
+    Case1Key = binary:copy(<<16#0b>>, 20),
+    Case1Data = <<"Hi There">>,
+    Case1Exp = hexstr2bin("b617318655057264e28bc0b6fb378c8ef146be00"),
+
+    ?line Case1Mac_1 = crypto:sha_mac(Case1Key, Case1Data),
+    ?line Case1Mac_2 = crypto:hmac(sha, Case1Key, Case1Data),
+    ?line m(Case1Exp, Case1Mac_1),
+    ?line m(Case1Exp, Case1Mac_2),
+
+    %% Test case 2
+    Case2Key = <<"Jefe">>,
+    Case2Data = <<"what do ya want for nothing?">>,
+    Case2Exp = hexstr2bin("effcdf6ae5eb2fa2d27416d5f184df9c259a7c79"),
+
+    ?line Case2Mac_1 = crypto:sha_mac(Case2Key, Case2Data),
+    ?line Case2Mac_2 = crypto:hmac(sha, Case2Key, Case2Data),
+    ?line m(Case2Exp, Case2Mac_1),
+    ?line m(Case2Exp, Case2Mac_2),
+
+    %% Test case 3
+    Case3Key = binary:copy(<<16#aa>>, 20),
+    Case3Data = binary:copy(<<16#dd>>, 50),
+    Case3Exp = hexstr2bin("125d7342b9ac11cd91a39af48aa17b4f63f175d3"),
+
+    ?line Case3Mac_1 = crypto:sha_mac(Case3Key, Case3Data),
+    ?line Case3Mac_2 = crypto:hmac(sha, Case3Key, Case3Data),
+    ?line m(Case3Exp, Case3Mac_1),
+    ?line m(Case3Exp, Case3Mac_2),
+
+    %% Test case 4
+    Case4Key = list_to_binary(lists:seq(1, 16#19)),
+    Case4Data = binary:copy(<<16#cd>>, 50),
+    Case4Exp = hexstr2bin("4c9007f4026250c6bc8414f9bf50c86c2d7235da"),
+
+    ?line Case4Mac_1 = crypto:sha_mac(Case4Key, Case4Data),
+    ?line Case4Mac_2 = crypto:hmac(sha, Case4Key, Case4Data),
+    ?line m(Case4Exp, Case4Mac_1),
+    ?line m(Case4Exp, Case4Mac_2),
+
+    %% Test case 5
+    Case5Key = binary:copy(<<16#0c>>, 20),
+    Case5Data = "Test With Truncation",
+    Case5Exp = hexstr2bin("4c1a03424b55e07fe7f27be1d58bb9324a9a5a04"),
+    Case5Exp96 = hexstr2bin("4c1a03424b55e07fe7f27be1"),
+
+    ?line Case5Mac_1 = crypto:sha_mac(Case5Key, Case5Data),
+    ?line Case5Mac_2 = crypto:hmac(sha, Case5Key, Case5Data),
+    ?line Case5Mac96_1 = crypto:sha_mac_96(Case5Key, Case5Data),
+    ?line Case5Mac96_2 = crypto:hmac(sha, Case5Key, Case5Data, 12),
+    ?line m(Case5Exp, Case5Mac_1),
+    ?line m(Case5Exp, Case5Mac_2),
+    ?line m(Case5Exp96, Case5Mac96_1),
+    ?line m(Case5Exp96, Case5Mac96_2),
+
+    %% Test case 6
+    Case6Key = binary:copy(<<16#aa>>, 80),
+    Case6Data = <<"Test Using Larger Than Block-Size Key - Hash Key First">>,
+    Case6Exp = hexstr2bin("aa4ae5e15272d00e95705637ce8a3b55ed402112"),
+
+    ?line Case6Mac_1 = crypto:sha_mac(Case6Key, Case6Data),
+    ?line Case6Mac_2 = crypto:hmac(sha, Case6Key, Case6Data),
+    ?line m(Case6Exp, Case6Mac_1),
+    ?line m(Case6Exp, Case6Mac_2),
+
+    %% Test case 7
+    Case7Key = binary:copy(<<16#aa>>, 80),
+    Case7Data = <<"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data">>,
+    Case7Exp = hexstr2bin("e8e99d0f45237d786d6bbaa7965c7808bbff1a91"),
+
+    ?line Case7Mac_1 = crypto:sha_mac(Case7Key, Case7Data),
+    ?line Case7Mac_2 = crypto:hmac(sha, Case7Key, Case7Data),
+    ?line m(Case7Exp, Case7Mac_1),
+    ?line m(Case7Exp, Case7Mac_2).
+
 hmac_rfc4231(doc) ->
-    ["Generate an HMAC using crypto:shaXXX_mac and hmac_init, hmac_update, and hmac_final. "
+    ["Generate an HMAC using crypto:shaXXX_mac, hmac, and hmac_init, hmac_update, and hmac_final. "
      "Testvectors are take from RFC4231." ];
 hmac_rfc4231(suite) ->
     [];
@@ -446,29 +610,37 @@ hmac_rfc4231_do() ->
     ?line Case1Ctx224_2 = crypto:hmac_update(Case1Ctx224, Case1Data),
     ?line Case1Mac224_1 = crypto:hmac_final(Case1Ctx224_2),
     ?line Case1Mac224_2 = crypto:sha224_mac(Case1Key, Case1Data),
+    ?line Case1Mac224_3 = crypto:hmac(sha224, Case1Key, Case1Data),
     ?line m(Case1Exp224, Case1Mac224_1),
     ?line m(Case1Exp224, Case1Mac224_2),
+    ?line m(Case1Exp224, Case1Mac224_3),
 
     ?line Case1Ctx256 = crypto:hmac_init(sha256, Case1Key),
     ?line Case1Ctx256_2 = crypto:hmac_update(Case1Ctx256, Case1Data),
     ?line Case1Mac256_1 = crypto:hmac_final(Case1Ctx256_2),
     ?line Case1Mac256_2 = crypto:sha256_mac(Case1Key, Case1Data),
+    ?line Case1Mac256_3 = crypto:hmac(sha256, Case1Key, Case1Data),
     ?line m(Case1Exp256, Case1Mac256_1),
     ?line m(Case1Exp256, Case1Mac256_2),
+    ?line m(Case1Exp256, Case1Mac256_3),
 
     ?line Case1Ctx384 = crypto:hmac_init(sha384, Case1Key),
     ?line Case1Ctx384_2 = crypto:hmac_update(Case1Ctx384, Case1Data),
     ?line Case1Mac384_1 = crypto:hmac_final(Case1Ctx384_2),
     ?line Case1Mac384_2 = crypto:sha384_mac(Case1Key, Case1Data),
+    ?line Case1Mac384_3 = crypto:hmac(sha384, Case1Key, Case1Data),
     ?line m(Case1Exp384, Case1Mac384_1),
     ?line m(Case1Exp384, Case1Mac384_2),
+    ?line m(Case1Exp384, Case1Mac384_3),
 
     ?line Case1Ctx512 = crypto:hmac_init(sha512, Case1Key),
     ?line Case1Ctx512_2 = crypto:hmac_update(Case1Ctx512, Case1Data),
     ?line Case1Mac512_1 = crypto:hmac_final(Case1Ctx512_2),
     ?line Case1Mac512_2 = crypto:sha512_mac(Case1Key, Case1Data),
+    ?line Case1Mac512_3 = crypto:hmac(sha512, Case1Key, Case1Data),
     ?line m(Case1Exp512, Case1Mac512_1),
     ?line m(Case1Exp512, Case1Mac512_2),
+    ?line m(Case1Exp512, Case1Mac512_3),
 
     %% Test Case 2
     Case2Key = <<"Jefe">>,
@@ -489,29 +661,37 @@ hmac_rfc4231_do() ->
     ?line Case2Ctx224_2 = crypto:hmac_update(Case2Ctx224, Case2Data),
     ?line Case2Mac224_1 = crypto:hmac_final(Case2Ctx224_2),
     ?line Case2Mac224_2 = crypto:sha224_mac(Case2Key, Case2Data),
+    ?line Case2Mac224_3 = crypto:hmac(sha224, Case2Key, Case2Data),
     ?line m(Case2Exp224, Case2Mac224_1),
     ?line m(Case2Exp224, Case2Mac224_2),
+    ?line m(Case2Exp224, Case2Mac224_3),
 
     ?line Case2Ctx256 = crypto:hmac_init(sha256, Case2Key),
     ?line Case2Ctx256_2 = crypto:hmac_update(Case2Ctx256, Case2Data),
     ?line Case2Mac256_1 = crypto:hmac_final(Case2Ctx256_2),
     ?line Case2Mac256_2 = crypto:sha256_mac(Case2Key, Case2Data),
+    ?line Case2Mac256_3 = crypto:hmac(sha256, Case2Key, Case2Data),
     ?line m(Case2Exp256, Case2Mac256_1),
     ?line m(Case2Exp256, Case2Mac256_2),
+    ?line m(Case2Exp256, Case2Mac256_3),
 
     ?line Case2Ctx384 = crypto:hmac_init(sha384, Case2Key),
     ?line Case2Ctx384_2 = crypto:hmac_update(Case2Ctx384, Case2Data),
     ?line Case2Mac384_1 = crypto:hmac_final(Case2Ctx384_2),
     ?line Case2Mac384_2 = crypto:sha384_mac(Case2Key, Case2Data),
+    ?line Case2Mac384_3 = crypto:hmac(sha384, Case2Key, Case2Data),
     ?line m(Case2Exp384, Case2Mac384_1),
     ?line m(Case2Exp384, Case2Mac384_2),
+    ?line m(Case2Exp384, Case2Mac384_3),
 
     ?line Case2Ctx512 = crypto:hmac_init(sha512, Case2Key),
     ?line Case2Ctx512_2 = crypto:hmac_update(Case2Ctx512, Case2Data),
     ?line Case2Mac512_1 = crypto:hmac_final(Case2Ctx512_2),
     ?line Case2Mac512_2 = crypto:sha512_mac(Case2Key, Case2Data),
+    ?line Case2Mac512_3 = crypto:hmac(sha512, Case2Key, Case2Data),
     ?line m(Case2Exp512, Case2Mac512_1),
     ?line m(Case2Exp512, Case2Mac512_2),
+    ?line m(Case2Exp512, Case2Mac512_3),
 
     %% Test Case 3
     Case3Key = binary:copy(<<16#aa>>, 20),
@@ -532,29 +712,37 @@ hmac_rfc4231_do() ->
     ?line Case3Ctx224_2 = crypto:hmac_update(Case3Ctx224, Case3Data),
     ?line Case3Mac224_1 = crypto:hmac_final(Case3Ctx224_2),
     ?line Case3Mac224_2 = crypto:sha224_mac(Case3Key, Case3Data),
+    ?line Case3Mac224_3 = crypto:hmac(sha224, Case3Key, Case3Data),
     ?line m(Case3Exp224, Case3Mac224_1),
     ?line m(Case3Exp224, Case3Mac224_2),
+    ?line m(Case3Exp224, Case3Mac224_3),
 
     ?line Case3Ctx256 = crypto:hmac_init(sha256, Case3Key),
     ?line Case3Ctx256_2 = crypto:hmac_update(Case3Ctx256, Case3Data),
     ?line Case3Mac256_1 = crypto:hmac_final(Case3Ctx256_2),
     ?line Case3Mac256_2 = crypto:sha256_mac(Case3Key, Case3Data),
+    ?line Case3Mac256_3 = crypto:hmac(sha256, Case3Key, Case3Data),
     ?line m(Case3Exp256, Case3Mac256_1),
     ?line m(Case3Exp256, Case3Mac256_2),
+    ?line m(Case3Exp256, Case3Mac256_3),
 
     ?line Case3Ctx384 = crypto:hmac_init(sha384, Case3Key),
     ?line Case3Ctx384_2 = crypto:hmac_update(Case3Ctx384, Case3Data),
     ?line Case3Mac384_1 = crypto:hmac_final(Case3Ctx384_2),
     ?line Case3Mac384_2 = crypto:sha384_mac(Case3Key, Case3Data),
+    ?line Case3Mac384_3 = crypto:hmac(sha384, Case3Key, Case3Data),
     ?line m(Case3Exp384, Case3Mac384_1),
     ?line m(Case3Exp384, Case3Mac384_2),
+    ?line m(Case3Exp384, Case3Mac384_3),
 
     ?line Case3Ctx512 = crypto:hmac_init(sha512, Case3Key),
     ?line Case3Ctx512_2 = crypto:hmac_update(Case3Ctx512, Case3Data),
     ?line Case3Mac512_1 = crypto:hmac_final(Case3Ctx512_2),
     ?line Case3Mac512_2 = crypto:sha512_mac(Case3Key, Case3Data),
+    ?line Case3Mac512_3 = crypto:hmac(sha512, Case3Key, Case3Data),
     ?line m(Case3Exp512, Case3Mac512_1),
     ?line m(Case3Exp512, Case3Mac512_2),
+    ?line m(Case3Exp512, Case3Mac512_3),
 
     %% Test Case 4
     Case4Key = list_to_binary(lists:seq(1, 16#19)),
@@ -575,29 +763,81 @@ hmac_rfc4231_do() ->
     ?line Case4Ctx224_2 = crypto:hmac_update(Case4Ctx224, Case4Data),
     ?line Case4Mac224_1 = crypto:hmac_final(Case4Ctx224_2),
     ?line Case4Mac224_2 = crypto:sha224_mac(Case4Key, Case4Data),
+    ?line Case4Mac224_3 = crypto:hmac(sha224, Case4Key, Case4Data),
     ?line m(Case4Exp224, Case4Mac224_1),
     ?line m(Case4Exp224, Case4Mac224_2),
+    ?line m(Case4Exp224, Case4Mac224_3),
 
     ?line Case4Ctx256 = crypto:hmac_init(sha256, Case4Key),
     ?line Case4Ctx256_2 = crypto:hmac_update(Case4Ctx256, Case4Data),
     ?line Case4Mac256_1 = crypto:hmac_final(Case4Ctx256_2),
     ?line Case4Mac256_2 = crypto:sha256_mac(Case4Key, Case4Data),
+    ?line Case4Mac256_3 = crypto:hmac(sha256, Case4Key, Case4Data),
     ?line m(Case4Exp256, Case4Mac256_1),
     ?line m(Case4Exp256, Case4Mac256_2),
+    ?line m(Case4Exp256, Case4Mac256_3),
 
     ?line Case4Ctx384 = crypto:hmac_init(sha384, Case4Key),
     ?line Case4Ctx384_2 = crypto:hmac_update(Case4Ctx384, Case4Data),
     ?line Case4Mac384_1 = crypto:hmac_final(Case4Ctx384_2),
     ?line Case4Mac384_2 = crypto:sha384_mac(Case4Key, Case4Data),
+    ?line Case4Mac384_3 = crypto:hmac(sha384, Case4Key, Case4Data),
     ?line m(Case4Exp384, Case4Mac384_1),
     ?line m(Case4Exp384, Case4Mac384_2),
+    ?line m(Case4Exp384, Case4Mac384_3),
 
     ?line Case4Ctx512 = crypto:hmac_init(sha512, Case4Key),
     ?line Case4Ctx512_2 = crypto:hmac_update(Case4Ctx512, Case4Data),
     ?line Case4Mac512_1 = crypto:hmac_final(Case4Ctx512_2),
     ?line Case4Mac512_2 = crypto:sha512_mac(Case4Key, Case4Data),
+    ?line Case4Mac512_3 = crypto:hmac(sha512, Case4Key, Case4Data),
     ?line m(Case4Exp512, Case4Mac512_1),
     ?line m(Case4Exp512, Case4Mac512_2),
+    ?line m(Case4Exp512, Case4Mac512_3),
+
+    %% Test Case 5
+    Case5Key = binary:copy(<<16#0c>>, 20),
+    Case5Data = <<"Test With Truncation">>,
+    Case5Exp224 = hexstr2bin("0e2aea68a90c8d37c988bcdb9fca6fa8"),
+    Case5Exp256 = hexstr2bin("a3b6167473100ee06e0c796c2955552b"),
+    Case5Exp384 = hexstr2bin("3abf34c3503b2a23a46efc619baef897"),
+    Case5Exp512 = hexstr2bin("415fad6271580a531d4179bc891d87a6"),
+
+    ?line Case5Ctx224 = crypto:hmac_init(sha224, Case5Key),
+    ?line Case5Ctx224_2 = crypto:hmac_update(Case5Ctx224, Case5Data),
+    ?line Case5Mac224_1 = crypto:hmac_final_n(Case5Ctx224_2, 16),
+    ?line Case5Mac224_2 = crypto:sha224_mac(Case5Key, Case5Data, 16),
+    ?line Case5Mac224_3 = crypto:hmac(sha224, Case5Key, Case5Data, 16),
+    ?line m(Case5Exp224, Case5Mac224_1),
+    ?line m(Case5Exp224, Case5Mac224_2),
+    ?line m(Case5Exp224, Case5Mac224_3),
+
+    ?line Case5Ctx256 = crypto:hmac_init(sha256, Case5Key),
+    ?line Case5Ctx256_2 = crypto:hmac_update(Case5Ctx256, Case5Data),
+    ?line Case5Mac256_1 = crypto:hmac_final_n(Case5Ctx256_2, 16),
+    ?line Case5Mac256_2 = crypto:sha256_mac(Case5Key, Case5Data, 16),
+    ?line Case5Mac256_3 = crypto:hmac(sha256, Case5Key, Case5Data, 16),
+    ?line m(Case5Exp256, Case5Mac256_1),
+    ?line m(Case5Exp256, Case5Mac256_2),
+    ?line m(Case5Exp256, Case5Mac256_3),
+
+    ?line Case5Ctx384 = crypto:hmac_init(sha384, Case5Key),
+    ?line Case5Ctx384_2 = crypto:hmac_update(Case5Ctx384, Case5Data),
+    ?line Case5Mac384_1 = crypto:hmac_final_n(Case5Ctx384_2, 16),
+    ?line Case5Mac384_2 = crypto:sha384_mac(Case5Key, Case5Data, 16),
+    ?line Case5Mac384_3 = crypto:hmac(sha384, Case5Key, Case5Data, 16),
+    ?line m(Case5Exp384, Case5Mac384_1),
+    ?line m(Case5Exp384, Case5Mac384_2),
+    ?line m(Case5Exp384, Case5Mac384_3),
+
+    ?line Case5Ctx512 = crypto:hmac_init(sha512, Case5Key),
+    ?line Case5Ctx512_2 = crypto:hmac_update(Case5Ctx512, Case5Data),
+    ?line Case5Mac512_1 = crypto:hmac_final_n(Case5Ctx512_2, 16),
+    ?line Case5Mac512_2 = crypto:sha512_mac(Case5Key, Case5Data, 16),
+    ?line Case5Mac512_3 = crypto:hmac(sha512, Case5Key, Case5Data, 16),
+    ?line m(Case5Exp512, Case5Mac512_1),
+    ?line m(Case5Exp512, Case5Mac512_2),
+    ?line m(Case5Exp512, Case5Mac512_3),
 
     %% Test Case 6
     Case6Key = binary:copy(<<16#aa>>, 131),
@@ -618,29 +858,37 @@ hmac_rfc4231_do() ->
     ?line Case6Ctx224_2 = crypto:hmac_update(Case6Ctx224, Case6Data),
     ?line Case6Mac224_1 = crypto:hmac_final(Case6Ctx224_2),
     ?line Case6Mac224_2 = crypto:sha224_mac(Case6Key, Case6Data),
+    ?line Case6Mac224_3 = crypto:hmac(sha224, Case6Key, Case6Data),
     ?line m(Case6Exp224, Case6Mac224_1),
     ?line m(Case6Exp224, Case6Mac224_2),
+    ?line m(Case6Exp224, Case6Mac224_3),
 
     ?line Case6Ctx256 = crypto:hmac_init(sha256, Case6Key),
     ?line Case6Ctx256_2 = crypto:hmac_update(Case6Ctx256, Case6Data),
     ?line Case6Mac256_1 = crypto:hmac_final(Case6Ctx256_2),
     ?line Case6Mac256_2 = crypto:sha256_mac(Case6Key, Case6Data),
+    ?line Case6Mac256_3 = crypto:hmac(sha256, Case6Key, Case6Data),
     ?line m(Case6Exp256, Case6Mac256_1),
     ?line m(Case6Exp256, Case6Mac256_2),
+    ?line m(Case6Exp256, Case6Mac256_3),
 
     ?line Case6Ctx384 = crypto:hmac_init(sha384, Case6Key),
     ?line Case6Ctx384_2 = crypto:hmac_update(Case6Ctx384, Case6Data),
     ?line Case6Mac384_1 = crypto:hmac_final(Case6Ctx384_2),
     ?line Case6Mac384_2 = crypto:sha384_mac(Case6Key, Case6Data),
+    ?line Case6Mac384_3 = crypto:hmac(sha384, Case6Key, Case6Data),
     ?line m(Case6Exp384, Case6Mac384_1),
     ?line m(Case6Exp384, Case6Mac384_2),
+    ?line m(Case6Exp384, Case6Mac384_3),
 
     ?line Case6Ctx512 = crypto:hmac_init(sha512, Case6Key),
     ?line Case6Ctx512_2 = crypto:hmac_update(Case6Ctx512, Case6Data),
     ?line Case6Mac512_1 = crypto:hmac_final(Case6Ctx512_2),
     ?line Case6Mac512_2 = crypto:sha512_mac(Case6Key, Case6Data),
+    ?line Case6Mac512_3 = crypto:hmac(sha512, Case6Key, Case6Data),
     ?line m(Case6Exp512, Case6Mac512_1),
     ?line m(Case6Exp512, Case6Mac512_2),
+    ?line m(Case6Exp512, Case6Mac512_3),
     
     %% Test Case 7
     Case7Key = binary:copy(<<16#aa>>, 131),
@@ -663,29 +911,37 @@ hmac_rfc4231_do() ->
     ?line Case7Ctx224_2 = crypto:hmac_update(Case7Ctx224, Case7Data),
     ?line Case7Mac224_1 = crypto:hmac_final(Case7Ctx224_2),
     ?line Case7Mac224_2 = crypto:sha224_mac(Case7Key, Case7Data),
+    ?line Case7Mac224_3 = crypto:hmac(sha224, Case7Key, Case7Data),
     ?line m(Case7Exp224, Case7Mac224_1),
     ?line m(Case7Exp224, Case7Mac224_2),
+    ?line m(Case7Exp224, Case7Mac224_3),
 
     ?line Case7Ctx256 = crypto:hmac_init(sha256, Case7Key),
     ?line Case7Ctx256_2 = crypto:hmac_update(Case7Ctx256, Case7Data),
     ?line Case7Mac256_1 = crypto:hmac_final(Case7Ctx256_2),
     ?line Case7Mac256_2 = crypto:sha256_mac(Case7Key, Case7Data),
+    ?line Case7Mac256_3 = crypto:hmac(sha256, Case7Key, Case7Data),
     ?line m(Case7Exp256, Case7Mac256_1),
     ?line m(Case7Exp256, Case7Mac256_2),
+    ?line m(Case7Exp256, Case7Mac256_3),
 
     ?line Case7Ctx384 = crypto:hmac_init(sha384, Case7Key),
     ?line Case7Ctx384_2 = crypto:hmac_update(Case7Ctx384, Case7Data),
     ?line Case7Mac384_1 = crypto:hmac_final(Case7Ctx384_2),
     ?line Case7Mac384_2 = crypto:sha384_mac(Case7Key, Case7Data),
+    ?line Case7Mac384_3 = crypto:hmac(sha384, Case7Key, Case7Data),
     ?line m(Case7Exp384, Case7Mac384_1),
     ?line m(Case7Exp384, Case7Mac384_2),
+    ?line m(Case7Exp384, Case7Mac384_3),
 
     ?line Case7Ctx512 = crypto:hmac_init(sha512, Case7Key),
     ?line Case7Ctx512_2 = crypto:hmac_update(Case7Ctx512, Case7Data),
     ?line Case7Mac512_1 = crypto:hmac_final(Case7Ctx512_2),
     ?line Case7Mac512_2 = crypto:sha512_mac(Case7Key, Case7Data),
+    ?line Case7Mac512_3 = crypto:hmac(sha512, Case7Key, Case7Data),
     ?line m(Case7Exp512, Case7Mac512_1),
-    ?line m(Case7Exp512, Case7Mac512_2).
+    ?line m(Case7Exp512, Case7Mac512_2),
+    ?line m(Case7Exp512, Case7Mac512_3).
 
 hmac_update_md5_io(doc) ->
     ["Generate an MD5 HMAC using hmac_init, hmac_update, and hmac_final. "
@@ -719,7 +975,33 @@ hmac_update_md5_n(Config) when is_list(Config) ->
     ?line Mac = crypto:hmac_final_n(Ctx3, 12),
     ?line Exp = crypto:md5_mac_96(Key, lists:flatten([Data, Data2])), 
     ?line m(Exp, Mac).
-    
+%%
+%%
+ripemd160(doc) ->
+    ["Generate RIPEMD160 message digests and check the result."];
+ripemd160(suite) ->
+    [];
+ripemd160(Config) when is_list(Config) ->
+    ?line m(crypto:hash(ripemd160,"abc"),
+	    hexstr2bin("8EB208F7E05D987A9B044A8E98C6B087F15A0BFC")),
+    ?line m(crypto:hash(ripemd160,"abcdbcdecdefdefgefghfghighijhijkijkljklmklm"
+			  "nlmnomnopnopq"), 
+	    hexstr2bin("12A053384A9C0C88E405A06C27DCF49ADA62EB2B")).
+
+   
+%%
+%%
+ripemd160_update(doc) ->
+    ["Generate RIPEMD160 message digests by using ripemd160_init,"
+     "ripemd160_update, and ripemd160_final and check the result."];
+ripemd160_update(suite) ->
+    [];
+ripemd160_update(Config) when is_list(Config) ->
+    ?line Ctx = crypto:hash_init(ripemd160),
+    ?line Ctx1 = crypto:hash_update(Ctx, "abcdbcdecdefdefgefghfghighi"),
+    ?line Ctx2 = crypto:hash_update(Ctx1, "jhijkijkljklmklmnlmnomnopnopq"),
+    ?line m(crypto:hash_final(Ctx2), 
+      hexstr2bin("12A053384A9C0C88E405A06C27DCF49ADA62EB2B")).
 
 %%
 %%
@@ -1838,7 +2120,7 @@ worker_loop(N, Config) ->
 	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, strong_rand_test,
 	      rsa_verify_test, exor_test, rc4_test, rc4_stream_test, mod_exp_test,
               hmac_update_md5, hmac_update_sha, hmac_update_sha256, hmac_update_sha512,
-	      hmac_rfc4231,
+	      hmac_rfc2202, hmac_rfc4231,
 	      aes_ctr_stream },
 
     F = element(random:uniform(size(Funcs)),Funcs),
diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
index e8b350c0c7..cadde8cd1b 100644
--- a/lib/debugger/src/Makefile
+++ b/lib/debugger/src/Makefile
@@ -112,10 +112,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index 4d9ffc4f3b..c21ad486e8 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -104,7 +104,8 @@ handle_command(Command) ->
 reply({apply,M,F,As}) ->
     {value, erlang:apply(M,F,As)};
 reply({eval,Expr,Bs}) ->
-    erl_eval:expr(Expr, Bs). % {value, Value, Bs2}
+    %% Bindings is an orddict (sort them)
+    erl_eval:expr(Expr, lists:sort(Bs)). % {value, Value, Bs2}
 
 %% Demonitor and delete message from inbox
 %%
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 2e88c35741..3c084c53ac 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -249,7 +249,7 @@ meta_loop(Debugged, Bs, #ieval{level=Le} = Ieval) ->
 	{sys, Debugged, {value,Val}} ->
 	    {value, Val, Bs};
 	{sys, Debugged, {value,Val,Bs2}} ->
-	    {value, Val, Bs2};
+	    {value, Val, merge_bindings(Bs2, Bs, Ieval)};
 	{sys, Debugged, {exception,{Class,Reason,Stk}}} ->
 	    case get(exit_info) of
 
@@ -1248,7 +1248,7 @@ if_clauses([], Bs, Ieval) ->
     exception(error, if_clause, Bs, Ieval).
 
 %% case_clauses(Value, Clauses, Bindings, Error, Ieval)
-%%   Error = try_clause � case_clause
+%%   Error = try_clause | case_clause
 case_clauses(Val, [{clause,_,[P],G,B}|Cs], Bs0, Error, Ieval) ->
     case match(P, Val, Bs0) of
 	{match,Bs} ->
diff --git a/lib/debugger/src/dbg_ui_trace.erl b/lib/debugger/src/dbg_ui_trace.erl
index d318987f60..8017069c50 100644
--- a/lib/debugger/src/dbg_ui_trace.erl
+++ b/lib/debugger/src/dbg_ui_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %% 
 %% The 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,10 +31,10 @@
 
 		pid,           % pid() Debugged process
 		meta,          % pid() Meta process
-		status,        % {Status,Mod,Line} � {exit,Where,Reason}
-		               %   Status = init � idle | break
-		               %      | wait_break � wait_running
-		               %      � running
+		status,        % {Status,Mod,Line} | {exit,Where,Reason}
+		               %   Status = init | idle | break
+		               %      | wait_break | wait_running
+		               %      | running
                                % Where={Mod,Line} | null
 
 		cm,            % atom() | undefined Current module
@@ -718,7 +718,7 @@ menus() ->
 
 %% enable(Status) -> [MenuItem]
 %%   Status = init  % when first message from Meta has arrived
-%%          | idle | break | exit | wait_break � wait_running | running
+%%          | idle | break | exit | wait_break | wait_running | running
 enable(init) -> [];
 enable(idle) -> ['Stop','Kill'];
 enable(break) -> ['Step','Next','Continue','Finish','Skip',
diff --git a/lib/debugger/src/dbg_ui_trace_win.erl b/lib/debugger/src/dbg_ui_trace_win.erl
index 1b439cbf18..beb3fbd71e 100644
--- a/lib/debugger/src/dbg_ui_trace_win.erl
+++ b/lib/debugger/src/dbg_ui_trace_win.erl
@@ -418,8 +418,8 @@ clear_breaks(WinInfo, Mod) ->
 %%--------------------------------------------------------------------
 %% display(Arg)
 %%   Arg = idle | {Status,Mod,Line} | {running,Mod}
-%%       � {exit,Where,Reason} | {text,Text}
-%%     Status = break | wait � Level
+%%       | {exit,Where,Reason} | {text,Text}
+%%     Status = break | wait | Level
 %%       Level = int()
 %%     Mod = atom()
 %%     Line = integer()
diff --git a/lib/debugger/src/dbg_wx_code.erl b/lib/debugger/src/dbg_wx_code.erl
index 99826d9bdb..9853a5dbae 100644
--- a/lib/debugger/src/dbg_wx_code.erl
+++ b/lib/debugger/src/dbg_wx_code.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %% 
 %% The 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,6 +30,21 @@
 
 -define(stc, wxStyledTextCtrl).
 
+%% For wx-2.9 usage
+-ifndef(wxSTC_ERLANG_COMMENT_FUNCTION).
+-define(wxSTC_ERLANG_COMMENT_FUNCTION, 14).
+-define(wxSTC_ERLANG_COMMENT_MODULE, 15).
+-define(wxSTC_ERLANG_COMMENT_DOC, 16).
+-define(wxSTC_ERLANG_COMMENT_DOC_MACRO, 17).
+-define(wxSTC_ERLANG_ATOM_QUOTED, 18).
+-define(wxSTC_ERLANG_MACRO_QUOTED, 19).
+-define(wxSTC_ERLANG_RECORD_QUOTED, 20).
+-define(wxSTC_ERLANG_NODE_NAME_QUOTED, 21).
+-define(wxSTC_ERLANG_BIFS, 22).
+-define(wxSTC_ERLANG_MODULES, 23).
+-define(wxSTC_ERLANG_MODULES_ATT, 24).
+-endif.
+
 code_area(Parent) ->
     FixedFont = wxFont:new(10, ?wxFONTFAMILY_TELETYPE, ?wxNORMAL, ?wxNORMAL,[]),
     %%Ed = wxStyledTextCtrl:new(Parent, [{size, {700, 500}}]),
@@ -58,7 +73,21 @@ code_area(Parent) ->
 	       {?wxSTC_ERLANG_MACRO,    {40,144,170}},
 	       {?wxSTC_ERLANG_RECORD,   {40,100,20}},
 	       {?wxSTC_ERLANG_SEPARATOR,{0,0,0}},
-	       {?wxSTC_ERLANG_NODE_NAME,{0,0,0}}],
+	       {?wxSTC_ERLANG_NODE_NAME,{0,0,0}},
+	       %% Optional 2.9 stuff
+	       {?wxSTC_ERLANG_COMMENT_FUNCTION, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_MODULE, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_DOC, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_DOC_MACRO, {160,53,35}},
+	       {?wxSTC_ERLANG_ATOM_QUOTED, {0,0,0}},
+	       {?wxSTC_ERLANG_MACRO_QUOTED, {40,144,170}},
+	       {?wxSTC_ERLANG_RECORD_QUOTED, {40,100,20}},
+	       {?wxSTC_ERLANG_NODE_NAME_QUOTED, {0,0,0}},
+	       {?wxSTC_ERLANG_BIFS, {130,40,172}},
+	       {?wxSTC_ERLANG_MODULES, {64,102,244}},
+	       {?wxSTC_ERLANG_MODULES_ATT, {64,102,244}}
+	      ],
+
     SetStyle = fun({Style, Color}) ->
 		       ?stc:styleSetFont(Ed, Style, FixedFont),
 		       ?stc:styleSetForeground(Ed, Style, Color)
diff --git a/lib/debugger/src/dbg_wx_filedialog_win.erl b/lib/debugger/src/dbg_wx_filedialog_win.erl
index f109652a70..c8ecb7b5d4 100644
--- a/lib/debugger/src/dbg_wx_filedialog_win.erl
+++ b/lib/debugger/src/dbg_wx_filedialog_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -381,7 +381,6 @@ show_completion(Wanted, State = #state{text=TC, win=Win, list=LC, completion=Com
 	    Last = wxTextCtrl:getLastPosition(TC),
 	    wxTextCtrl:setSelection(TC, Start, Last),
 	    destroy_completion(Comp),
-	    wxWindow:setFocus(TC),
 	    State#state{ptext=Path, completion=undefined};
 	Paths when Comp =:= undefined ->
 	    {PosX,PosY} = wxListCtrl:getPosition(LC),
@@ -406,14 +405,16 @@ show_completion(Wanted, State = #state{text=TC, win=Win, list=LC, completion=Com
 	    %% wxListBox:connect(LB, command_listbox_doubleclicked),
 	    wxListBox:connect(LB, command_listbox_selected),
 	    wxWindow:show(Temp),
+	    %% setFocus does a select all on 2.9 sigh..
+	    {Start, Last} = wxTextCtrl:getSelection(TC),
 	    wxWindow:setFocus(TC),
+	    wxTextCtrl:setSelection(TC, Start, Last),
 	    State#state{completion = {Temp, LB}, ptext=Wanted};
 	Paths ->
 	    {_Temp, LB} = Comp,
 	    wxListBox:clear(LB),
 	    Files = [filename:basename(File) || File <- Paths],
-	    wxListBox:insertItems(LB,Files,0),
-	    wxWindow:setFocus(TC),
+	    Files /= [] andalso wxListBox:insertItems(LB,Files,0),
 	    State#state{ptext=Wanted}
     end.
 
diff --git a/lib/debugger/src/dbg_wx_settings.erl b/lib/debugger/src/dbg_wx_settings.erl
index 3be93c495c..94ecc5781d 100644
--- a/lib/debugger/src/dbg_wx_settings.erl
+++ b/lib/debugger/src/dbg_wx_settings.erl
@@ -49,31 +49,35 @@ save(Win, Pos, SFile) ->
 
 open_win(Win, Pos, SFile, Str, What) ->
     {SDir, SFileName} =
-	if
-	    %% If settings are saved for the first time, and to
-	    %% the default directory HOME/erlang.tools/debugger,
-	    %% make sure the directory exists, or create it if
-	    %% desired and possible
-	    SFile==default -> {default_settings_dir(Win), "NoName.state"};
-	    true -> {filename:dirname(SFile), filename:basename(SFile)}
-	end,
-		    
+        if
+            %% If settings are saved for the first time, and to
+            %% the default directory HOME/erlang.tools/debugger,
+            %% make sure the directory exists, or create it if
+            %% desired and possible
+            SFile==default -> {default_settings_dir(Win), "NoName.state"};
+            true -> {filename:dirname(SFile), filename:basename(SFile)}
+        end,
+
     FD = wxFileDialog:new(Win, [{message,Str},{pos, Pos},
-				{defaultDir,SDir},
-				{defaultFile,SFileName},
-				{wildCard, "*.state"},
-				{style,What}]),
+                                {defaultDir,SDir},
+                                {defaultFile,SFileName},
+                                {wildCard, "*.state"},
+                                {style,What}]),
     case wxFileDialog:showModal(FD) of
-	?wxID_OK ->
-	    File = wxFileDialog:getFilename(FD),
-	    Dir = wxFileDialog:getDirectory(FD),
-	    wxFileDialog:destroy(FD),
-	    {ok, filename:join(Dir,File)};
-	_ ->
-	    wxFileDialog:destroy(FD),
-	    cancel
+        ?wxID_OK ->
+            case wxFileDialog:getPaths(FD) of
+                [NewFile] ->
+                    wxFileDialog:destroy(FD),
+                    {ok, NewFile};
+                _ ->
+                    wxFileDialog:destroy(FD),
+                    cancel
+            end;
+        _ ->
+            wxFileDialog:destroy(FD),
+            cancel
     end.
-   
+
 default_settings_dir(Win) ->
     {ok, [[Home]]} = init:get_argument(home),
     DefDir = filename:join([Home, ".erlang_tools", "debugger"]),
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index 2fdf39ba5a..0a3cac905f 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %% 
 %% The 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 @@
 
 		pid,           % pid() Debugged process
 		meta,          % pid() Meta process
-		status,        % {Status,Mod,Line} � {exit,Where,Reason}
-		               %   Status = init � idle | break
-		               %      | wait_break � wait_running
-		               %      � running
+		status,        % {Status,Mod,Line} | {exit,Where,Reason}
+		               %   Status = init | idle | break
+		               %      | wait_break | wait_running
+		               %      | running
                                % Where={Mod,Line} | null
 
 		cm,            % atom() | undefined Current module
@@ -513,7 +513,7 @@ gui_cmd({edit, {Var, Val}}, State) ->
 	cancel ->
 	    State;
 	{Var, Term} ->
-	    Cmd = atom_to_list(Var)++"="++io_lib:format("~p", [Term]),
+	    Cmd = atom_to_list(Var)++"="++io_lib:format("~w", [Term]),
 	    gui_cmd({user_command, lists:flatten(Cmd)}, State)
     end.
 
@@ -740,7 +740,7 @@ menus() ->
 
 %% enable(Status) -> [MenuItem]
 %%   Status = init  % when first message from Meta has arrived
-%%          | idle | break | exit | wait_break � wait_running | running
+%%          | idle | break | exit | wait_break | wait_running | running
 enable(init) -> [];
 enable(idle) -> ['Stop','Kill'];
 enable(break) -> ['Step','Next','Continue','Finish','Skip',
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 68e8e0b844..8b206ccd78 100644
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,6 @@
 
 %%
 -module(dbg_wx_trace_win).
--compile([{nowarn_deprecated_function,{gs,config,2}}]).
 
 %% External exports
 -export([init/0, stop/1]).
@@ -431,8 +430,8 @@ clear_breaks(WinInfo, Mod) ->
 %%--------------------------------------------------------------------
 %% display(Arg)
 %%   Arg = idle | {Status,Mod,Line} | {running,Mod}
-%%       � {exit,Where,Reason} | {text,Text}
-%%     Status = break | wait � Level
+%%       | {exit,Where,Reason} | {text,Text}
+%%     Status = break | wait | Level
 %%       Level = int()
 %%     Mod = atom()
 %%     Line = integer()
@@ -481,13 +480,9 @@ display(#winInfo{window=Win, sb=Sb},Arg) ->
 %%   Contents = string()
 %% Note: remove_code/2 should not be used for currently shown module.
 %%--------------------------------------------------------------------
-is_shown(WinInfo, Mod) ->
-    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
-	{Mod, Editor} ->
-	    gs:config(Editor, raise),  %% BUGBUG
-	    {true, WinInfo#winInfo{editor={Mod, Editor}}};
-	false -> false
-    end.
+is_shown(_WinInfo, _Mod) ->
+    %% Previously cached modules here, nyi so return false
+    false.
 
 show_code(WinInfo = #winInfo{editor={_, Ed}}, Mod, Contents) ->
     %% Insert code and update breakpoints, if any
@@ -572,7 +567,7 @@ update_bindings(#winInfo{bind=#sub{out=BA}}, Bs) ->
     wx:foldl(fun({Var,Val},Row) ->
 		     wxListCtrl:insertItem(BA, Row, ""), 
 		     wxListCtrl:setItem(BA, Row, 0, dbg_wx_win:to_string(Var)),
-		     wxListCtrl:setItem(BA, Row, 1, dbg_wx_win:to_string("~500P",[Val, 80])),
+		     wxListCtrl:setItem(BA, Row, 1, dbg_wx_win:to_string("~99999tP",[Val, 20])),
 		     Row+1
 	     end, 0, Bs),
     put(bindings,Bs),
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index faf3cc178f..3cb6edd953 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -252,9 +252,9 @@ notify(Win,Message) ->
 %%--------------------------------------------------------------------
 
 entry(Parent, Title, Prompt, {Type, Value}) ->
-    Ted = wxTextEntryDialog:new(Parent, to_string(Prompt), 
-				[{caption, to_string(Title)}, 
-				 {value, to_string(Value)}]),
+    Ted = wxTextEntryDialog:new(Parent, to_string(Prompt),
+				[{caption, to_string(Title)},
+				 {value, to_string("~999999tp",Value)}]),
 
     case wxDialog:showModal(Ted) of
 	?wxID_OK ->
@@ -306,7 +306,7 @@ to_string([]) -> "";
 to_string(List) when is_list(List) ->
     List;
 to_string(Term) ->
-    io_lib:format("~p",[Term]).
+    io_lib:format("~tp",[Term]).
 
 to_string(Format,Args) ->
     io_lib:format(Format, Args).
diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl
index b3a8a07f03..1c9f2eddd1 100644
--- a/lib/debugger/src/int.erl
+++ b/lib/debugger/src/int.erl
@@ -626,18 +626,18 @@ find_src(Beam) ->
 
 find_beam(Mod, Src) ->
     SrcDir = filename:dirname(Src),
-    BeamFile = packages:last(Mod) ++ code:objfile_extension(),
+    BeamFile = atom_to_list(Mod) ++ code:objfile_extension(),
     File = filename:join(SrcDir, BeamFile),
     case is_file(File) of
 	true -> File;
-	false -> find_beam_1(Mod, SrcDir)
+	false -> find_beam_1(Mod, BeamFile, SrcDir)
     end.
 
-find_beam_1(Mod, SrcDir) ->
-    RootDir = find_root_dir(SrcDir, packages:first(Mod)),
+find_beam_1(Mod, BeamFile, SrcDir) ->
+    RootDir = filename:dirname(SrcDir),
     EbinDir = filename:join(RootDir, "ebin"),
     CodePath = [EbinDir | code:get_path()],
-    BeamFile = to_path(Mod) ++ code:objfile_extension(),
+    BeamFile = atom_to_list(Mod) ++ code:objfile_extension(),
     lists:foldl(fun(_, Beam) when is_list(Beam) -> Beam;
 		   (Dir, error) ->
 			File = filename:join(Dir, BeamFile),
@@ -649,14 +649,6 @@ find_beam_1(Mod, SrcDir) ->
 		error,
 		CodePath).
 
-to_path(X) ->
-    filename:join(packages:split(X)).
-
-find_root_dir(Dir, [_|Ss]) ->
-    find_root_dir(filename:dirname(Dir), Ss);
-find_root_dir(Dir, []) ->
-    filename:dirname(Dir).
-
 check_beam(BeamBin) when is_binary(BeamBin) ->
     case beam_lib:chunks(BeamBin, [abstract_code,exports]) of
 	{ok,{_Mod,[{abstract_code,no_abstract_code}|_]}} ->
@@ -711,14 +703,11 @@ scan_module_name_2(_, _) ->
 
 scan_module_name_3(Ts) ->
     case erl_parse:parse_form(Ts) of
-	{ok, {attribute,_,module,{M,_}}} -> module_atom(M);
-	{ok, {attribute,_,module,M}} -> module_atom(M);
+	{ok, {attribute,_,module,{M,_}}} -> M;
+	{ok, {attribute,_,module,M}} -> M;
 	_ -> error
     end.
 
-module_atom(A) when is_atom(A) -> A;
-module_atom(L) when is_list(L) -> list_to_atom(packages:concat(L)).
-
 %%--Stop interpreting modules-----------------------------------------
 
 del_mod(AbsMod, Dist) ->
diff --git a/lib/dialyzer/doc/src/dialyzer.xml b/lib/dialyzer/doc/src/dialyzer.xml
index 4080dfdf77..5e0c9b51e3 100644
--- a/lib/dialyzer/doc/src/dialyzer.xml
+++ b/lib/dialyzer/doc/src/dialyzer.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -288,7 +288,11 @@ Option   :: {files,          [Filename :: string()]}
           | {include_dirs,   [DirName :: string()]}
           | {output_file,    FileName :: string()}
           | {output_plt,     FileName :: string()}
-          | {analysis_type,  'succ_typings' | 'plt_add' | 'plt_build' | 'plt_check' | 'plt_remove'}
+          | {analysis_type,  'succ_typings' |
+                             'plt_add' |
+                             'plt_build' |
+                             'plt_check' |
+                             'plt_remove'}
           | {warnings,       [WarnOpts]}
           | {get_warnings,   bool()}
 
diff --git a/lib/dialyzer/doc/src/dialyzer_chapter.xml b/lib/dialyzer/doc/src/dialyzer_chapter.xml
index d15069991e..be75f1cc65 100644
--- a/lib/dialyzer/doc/src/dialyzer_chapter.xml
+++ b/lib/dialyzer/doc/src/dialyzer_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -140,7 +140,9 @@
 
     <code type="none">
 
-    dialyzer --build_plt -r $ERL_TOP/lib/stdlib/ebin $ERL_TOP/lib/kernel/ebin $ERL_TOP/lib/mnesia/ebin
+    dialyzer --build_plt -r $ERL_TOP/lib/stdlib/ebin\
+                            $ERL_TOP/lib/kernel/ebin \
+                            $ERL_TOP/lib/mnesia/ebin
     </code>
 
     <p>Dialyzer will look if there is an environment variable called
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
index 63cc1c98f1..bb2edd419a 100644
--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
@@ -108,22 +108,22 @@ clean:
 # ----------------------------------------------------
 
 $(EBIN)/dialyzer_cl_parse.$(EMULATOR): dialyzer_cl_parse.erl ../vsn.mk
-	erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_cl_parse.erl
+	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_cl_parse.erl
 
 $(EBIN)/dialyzer_plt.$(EMULATOR): dialyzer_plt.erl ../vsn.mk
-	erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_plt.erl
+	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_plt.erl
 
 $(EBIN)/dialyzer_gui.$(EMULATOR): dialyzer_gui.erl ../vsn.mk
-	erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_gui.erl
+	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_gui.erl
 
 $(EBIN)/dialyzer_gui_wx.$(EMULATOR): dialyzer_gui_wx.erl ../vsn.mk
-	erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_gui_wx.erl
+	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_gui_wx.erl
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ---------------------------------------------------------------------
 # dependencies -- I wish they were somehow automatically generated
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 0b932d5a1f..157c951f77 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -254,14 +254,35 @@ check_extraneous([C|Cs], SuccType) ->
   end.
 
 check_extraneous_1(Contract, SuccType) ->
-  CRngs = erl_types:t_elements(erl_types:t_fun_range(Contract)),
+  CRng = erl_types:t_fun_range(Contract),
+  CRngs = erl_types:t_elements(CRng),
   STRng = erl_types:t_fun_range(SuccType),
   ?debug("CR = ~p\nSR = ~p\n", [CRngs, STRng]),
-  case [CR || CR <- CRngs, erl_types:t_is_none(erl_types:t_inf(CR, STRng, opaque))] of
-    [] -> ok;
+  case [CR || CR <- CRngs,
+              erl_types:t_is_none(erl_types:t_inf(CR, STRng, opaque))] of
+    [] ->
+      CRngList = list_part(CRng),
+      STRngList = list_part(STRng),
+      case is_not_nil_list(CRngList) andalso is_not_nil_list(STRngList) of
+        false -> ok;
+        true ->
+          CRngElements = erl_types:t_list_elements(CRngList),
+          STRngElements = erl_types:t_list_elements(STRngList),
+          Inf = erl_types:t_inf(CRngElements, STRngElements, opaque),
+          case erl_types:t_is_none(Inf) of
+            true -> {error, invalid_contract};
+            false -> ok
+          end
+      end;
     CRs -> {error, {extra_range, erl_types:t_sup(CRs), STRng}}
   end.
 
+list_part(Type) ->
+  erl_types:t_inf(erl_types:t_list(), Type, opaque).
+
+is_not_nil_list(Type) ->
+  erl_types:t_is_list(Type) andalso not erl_types:t_is_nil(Type).
+
 %% This is the heart of the "range function"
 -spec process_contracts([contract_pair()], [erl_types:erl_type()]) -> erl_types:erl_type().
 
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
index a97270b9f3..f4e609bf5b 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% ``The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
@@ -30,16 +31,16 @@
 %% 173 - 176	{ - ~		punctuation
 %% 177		DEL		control
 %% 200 - 237			control
-%% 240 - 277	NBSP - �	punctuation
-%% 300 - 326	� - �		uppercase
-%% 327		�		punctuation
-%% 330 - 336	� - �		uppercase
-%% 337 - 366	� - �		lowercase
-%% 367		�		punctuation
-%% 370 - 377	� - �		lowercase
+%% 240 - 277	NBSP - ¿	punctuation
+%% 300 - 326	À - Ö		uppercase
+%% 327		×		punctuation
+%% 330 - 336	Ø - Þ		uppercase
+%% 337 - 366	ß - ö		lowercase
+%% 367		÷		punctuation
+%% 370 - 377	ø - ÿ		lowercase
 %%
 %% Many punctuation characters region have special meaning.  Must
-%% watch using � \327, bvery close to x \170
+%% watch using × \327, bvery close to x \170
 
 -module(core_scan).
 
@@ -266,11 +267,11 @@ scan1([C|Cs], Toks, Pos) when C >= $\200, C =< $\240 ->
     scan1(Cs, Toks, Pos);
 scan1([C|Cs], Toks, Pos) when C >= $a, C =< $z ->	%Keywords
     scan_key_word(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
+scan1([C|Cs], Toks, Pos) when C >= $ß, C =< $ÿ, C /= $÷ ->
     scan_key_word(C, Cs, Toks, Pos);
 scan1([C|Cs], Toks, Pos) when C >= $A, C =< $Z ->	%Variables
     scan_variable(C, Cs, Toks, Pos);
-scan1([C|Cs], Toks, Pos) when C >= $�, C =< $�, C /= $� ->
+scan1([C|Cs], Toks, Pos) when C >= $À, C =< $Þ, C /= $× ->
     scan_variable(C, Cs, Toks, Pos);
 scan1([C|Cs], Toks, Pos) when C >= $0, C =< $9 ->	%Numbers
     scan_number(C, Cs, Toks, Pos);
@@ -335,9 +336,9 @@ scan_name([], Ncs) ->
     {Ncs,[]}.
 
 name_char(C) when C >= $a, C =< $z -> true;
-name_char(C) when C >= $�, C =< $�, C /= $� -> true;
+name_char(C) when C >= $ß, C =< $ÿ, C /= $÷ -> true;
 name_char(C) when C >= $A, C =< $Z -> true;
-name_char(C) when C >= $�, C =< $�, C /= $� -> true;
+name_char(C) when C >= $À, C =< $Þ, C /= $× -> true;
 name_char(C) when C >= $0, C =< $9 -> true;
 name_char($_) -> true;
 name_char($@) -> true;
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
index 08bc6cb147..41b7cb248d 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
@@ -149,14 +149,12 @@ forms([], St) -> {[],St}.
 %%  Process an attribute, this just affects the state.
 
 attribute(module, {Module, As}, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-	      package = packages:strip_last(M),
+    true = is_atom(Module),
+    St#expand{module=Module,
 	      parameters=As};
 attribute(module, Module, St) ->
-    M = package_to_string(Module),
-    St#expand{module=list_to_atom(M),
-	      package = packages:strip_last(M)};
+    true = is_atom(Module),
+    St#expand{module=Module};
 attribute(export, Es, St) ->
     St#expand{exports=union(from_list(Es), St#expand.exports)};
 attribute(import, Is, St) ->
@@ -226,8 +224,6 @@ pattern({tuple,Line,Ps}, St0) ->
 %%pattern({struct,Line,Tag,Ps}, St0) ->
 %%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
-pattern({record_field,_,_,_}=M, St) ->
-    {expand_package(M, St), [], [], St};  % must be a package name
 pattern({record_index,Line,Name,Field}, St) ->
     {index_expr(Line, Field, Name, record_fields(Name, St)),[],[],St};
 pattern({record,Line,Name,Pfs}, St0) ->
@@ -401,8 +397,6 @@ expr({tuple,Line,Es0}, Vs, St0) ->
 %%expr({struct,Line,Tag,Es0}, Vs, St0) ->
 %%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
-expr({record_field,_,_,_}=M, _Vs, St) ->
-    {expand_package(M, St), [], [], St};  % must be a package name
 expr({record_index,Line,Name,F}, Vs, St) ->
     I = index_expr(Line, F, Name, record_fields(Name, St)),
     expr(I, Vs, St);
@@ -483,10 +477,7 @@ expr({call,Line,{atom,La,N},As0}, Vs, St0) ->
 		    end
 	    end
     end;
-expr({call,Line,{record_field,_,_,_}=M,As0}, Vs, St0) ->
-    expr({call,Line,expand_package(M, St0),As0}, Vs, St0);
-expr({call,Line,{remote,Lr,M,F},As0}, Vs, St0) ->
-    M1 = expand_package(M, St0),
+expr({call,Line,{remote,Lr,M1,F},As0}, Vs, St0) ->
     {[M2,F1|As1],Asvs,Asus,St1} = expr_list([M1,F|As0], Vs, St0),
     {{call,Line,{remote,Lr,M2,F1},As1},Asvs,Asus,St1};
 expr({call,Line,{tuple,_,[{atom,_,_}=M,{atom,_,_}=F]},As}, Vs, St) ->
@@ -922,32 +913,6 @@ string_to_conses(Line, Cs, Tail) ->
     foldr(fun (C, T) -> {cons,Line,{char,Line,C},T} end, Tail, Cs).
 
 
-%% In syntax trees, module/package names are atoms or lists of atoms.
-
-package_to_string(A) when atom(A) -> atom_to_list(A);
-package_to_string(L) when list(L) -> packages:concat(L).
-
-expand_package({atom,L,A} = M, St) ->
-    case dict:find(A, St#expand.mod_imports) of
-	{ok, A1} ->
-	    {atom,L,A1};
-	error ->
-	    case packages:is_segmented(A) of
-		true ->
-		    M;
-		false ->
-		    M1 = packages:concat(St#expand.package, A),
-		    {atom,L,list_to_atom(M1)}
-	    end
-    end;
-expand_package(M, _St) ->
-    case erl_parse:package_segments(M) of
-	error ->
-	    M;
-	M1 ->
-	    {atom,element(2,M),list_to_atom(package_to_string(M1))}
-    end.
-
 %% Create a case-switch on true/false, generating badarg for all other
 %% values.
 
@@ -1005,15 +970,10 @@ new_in_all(Before, Region) ->
 %%  Handle import declarations and est for imported functions. No need to
 %%  check when building imports as code is correct.
 
-import({Mod0,Fs}, St) ->
-    Mod = list_to_atom(package_to_string(Mod0)),
+import({Mod,Fs}, St) ->
+    true = is_atom(Mod),
     Mfs = from_list(Fs),
-    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)};
-import(Mod0, St) ->
-    Mod = package_to_string(Mod0),
-    Key = list_to_atom(packages:last(Mod)),
-    St#expand{mod_imports=dict:store(Key, list_to_atom(Mod),
-				     St#expand.mod_imports)}.
+    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)}.
 
 add_imports(Mod, [F|Fs], Is) ->
     add_imports(Mod, Fs, orddict:store(F, Mod, Is));
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index 17f2bd2ea8..1aac46f5b2 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
@@ -6,7 +6,7 @@ mnesia_bup.erl:111: The created fun has no local return
 mnesia_bup.erl:574: Function fallback_receiver/2 has no local return
 mnesia_bup.erl:967: Function uninstall_fallback_master/2 has no local return
 mnesia_checkpoint.erl:1014: The variable Error can never match since previous clauses completely covered the type {'ok',#checkpoint_args{nodes::[any()],retainers::[any(),...]}}
-mnesia_checkpoint.erl:894: The call sys:handle_system_msg(Msg::any(),From::any(),'no_parent','mnesia_checkpoint',[],Cp::#checkpoint_args{}) breaks the contract (Msg,From,Parent,Module,Debug,Misc) -> Void when is_subtype(Msg,term()), is_subtype(From,{pid(),Tag::_}), is_subtype(Parent,pid()), is_subtype(Module,module()), is_subtype(Debug,[dbg_opt()]), is_subtype(Misc,term()), is_subtype(Void,term())
+mnesia_checkpoint.erl:894: The call sys:handle_system_msg(Msg::any(),From::any(),'no_parent','mnesia_checkpoint',[],Cp::#checkpoint_args{}) breaks the contract (Msg,From,Parent,Module,Debug,Misc) -> no_return() when is_subtype(Msg,term()), is_subtype(From,{pid(),Tag::_}), is_subtype(Parent,pid()), is_subtype(Module,module()), is_subtype(Debug,[dbg_opt()]), is_subtype(Misc,term())
 mnesia_controller.erl:1666: The variable Tab can never match since previous clauses completely covered the type [any()]
 mnesia_controller.erl:1679: The pattern {'stop', Reason, Reply, State2} can never match the type {'noreply',_} | {'reply',_,_} | {'stop','shutdown',#state{}}
 mnesia_controller.erl:1685: The pattern {'noreply', State2, _Timeout} can never match the type {'reply',_,_}
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl
index 2f0ada122e..4335d8efae 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_check.erl
@@ -4599,7 +4599,7 @@ get_simple_table_info1(S,#'ComponentType'{typespec=TS},[],Path) ->
     %% o.w. the asn1 code is wrong.
     #type{def=OCFT,constraint=Cnstr} = TS,
     case Cnstr of
-	[{simpletable,_OSRef}]�->
+	[{simpletable,_OSRef}] ->
 	    #'ObjectClassFieldType'{classname=ClRef,
 				    class=ObjectClass,
 				    fieldname=FieldName} = OCFT,
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl
index 5d2f7a13bd..5b33be9eff 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen.erl
@@ -148,7 +148,7 @@ pgen_partial_inc_dec(Erules,Module) ->
 %    io:format("Start partial incomplete decode gen?~n"),
     case asn1ct:get_gen_state_field(inc_type_pattern) of
 	undefined ->
-%	    io:format("Partial incomplete decode gen not started:�~w~n",[asn1ct:get_gen_state_field(active)]),
+%	    io:format("Partial incomplete decode gen not started: ~w~n",[asn1ct:get_gen_state_field(active)]),
 	    ok;
 %	[] ->
 %	    ok;
@@ -295,7 +295,7 @@ gen_part_decode_funcs([_H|T],N) ->
 gen_part_decode_funcs([],N) ->
     if
 	N > 0 ->
-	    .emit([".",nl]);
+	    emit([".",nl]);
 	true ->
 	    ok
     end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl
index 6064515a7e..b0786200fc 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin.erl
@@ -276,7 +276,7 @@ encode_tag_val({Class, Form, TagNo}) ->
     <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>;
 
 %% asumes whole correct tag bitpattern, multiple of 8
-encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
+encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% is this function used??!!
 %% asumes correct bitpattern of 0-5
 encode_tag_val(Tag) -> encode_tag_val2(Tag,[]).
 
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
index 50a91cf201..2f25e35cd3 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_ber_bin_v2.erl
@@ -531,7 +531,7 @@ encode_tag_val({Class, Form, TagNo}) ->
     <<(Class bsr 6):2, (Form bsr 5):1, 31:5,BinOct/binary>>;
 
 %% asumes whole correct tag bitpattern, multiple of 8
-encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% anv�nds denna funktion??!!
+encode_tag_val(Tag) when (Tag =< 255) -> Tag;  %% is this function used??!!
 %% asumes correct bitpattern of 0-5
 encode_tag_val(Tag) -> encode_tag_val2(Tag,[]).
 
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
index 9f02ad4466..4781c81955 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1rt_per_bin_rt2ct.erl
@@ -1198,7 +1198,7 @@ encode_bin_bit_string(C,UnusedAndBin={_,_},NamedBitList) ->
 %    case get_constraint(C,'SizeConstraint') of
 
 % 	0 ->
-% 	    []; % borde avg�ras i compile-time
+% 	    []; % should be dont in compile time
 % 	V when integer(V),V=<16 ->
 % 	    {Unused2,Bin2} = pad_list(V,UnusedAndBin1),
 % 	    <<BitVal:V,_:Unused2>> = Bin2,
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl
index b4f03fab03..17cc9a953d 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia.erl
@@ -1806,7 +1806,6 @@ system_info2(dump_log_update_in_place) ->
 system_info2(dump_log_update_in_place) ->
     mnesia_monitor:get_env(dump_log_update_in_place);
 system_info2(max_wait_for_decision) -> mnesia_monitor:get_env(max_wait_for_decision);
-system_info2(embedded_mnemosyne) -> mnesia_monitor:get_env(embedded_mnemosyne);
 system_info2(ignore_fallback_at_startup) -> mnesia_monitor:get_env(ignore_fallback_at_startup);
 system_info2(fallback_error_function) ->  mnesia_monitor:get_env(fallback_error_function);
 system_info2(log_version) -> mnesia_log:version();
@@ -1840,7 +1839,6 @@ system_info_items(yes) ->
      dump_log_time_threshold,
      dump_log_update_in_place,
      dump_log_write_threshold,
-     embedded_mnemosyne,
      event_module,
      extra_db_nodes,
      fallback_activated,
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl
index b64419d5a8..a1c25b5120 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_monitor.erl
@@ -631,7 +631,6 @@ env() ->
      dump_log_time_threshold,
      dump_log_update_in_place,
      dump_log_write_threshold,
-     embedded_mnemosyne,
      event_module,
      extra_db_nodes,
      ignore_fallback_at_startup,
@@ -660,8 +659,6 @@ default_env(dump_log_update_in_place) ->
     true;
 default_env(dump_log_write_threshold) ->
     1000;
-default_env(embedded_mnemosyne) ->
-    false;
 default_env(event_module) ->
     mnesia_event;
 default_env(extra_db_nodes) ->
@@ -703,7 +700,6 @@ do_check_type(event_module, A) when atom(A) -> A;
 do_check_type(ignore_fallback_at_startup, B) -> bool(B);
 do_check_type(fallback_error_function, {Mod, Func})
   when atom(Mod), atom(Func) -> {Mod, Func};
-do_check_type(embedded_mnemosyne, B) -> bool(B);
 do_check_type(extra_db_nodes, L) when list(L) ->
     Fun = fun(N) when N == node() -> false;
 	     (A) when atom(A) -> true
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl
index 78609ffdde..970e0e5f47 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl
@@ -57,9 +57,8 @@ init() ->
 
     Event = event_procs(),
     Kernel = kernel_procs(),
-    Mnemosyne = mnemosyne_procs(),
 
-    {ok, {Flags, Event ++ Kernel ++ Mnemosyne}}.
+    {ok, {Flags, Event ++ Kernel}}.
 
 event_procs() ->
     KillAfter = timer:seconds(30),
@@ -72,16 +71,6 @@ kernel_procs() ->
     KA = infinity,
     [{K, {K, start, []}, permanent, KA, supervisor, [K, supervisor]}].
 
-mnemosyne_procs() ->
-    case mnesia_monitor:get_env(embedded_mnemosyne) of
-	true ->
-	    Q = mnemosyne_sup,
-	    KA = infinity,
-	    [{Q, {Q, start, []}, permanent, KA, supervisor, [Q, supervisor]}];
-	false ->
-	    []
-    end.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% event handler
 
@@ -107,11 +96,8 @@ add_event_handler() ->
 
 kill() ->
     Mnesia = [mnesia_fallback | mnesia:ms()],
-    Mnemosyne = mnemosyne_ms(),
     Kill = fun(Name) -> catch exit(whereis(Name), kill) end,
-    lists:foreach(Kill, Mnemosyne),
     lists:foreach(Kill, Mnesia),
-    lists:foreach(fun ensure_dead/1, Mnemosyne),
     lists:foreach(fun ensure_dead/1, Mnesia),
     timer:sleep(10),
     case lists:keymember(mnesia, 1, application:which_applications()) of
@@ -128,9 +114,3 @@ ensure_dead(Name) ->
 	    timer:sleep(10),
 	    ensure_dead(Name)
     end.
-
-mnemosyne_ms() ->
-    case mnesia_monitor:get_env(embedded_mnemosyne) of
-	true -> mnemosyne:ms();
-	false -> []
-    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum b/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum
new file mode 100644
index 0000000000..6eaf60b91d
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/empty_list_infimum
@@ -0,0 +1,2 @@
+
+empty_list_infimum.erl:38: Invalid type specification for function empty_list_infimum:list_vhost_permissions/1. The success typing is (_) -> [[{_,_}]]
\ No newline at end of file
diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 863a3d61df..53d20a415b 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
@@ -1,7 +1,7 @@
 
 port_info_test.erl:10: The pattern {'connected', 42} can never match the type 'undefined' | {'connected',pid()}
-port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | {'registered_name',atom()}
+port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | [] | {'registered_name',atom()}
 port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()}
 port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed
-port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
+port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | [] | {'connected' | 'id' | 'input' | 'links' | 'locking' | 'memory' | 'monitors' | 'name' | 'os_pid' | 'output' | 'parallelism' | 'queue_size' | 'registered_name',atom() | pid() | [pid() | char() | {'process',pid()}] | non_neg_integer()}
 port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid','undefined' | non_neg_integer()}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs b/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs
new file mode 100644
index 0000000000..f00c4b10ff
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs
@@ -0,0 +1,3 @@
+
+record_creation_diffs.erl:10: Function foo/1 has no local return
+record_creation_diffs.erl:11: Record construction #bar{some_list::{'this','is','a','tuple'}} violates the declared type of field some_list::'undefined' | [any()]
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl
index 48cc50ae21..5a8f9710d6 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_connection.erl
@@ -1,4 +1,5 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%% -*- coding: utf-8 -*-
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
 %
 %   Licensed under the Apache License, Version 2.0 (the "License");
 %   you may not use this file except in compliance with the License.
@@ -21,7 +22,7 @@
 %%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
 %%%-------------------------------------------------------------------
 %% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
 %% @version $Id $
 -module(comm_layer_dir.comm_connection).
 
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl
index e8169b4673..d9fcb5e625 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/comm_layer/comm_port.erl
@@ -1,4 +1,5 @@
-%  Copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%% -*- coding: utf-8 -*-
+%  Copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
 %
 %   Licensed under the Apache License, Version 2.0 (the "License");
 %   you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
 %%% Created : 18 Apr 2008 by Thorsten Schuett <[email protected]>
 %%%-------------------------------------------------------------------
 %% @author Thorsten Schuett <[email protected]>
-%% @copyright 2008 Konrad-Zuse-Zentrum f�r Informationstechnik Berlin
+%% @copyright 2008 Konrad-Zuse-Zentrum für Informationstechnik Berlin
 %% @version $Id $
 -module(comm_layer_dir.comm_port).
 
diff --git a/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl b/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl
new file mode 100644
index 0000000000..b58fa732cb
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl
@@ -0,0 +1,57 @@
+%%
+%% The Original Code is RabbitMQ.
+%%
+%% The Initial Developer of the Original Code is VMware, Inc.
+%%
+
+-module(empty_list_infimum).
+
+-record(permission, {configure, write, read}).
+-record(user_vhost, {username, virtual_host}).
+-record(user_permission, {user_vhost, permission}).
+
+%%----------------------------------------------------------------------------
+
+-export([i_delete/1]).
+
+-type(vhost() :: binary()).
+
+-type(info_key() :: atom()).
+-type(info_keys() :: [info_key()]).
+
+-type(info() :: {info_key(), any()}).
+-type(infos() :: [info()]).
+
+%%----------------------------------------------------------------------------
+
+-spec i_delete(vhost()) -> 'ok'.
+
+i_delete(VHostPath) ->
+    [ok || _ <- list_vhost_permissions(VHostPath)],
+    ok.
+
+%%----------------------------------------------------------------------------
+
+vhost_perms_info_keys() ->
+    [user, configure, write, read].
+
+-spec list_vhost_permissions(vhost()) -> infos().
+
+list_vhost_permissions(VHostPath) ->
+    list_permissions(vhost_perms_info_keys(), rabbit_foo:some_list()).
+
+filter_props(Keys, Props) ->
+    [T || T = {K, _} <- Props, lists:member(K, Keys)].
+
+list_permissions(Keys, SomeList) ->
+    [filter_props(Keys, [{user,      Username},
+                         {vhost,     VHostPath},
+                         {configure, ConfigurePerm},
+                         {write,     WritePerm},
+                         {read,      ReadPerm}]) ||
+        #user_permission{user_vhost = #user_vhost{username     = Username,
+                                                  virtual_host = VHostPath},
+                         permission = #permission{configure = ConfigurePerm,
+						  write     = WritePerm,
+						  read      = ReadPerm}} <-
+           SomeList].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_creation_diffs.erl b/lib/dialyzer/test/small_SUITE_data/src/record_creation_diffs.erl
new file mode 100644
index 0000000000..e813459f8e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_creation_diffs.erl
@@ -0,0 +1,11 @@
+-module(record_creation_diffs).
+
+-export([foo/1]).
+
+-record(bar, {
+          some_atom :: atom(),
+          some_list :: list()
+         }).
+
+foo(Input) ->
+    #bar{some_atom = Input, some_list = {this,is,a,tuple}}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/unknown_arity_function_spec.erl b/lib/dialyzer/test/small_SUITE_data/src/unknown_arity_function_spec.erl
new file mode 100644
index 0000000000..c7d7459614
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/unknown_arity_function_spec.erl
@@ -0,0 +1,10 @@
+-module(unknown_arity_function_spec).
+
+-export([test/2]).
+
+%-type t() :: 42 | fun((...) -> t()).
+%-type f() :: fun((...) -> 42).
+
+-spec test(fun((...) -> 42), list()) -> 42.
+test(F, L) ->
+  42 = apply(F, L).
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index 8ad38ba0d5..0cbe1f000f 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -173,8 +173,8 @@ release_spec:
 
 depend.mk: depend.sed Makefile seealso.ent \
            $(XML_REF_FILES) $(XML_CHAPTER_FILES)
-	sed -f seehere.sed seealso.ent > seehere.ent
-	(for f in $(XML_REF_FILES) $(XML_CHAPTER_FILES); do \
+	$(gen_verbose)sed -f seehere.sed seealso.ent > seehere.ent
+	$(V_at)(for f in $(XML_REF_FILES) $(XML_CHAPTER_FILES); do \
 	     sed -f $< $$f | sed "s@%FILE%@`basename $$f .xml`@g"; \
 	 done) \
 	> $@
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index d448b01eba..d241e2bd19 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -42,6 +42,22 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>Diameter 1.3.1</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Fix function clause resulting from use of an eval
+	    callback.</p>
+          <p>
+	    Own Id: OTP-10685</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Diameter 1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 060659bce9..60bb7e6a10 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -119,7 +119,7 @@ ERL_COMPILE_FLAGS += \
 
 # erl/hrl from dictionary file.
 gen/diameter_gen_%.erl gen/diameter_gen_%.hrl: dict/%.dia
-	../bin/diameterc -o gen -i $(EBIN) $<
+	$(dia_verbose)../bin/diameterc -o gen -i $(EBIN) $<
 
 opt: $(TARGET_FILES)
 
@@ -128,17 +128,17 @@ debug:
 
 # The dictionary parser.
 gen/$(DICT_YRL).erl: compiler/$(DICT_YRL).yrl
-	$(ERLC) -Werror -o $(@D) $<
+	$(yecc_verbose)$(ERLC) -Werror -o $(@D) $<
 
 # Generate the app file.
 $(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk
-	M=`echo $(notdir $(APP_MODULES)) | tr ' ' ,`; \
+	$(gen_verbose)M=`echo $(notdir $(APP_MODULES)) | tr ' ' ,`; \
 	sed -e 's;%VSN%;$(VSN);' \
 	    -e "s;%MODULES%;$$M;" \
 	  $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 app:  $(APP_TARGET) $(APPUP_TARGET)
 dict: $(DICT_ERLS)
@@ -254,7 +254,7 @@ depend: depend.mk
 
 # Generate dependencies makefile.
 depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
-	(for f in $(MODULES); do \
+	$(gen_verbose)(for f in $(MODULES); do \
 	     (echo $$f; cat $$f.erl) | sed -f $<; \
 	 done) \
 	> $@
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src
index 5655f98c1b..a04a387918 100644
--- a/lib/diameter/src/base/diameter.appup.src
+++ b/lib/diameter/src/base/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The 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,27 +24,9 @@
   {"0.10",  [{restart_application, diameter}]},
   {"1.0",   [{restart_application, diameter}]},
   {"1.1",   [{restart_application, diameter}]},
-  {"1.2",   [{load, diameter},
-             {load, diameter_capx},
-             {load, diameter_codec},
-             {load, diameter_peer},
-             {load, diameter_reg},
-             %% order significant from here
-             {load, diameter_session},
-             {load, diameter_peer_fsm},
-             {load, diameter_service},
-             {load, diameter_watchdog},
-             {load, diameter_config}]},
-  {"1.2.1", [{load, diameter},
-             {load, diameter_capx},
-             {load, diameter_peer},
-             {load, diameter_reg},
-             %% order significant from here
-             {load, diameter_session},
-             {load, diameter_peer_fsm},
-             {load, diameter_service},
-             {load, diameter_watchdog},
-             {load, diameter_config}]}
+  {"1.2",   [{restart_application, diameter}]},
+  {"1.2.1", [{restart_application, diameter}]},
+  {"1.3",   [{load_module, diameter_service}]}
  ],
  [
   {"0.9",   [{restart_application, diameter}]},
@@ -52,6 +34,7 @@
   {"1.0",   [{restart_application, diameter}]},
   {"1.1",   [{restart_application, diameter}]},
   {"1.2",   [{restart_application, diameter}]},
-  {"1.2.1", [{restart_application, diameter}]}
+  {"1.2.1", [{restart_application, diameter}]},
+  {"1.3",   [{load_module, diameter_service}]}
  ]
 }.
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index a94d37f7a8..0b0bfe3f0a 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -193,9 +193,11 @@ encode_avps(Avps) ->
 
 msg_header(Mod, 'answer-message' = MsgName, Header) ->
     ?BASE = Mod,
-    #diameter_header{cmd_code = Code} = Header,
-    {_, Flags, ApplId} = ?BASE:msg_header(MsgName),
-    {Code, Flags, ApplId};
+    #diameter_header{application_id = Aid,
+                     cmd_code = Code}
+        = Header,
+    {-1, Flags, ?DIAMETER_APP_ID_COMMON} = ?BASE:msg_header(MsgName),
+    {Code, Flags, Aid};
 
 msg_header(Mod, MsgName, _) ->
     Mod:msg_header(MsgName).
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index c4320fcb99..858870566f 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -388,8 +388,9 @@ transition({diameter, {recv, Pkt}}, S) ->
     recv(Pkt, S);
 
 %% Timeout when still in the same state ...
-transition({timeout, PS}, #state{state = PS}) ->
-    {stop, {capx(PS), timeout}};
+transition({timeout = T, PS}, #state{state = PS} = S) ->
+    close({capx(PS), T}, S),
+    stop;
 
 %% ... or not.
 transition({timeout, _}, _) ->
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index a4a0b80348..b5584ca0d0 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -859,10 +859,10 @@ i(SvcName) ->
     true = ets:insert_new(?STATE_TABLE, S),
 
     %% Start fsms for each transport.
+    send_event(SvcName, start),
     lists:foreach(fun(T) -> start_fsm(T,S) end, CL),
 
     init_shared(S),
-    send_event(SvcName, start),
     S.
 
 cfg_acc({SvcName, #diameter_service{applications = Apps} = Rec, Opts},
@@ -1457,7 +1457,7 @@ make_prepare_packet(Mask, #diameter_packet{header = Hdr} = Pkt) ->
 make_prepare_packet(Mask, Msg) ->
     make_prepare_packet(Mask, #diameter_packet{msg = Msg}).
 
-%% make_prepare_header/1
+%% make_prepare_header/2
 
 make_prepare_header(Mask, undefined) ->
     Seq = diameter_session:sequence(Mask),
@@ -1465,10 +1465,11 @@ make_prepare_header(Mask, undefined) ->
                                          hop_by_hop_id = Seq});
 
 make_prepare_header(Mask, #diameter_header{end_to_end_id = undefined,
-                                           hop_by_hop_id = undefined}) ->
+                                           hop_by_hop_id = undefined}
+                          = H) ->
     Seq = diameter_session:sequence(Mask),
-    make_prepare_header(#diameter_header{end_to_end_id = Seq,
-                                         hop_by_hop_id = Seq});
+    make_prepare_header(H#diameter_header{end_to_end_id = Seq,
+                                          hop_by_hop_id = Seq});
 
 make_prepare_header(Mask, #diameter_header{end_to_end_id = undefined} = H) ->
     Seq = diameter_session:sequence(Mask),
@@ -1703,16 +1704,20 @@ send(Pid, Pkt) ->
 %% retransmit/4
 
 retransmit({TPid, Caps, #diameter_app{alias = Alias} = App} = T,
-           #request{app = Alias, packet = Pkt}
+           #request{app = Alias, packet = Pkt0}
            = Req,
            SvcName,
            Timeout) ->
-    have_request(Pkt, TPid)      %% Don't failover to a peer we've
+    have_request(Pkt0, TPid)      %% Don't failover to a peer we've
         andalso ?THROW(timeout), %% already sent to.
 
+    #diameter_packet{header = Hdr0} = Pkt0,
+    Hdr = Hdr0#diameter_header{is_retransmitted = true},
+    Pkt = Pkt0#diameter_packet{header = Hdr},
+
     resend_req(cb(App, prepare_retransmit, [Pkt, SvcName, {TPid, Caps}]),
                T,
-               Req,
+               Req#request{packet = Pkt},
                Timeout,
                []).
 
@@ -2049,15 +2054,21 @@ request_cb({eval_packet, RC, F}, App, Mask, T, TC, Fs, Pkt) ->
     request_cb(RC, App, Mask, T, TC, [F|Fs], Pkt);
 
 request_cb({eval, RC, F}, App, Mask, T, TC, Fs, Pkt) ->
-    request_cb(RC, App, Mask, T, TC, Pkt, Fs),
+    request_cb(RC, App, Mask, T, TC, Fs, Pkt),
     diameter_lib:eval(F).
 
 %% protocol_error/5
 
 protocol_error(RC, {_, OH, OR}, TPid, Fs, Pkt) ->
-    #diameter_packet{avps = Avps} = Pkt,
+    #diameter_packet{avps = Avps, errors = Es} = Pkt,
     ?LOG({error, RC}, Pkt),
-    reply(answer_message({OH, OR, RC}, Avps), ?BASE, TPid, Fs, Pkt).
+    reply(answer_message({OH, OR, RC}, Avps),
+          ?BASE,
+          TPid,
+          Fs,
+          Pkt#diameter_packet{errors = [RC | Es]}).
+%% Note that reply/5 may set the result code once more. It's set in
+%% answer_message/2 in case reply/5 doesn't.
 
 %% protocol_error/4
 
@@ -2170,7 +2181,8 @@ is_loop(Code, Vid, OH, Avps) ->
 %%
 %% Send a locally originating reply.
 
-%% Skip the setting of Result-Code and Failed-AVP's below.
+%% Skip the setting of Result-Code and Failed-AVP's below. This is
+%% currently undocumented.
 reply([Msg], Dict, TPid, Fs, Pkt)
   when is_list(Msg);
        is_tuple(Msg) ->
@@ -2238,6 +2250,9 @@ rc(RC) ->
 
 %% rc/4
 
+rc(#diameter_packet{msg = Rec} = Pkt, RC, Failed, Dict) ->
+    Pkt#diameter_packet{msg = rc(Rec, RC, Failed, Dict)};
+
 rc(Rec, RC, Failed, Dict)
   when is_integer(RC) ->
     set(Rec,
diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl
new file mode 100644
index 0000000000..7c1c76f22a
--- /dev/null
+++ b/lib/diameter/test/diameter_event_SUITE.erl
@@ -0,0 +1,182 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of events sent as a consequence of diameter:subscribe/1.
+%% Watchdog events are dealt with more extensively in the watchdog
+%% suite.
+%%
+
+-module(diameter_event_SUITE).
+
+-export([suite/0,
+         all/0,
+         init_per_testcase/2,
+         end_per_testcase/2]).
+
+%% testcases
+-export([start/1,
+         start_server/1,
+         up/1,
+         down/1,
+         cea_timeout/1,
+         stop/1]).
+
+-include("diameter.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(ADDR, {127,0,0,1}).
+-define(REALM, "REALM").
+
+-define(SERVER, "SERVER.SERVER-REALM").
+-define(CLIENT, "CLIENT.CLIENT-REALM").
+
+-define(DICT_COMMON, ?DIAMETER_DICT_COMMON).
+-define(DICT_ACCT,   ?DIAMETER_DICT_ACCOUNTING).
+
+-define(SERVER_CAPX_TMO, 6000).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Host, Dicts),
+        [{'Origin-Host', Host},
+         {'Origin-Realm', realm(Host)},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 12345},
+         {'Product-Name', "OTP/diameter"},
+         {'Acct-Application-Id', [D:id() || D <- Dicts]}
+         | [{application, [{dictionary, D},
+                           {module, #diameter_callback{}}]}
+            || D <- Dicts]]).
+
+%% Diameter Result-Code's:
+-define(NO_COMMON_APP, 5010).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 60}}].
+
+all() ->
+    [start,
+     start_server,
+     up,
+     down,
+     cea_timeout,
+     stop].
+
+init_per_testcase(Name, Config) ->
+    [{name, Name} | Config].
+
+end_per_testcase(_, _) ->
+    ok.
+
+%% ===========================================================================
+%% start/stop testcases
+
+start(_Config) ->
+    ok = diameter:start().
+
+start_server(Config) ->
+    diameter:subscribe(?SERVER),
+    ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER, [?DICT_COMMON])),
+    LRef = ?util:listen(?SERVER, tcp, [{capabilities_cb, fun capx_cb/2},
+                                       {capx_timeout, ?SERVER_CAPX_TMO}]),
+    [PortNr] = ?util:lport(tcp, LRef, 20),
+    ?util:write_priv(Config, portnr, PortNr),
+    start = event(?SERVER).
+
+%% Connect with matching capabilities and expect the connection to
+%% come up.
+up(Config) ->
+    {Svc, Ref} = connect(Config, []),
+    start = event(Svc),
+    {up, Ref, {_,_Caps}, _Config, #diameter_packet{}} = event(Svc),
+    {watchdog, Ref, _, {initial, okay}, _} = event(Svc).
+
+%% Connect with non-matching capabilities and expect CEA from the peer
+%% to indicate as much and then for the transport to be restarted
+%% (after reconnect_timer).
+down(Config) ->
+    {Svc, Ref} = connect(Config, [{capabilities, [{'Acct-Application-Id',
+                                                   [?DICT_ACCT:id()]}]},
+                                  {applications, [?DICT_ACCT]},
+                                  {reconnect_timer, 5000}]),
+    start = event(Svc),
+    {watchdog, Ref, _, {initial, down}, _} = event(Svc),
+    {closed, Ref, {'CEA', ?NO_COMMON_APP, _, #diameter_packet{}}, _}
+        = event(Svc),
+    {reconnect, Ref, _} = event(Svc).
+
+%% Connect with matching capabilities but have the server delay its
+%% CEA and cause the client to timeout.
+cea_timeout(Config) ->
+    {Svc, Ref} = connect(Config, [{capx_timeout, ?SERVER_CAPX_TMO div 2},
+                                  {reconnect_timer, 2*?SERVER_CAPX_TMO}]),
+    start = event(Svc),
+    {watchdog, Ref, _, {initial, down}, _} = event(Svc),
+    {closed, Ref, {'CEA', timeout}, _} = event(Svc).
+
+stop(_Config) ->
+    ok = diameter:stop().
+
+%% ----------------------------------------
+
+%% Keep the server from sending CEA until the client has timed out.
+capx_cb(_, #diameter_caps{origin_host = {_, "cea_timeout-" ++ _}}) ->
+    receive after ?SERVER_CAPX_TMO -> ok end;
+
+%% Or not.
+capx_cb(_, _Caps) ->
+    ok.
+
+%% ----------------------------------------
+
+%% Use the testcase name to construct Origin-Host of the client so
+%% that the server can match on it in capx_cb/2.
+connect(Config, Opts) ->
+    Pre = atom_to_list(proplists:get_value(name, Config)),
+    Name = Pre ++ uniq() ++ ?CLIENT,
+    diameter:subscribe(Name),
+    ok = start_service(Name, ?SERVICE(Name, [?DICT_COMMON, ?DICT_ACCT])),
+    {ok, Ref} = diameter:add_transport(Name, opts(Config, Opts)),
+    {Name, Ref}.
+
+uniq() ->
+    {MS,S,US} = now(),
+    lists:flatten(io_lib:format("-~p-~p-~p-", [MS,S,US])).
+
+event(Name) ->
+    receive #diameter_event{service = Name, info = T} -> T end.
+
+start_service(Name, Opts) ->
+    diameter:start_service(Name, [{monitor, self()} | Opts]).
+
+opts(Config, Opts) ->
+    PortNr = ?util:read_priv(Config, portnr),
+
+    {connect, [{transport_module, diameter_tcp},
+               {transport_config, [{ip, ?ADDR}, {port, 0},
+                                   {raddr, ?ADDR}, {rport, PortNr}]}
+               | Opts]}.
+
+realm(Host) ->
+    tl(lists:dropwhile(fun(C) -> C /= $. end, Host)).
diff --git a/lib/diameter/test/diameter_failover_SUITE.erl b/lib/diameter/test/diameter_failover_SUITE.erl
index ed31670031..bb820a8bf2 100644
--- a/lib/diameter/test/diameter_failover_SUITE.erl
+++ b/lib/diameter/test/diameter_failover_SUITE.erl
@@ -18,19 +18,19 @@
 %%
 
 %%
-%% Tests of traffic between six Diameter nodes in three realms,
+%% Tests of traffic between seven Diameter nodes in four realms,
 %% connected as follows.
 %%
-%%                  ----- SERVER1.REALM2
-%%                /
-%%               /  ----- SERVER2.REALM2
-%%              | /
-%%   CLIENT.REALM1 ------ SERVER3.REALM2
-%%              | \
-%%              |  \
-%%               \   ---- SERVER1.REALM3
-%%                \
-%%                  ----- SERVER2.REALM3
+%%                  ----- SERVER1.REALM2 -----
+%%                /                            \
+%%               /  ----- SERVER2.REALM2 -----  \
+%%              | /                            \ |
+%%   CLIENT.REALM1 ------ SERVER3.REALM2 ------ CLIENT.REALM4
+%%              | \                            / |
+%%              |  \                          /  |
+%%               \   ---- SERVER1.REALM3 -----  /
+%%                \                            /
+%%                  ----- SERVER2.REALM3 -----
 %%
 
 -module(diameter_failover_SUITE).
@@ -44,12 +44,16 @@
          connect/1,
          send_ok/1,
          send_nok/1,
+         send_discard_1/1,
+         send_discard_2/1,
          stop_services/1,
          stop/1]).
 
 %% diameter callbacks
 -export([pick_peer/4,
          prepare_request/3,
+         prepare_retransmit/3,
+         handle_error/4,
          handle_answer/4,
          handle_request/3]).
 
@@ -62,14 +66,18 @@
 
 -define(ADDR, {127,0,0,1}).
 
--define(CLIENT,  "CLIENT.REALM1").
+-define(CLIENT1, "CLIENT.REALM1").
+-define(CLIENT2, "CLIENT.REALM4").
 -define(SERVER1, "SERVER1.REALM2").
 -define(SERVER2, "SERVER2.REALM2").
 -define(SERVER3, "SERVER3.REALM2").
 -define(SERVER4, "SERVER1.REALM3").
 -define(SERVER5, "SERVER2.REALM3").
 
--define(SERVICES, [?CLIENT, ?SERVER1, ?SERVER2, ?SERVER3, ?SERVER4, ?SERVER5]).
+-define(IS_CLIENT(Svc), Svc == ?CLIENT1; Svc == ?CLIENT2).
+
+-define(CLIENTS, [?CLIENT1, ?CLIENT2]).
+-define(SERVERS, [?SERVER1, ?SERVER2, ?SERVER3, ?SERVER4, ?SERVER5]).
 
 -define(DICT_COMMON,  ?DIAMETER_DICT_COMMON).
 
@@ -77,26 +85,27 @@
 -define(APP_ID, ?DICT_COMMON:id()).
 
 %% Config for diameter:start_service/2.
--define(SERVICE(Host, Dict),
+-define(SERVICE(Host),
         [{'Origin-Host', Host},
          {'Origin-Realm', realm(Host)},
          {'Host-IP-Address', [?ADDR]},
          {'Vendor-Id', 12345},
          {'Product-Name', "OTP/diameter"},
-         {'Acct-Application-Id', [Dict:id()]},
+         {'Acct-Application-Id', [?APP_ID]},
          {application, [{alias, ?APP_ALIAS},
-                        {dictionary, Dict},
+                        {dictionary, ?DICT_COMMON},
                         {module, #diameter_callback
                                   {peer_up = false,
                                    peer_down = false,
-                                   handle_error = false,
-                                   prepare_retransmit = false,
                                    default = ?MODULE}},
                         {answer_errors, callback}]}]).
 
 -define(SUCCESS, 2001).
 
--define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+%% Value of Termination-Cause determines client/server behaviour.
+-define(LOGOUT,   ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+-define(MOVED,    ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_USER_MOVED').
+-define(TIMEOUT,  ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_SESSION_TIMEOUT').
 
 %% ===========================================================================
 
@@ -109,6 +118,8 @@ all() ->
      connect,
      send_ok,
      send_nok,
+     send_discard_1,
+     send_discard_2,
      stop_services,
      stop].
 
@@ -119,19 +130,20 @@ start(_Config) ->
     ok = diameter:start().
 
 start_services(_Config) ->
-    S = [server(N, ?DICT_COMMON) || N <- tl(?SERVICES)],
-
-    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT, ?DICT_COMMON)),
+    Servers = [server(N) || N <- ?SERVERS],
+    [] = [T || C <- ?CLIENTS,
+               T <- [diameter:start_service(C, ?SERVICE(C))],
+               T /= ok],
 
-    {save_config, [{?CLIENT, S}]}.
+    {save_config, Servers}.
 
 connect(Config) ->
-    {_, Conns} = proplists:get_value(saved_config, Config),
+    {start_services, Servers} = proplists:get_value(saved_config, Config),
 
-    lists:foreach(fun({CN,Ss}) -> connect(CN, Ss) end, Conns).
+    lists:foreach(fun(C) -> connect(C, Servers) end, ?CLIENTS).
 
 stop_services(_Config) ->
-    [] = [{H,T} || H <- ?SERVICES,
+    [] = [{H,T} || H <- ?CLIENTS ++ ?SERVERS,
                    T <- [diameter:stop_service(H)],
                    T /= ok].
 
@@ -140,8 +152,8 @@ stop(_Config) ->
 
 %% ----------------------------------------
 
-server(Name, Dict) ->
-    ok = diameter:start_service(Name, ?SERVICE(Name, Dict)),
+server(Name) ->
+    ok = diameter:start_service(Name, ?SERVICE(Name)),
     {Name, ?util:listen(Name, tcp)}.
 
 connect(Name, Refs) ->
@@ -153,30 +165,39 @@ connect(Name, Refs) ->
 %% Send an STR and expect success after SERVER3 answers after a couple
 %% of failovers.
 send_ok(_Config) ->
-    Req = ['STR', {'Destination-Realm', realm(?SERVER1)},
-                  {'Termination-Cause', ?LOGOUT},
-                  {'Auth-Application-Id', ?APP_ID}],
+    Req = #diameter_base_STR{'Destination-Realm' = realm(?SERVER1),
+                             'Termination-Cause' = ?LOGOUT,
+                             'Auth-Application-Id' = ?APP_ID},
     #diameter_base_STA{'Result-Code' = ?SUCCESS,
                        'Origin-Host' = ?SERVER3}
-        = call(Req, [{filter, realm}]).
+        = call(?CLIENT1, Req).
 
 %% Send an STR and expect failure when both servers fail.
 send_nok(_Config) ->
-    Req = ['STR', {'Destination-Realm', realm(?SERVER4)},
-                  {'Termination-Cause', ?LOGOUT},
-                  {'Auth-Application-Id', ?APP_ID}],
-    {error, failover} = call(Req, [{filter, realm}]).
+    Req = #diameter_base_STR{'Destination-Realm' = realm(?SERVER4),
+                             'Termination-Cause' = ?LOGOUT,
+                             'Auth-Application-Id' = ?APP_ID},
+    {failover, ?LOGOUT} = call(?CLIENT1, Req).
+
+%% Send an STR and have prepare_retransmit discard it.
+send_discard_1(_Config) ->
+    Req = #diameter_base_STR{'Destination-Realm' = realm(?SERVER1),
+                             'Termination-Cause' = ?TIMEOUT,
+                             'Auth-Application-Id' = ?APP_ID},
+    {rejected, ?TIMEOUT} = call(?CLIENT2, Req).
+send_discard_2(_Config) ->
+    Req = #diameter_base_STR{'Destination-Realm' = realm(?SERVER4),
+                             'Termination-Cause' = ?MOVED,
+                             'Auth-Application-Id' = ?APP_ID},
+    {discarded, ?MOVED} = call(?CLIENT2, Req).
 
 %% ===========================================================================
 
 realm(Host) ->
     tl(lists:dropwhile(fun(C) -> C /= $. end, Host)).
 
-call(Req, Opts) ->
-    diameter:call(?CLIENT, ?APP_ALIAS, Req, Opts).
-
-set([H|T], Vs) ->
-    [H | Vs ++ T].
+call(Svc, Req) ->
+    diameter:call(Svc, ?APP_ALIAS, Req, [{filter, realm}]).
 
 %% ===========================================================================
 %% diameter callbacks
@@ -184,7 +205,8 @@ set([H|T], Vs) ->
 %% pick_peer/4
 
 %% Choose a server other than SERVER3 or SERVER5 if possible.
-pick_peer(Peers, _, ?CLIENT, _State) ->
+pick_peer(Peers, _, Svc, _State)
+  when ?IS_CLIENT(Svc) ->
     case lists:partition(fun({_, #diameter_caps{origin_host = {_, OH}}}) ->
                                  OH /= ?SERVER3 andalso OH /= ?SERVER5
                          end,
@@ -198,20 +220,41 @@ pick_peer(Peers, _, ?CLIENT, _State) ->
 
 %% prepare_request/3
 
-prepare_request(Pkt, ?CLIENT, {_Ref, Caps}) ->
+prepare_request(Pkt, Svc, {_Ref, Caps})
+  when ?IS_CLIENT(Svc) ->
     {send, prepare(Pkt, Caps)}.
 
 prepare(#diameter_packet{msg = Req}, Caps) ->
     #diameter_caps{origin_host  = {OH, _},
                    origin_realm = {OR, _}}
         = Caps,
-    set(Req, [{'Session-Id', diameter:session_id(OH)},
-              {'Origin-Host',  OH},
-              {'Origin-Realm', OR}]).
+    Req#diameter_base_STR{'Origin-Host' = OH,
+                          'Origin-Realm' = OR,
+                          'Session-Id' = diameter:session_id(OH)}.
+
+%% prepare_retransmit/3
+
+prepare_retransmit(#diameter_packet{header = H} = P, Svc, {_,_})
+  when ?IS_CLIENT(Svc) ->
+    #diameter_header{is_retransmitted = true} = H,  %% assert
+    prepare(P).
+
+prepare(#diameter_packet{msg = M} = P) ->
+    case M#diameter_base_STR.'Termination-Cause' of
+        ?LOGOUT  -> {send, P};
+        ?MOVED   -> discard;
+        ?TIMEOUT -> {discard, rejected}
+    end.
+
+%% handle_error/4
+
+handle_error(Reason, Req, _, _) ->
+    {Reason, Req#diameter_base_STR.'Termination-Cause'}.
 
 %% handle_answer/4
 
-handle_answer(Pkt, _Req, ?CLIENT, _Peer) ->
+handle_answer(Pkt, _Req, Svc, _Peer)
+  when ?IS_CLIENT(Svc) ->
     #diameter_packet{msg = Rec, errors = []} = Pkt,
     Rec.
 
@@ -219,8 +262,8 @@ handle_answer(Pkt, _Req, ?CLIENT, _Peer) ->
 
 %% Only SERVER3 actually answers.
 handle_request(Pkt, ?SERVER3, {_, Caps}) ->
-    #diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId,
-                                              'Origin-Host' = ?CLIENT}}
+    #diameter_packet{header = #diameter_header{is_retransmitted = true},
+                     msg = #diameter_base_STR{'Session-Id' = SId}}
         = Pkt,
     #diameter_caps{origin_host  = {OH, _},
                    origin_realm = {OR, _}}
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index c157b0e304..b03a9ce4d1 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The 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,7 +38,9 @@
          result_codes/1,
          send_ok/1,
          send_nok/1,
+         send_eval/1,
          send_bad_answer/1,
+         send_protocol_error/1,
          send_arbitrary/1,
          send_unknown/1,
          send_unknown_mandatory/1,
@@ -47,6 +49,9 @@
          send_unsupported_app/1,
          send_error_bit/1,
          send_unsupported_version/1,
+         send_invalid_avp_bits/1,
+         send_invalid_avp_length/1,
+         send_invalid_reject/1,
          send_long/1,
          send_nopeer/1,
          send_noapp/1,
@@ -112,17 +117,23 @@
 %% Sequence mask for End-to-End and Hop-by-Hop identifiers.
 -define(CLIENT_MASK, {1,26}).  %% 1 in top 6 bits
 
-%% Run tests cases in different encoding variants. Send outgoing
-%% messages as lists or records.
+%% How to construct messages, as record or list.
 -define(ENCODINGS, [list, record]).
 
-%% Identifers for client connections.
--define(CONNECTIONS, [c1,c2,c3]).
+%% How to send answers, in a diameter_packet or not.
+-define(CONTAINERS, [pkt, msg]).
+
+%% Send over multiple connections that are mapped onto
+%% [{E,P} || E <- ?ENCODINGS, P <- ?CONTAINERS].
+-define(CONNECTIONS, [c0,c1,c2,c3]).
 
 %% Not really what we should be setting unless the message is sent in
 %% the common application but diameter doesn't care.
 -define(APP_ID, ?DIAMETER_APP_ID_COMMON).
 
+%% An Application-ID the server doesn't support.
+-define(BAD_APP, 42).
+
 %% Config for diameter:start_service/2.
 -define(SERVICE(Name),
         [{'Origin-Host', Name ++ "." ++ ?REALM},
@@ -158,6 +169,8 @@
         ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_REALM_NOT_SERVED').
 -define(UNABLE_TO_DELIVER,
         ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_UNABLE_TO_DELIVER').
+-define(INVALID_AVP_LENGTH,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_AVP_LENGTH').
 
 -define(EVENT_RECORD,
         ?'DIAMETER_BASE_ACCOUNTING-RECORD-TYPE_EVENT_RECORD').
@@ -170,6 +183,8 @@
         ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
 -define(BAD_ANSWER,
         ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_BAD_ANSWER').
+-define(USER_MOVED,
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_USER_MOVED').
 
 -define(A, list_to_atom).
 -define(L, atom_to_list).
@@ -183,14 +198,17 @@ suite() ->
 
 all() ->
     [start, start_services, add_transports, result_codes]
-        ++ [{group, ?util:name([E,C]), P} || E <- ?ENCODINGS,
-                                             C <- ?CONNECTIONS,
-                                             P <- [[], [parallel]]]
+        ++ [{group, ?util:name([R,C,A]), P} || R <- ?ENCODINGS,
+                                               C <- ?CONTAINERS,
+                                               A <- ?ENCODINGS,
+                                               P <- [[], [parallel]]]
         ++ [remove_transports, stop_services, stop].
 
 groups() ->
     Ts = tc(),
-    [{?util:name([E,C]), [], Ts} || E <- ?ENCODINGS, C <- ?CONNECTIONS].
+    [{?util:name([R,C,A]), [], Ts} || R <- ?ENCODINGS,
+                                      C <- ?CONTAINERS,
+                                      A <- ?ENCODINGS].
 
 init_per_group(Name, Config) ->
     [{group, Name} | Config].
@@ -209,7 +227,9 @@ end_per_testcase(_, _) ->
 tc() ->
     [send_ok,
      send_nok,
+     send_eval,
      send_bad_answer,
+     send_protocol_error,
      send_arbitrary,
      send_unknown,
      send_unknown_mandatory,
@@ -218,6 +238,9 @@ tc() ->
      send_unsupported_app,
      send_error_bit,
      send_unsupported_version,
+     send_invalid_avp_bits,
+     send_invalid_avp_length,
+     send_invalid_reject,
      send_long,
      send_nopeer,
      send_noapp,
@@ -260,7 +283,9 @@ start_services(_Config) ->
 
 add_transports(Config) ->
     LRef = ?util:listen(?SERVER, tcp, [{capabilities_cb, fun capx/2}]),
-    Cs = [?util:connect(?CLIENT, tcp, LRef, [{id, C}]) || C <- ?CONNECTIONS],
+    Cs = [?util:connect(?CLIENT, tcp, LRef, [{id, C},
+                                             {capabilities, [osi(C)]}])
+          || C <- ?CONNECTIONS],
     ?util:write_priv(Config, "transport", [LRef | Cs]).
 
 remove_transports(Config) ->
@@ -278,11 +303,15 @@ capx(_, #diameter_caps{origin_host = {OH,DH}}) ->
     io:format("connection: ~p -> ~p~n", [DH,OH]),
     ok.
 
+osi(Id) ->
+    [$c,N] = atom_to_list(Id),
+    {'Origin-State-Id', N - $0}.
+
 %% ===========================================================================
 
 %% Ensure that result codes have the expected values.
 result_codes(_Config) ->
-    {2001, 3001, 3002, 3003, 3004, 3007, 3008, 3009, 5001, 5011}
+    {2001, 3001, 3002, 3003, 3004, 3007, 3008, 3009, 5001, 5011, 5014}
         = {?SUCCESS,
            ?COMMAND_UNSUPPORTED,
            ?UNABLE_TO_DELIVER,
@@ -292,13 +321,14 @@ result_codes(_Config) ->
            ?INVALID_HDR_BITS,
            ?INVALID_AVP_BITS,
            ?AVP_UNSUPPORTED,
-           ?UNSUPPORTED_VERSION}.
+           ?UNSUPPORTED_VERSION,
+           ?INVALID_AVP_LENGTH}.
 
 %% Send an ACR and expect success.
 send_ok(Config) ->
     Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
                   {'Accounting-Record-Number', 1}],
-    
+
     #diameter_base_accounting_ACA{'Result-Code' = ?SUCCESS}
         = call(Config, Req).
 
@@ -306,10 +336,18 @@ send_ok(Config) ->
 send_nok(Config) ->
     Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
                   {'Accounting-Record-Number', 0}],
-    
+
     #'diameter_base_answer-message'{'Result-Code' = ?INVALID_AVP_BITS}
         = call(Config, Req).
 
+%% Send an ACR and expect success.
+send_eval(Config) ->
+    Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
+                  {'Accounting-Record-Number', 3}],
+
+    #diameter_base_accounting_ACA{'Result-Code' = ?SUCCESS}
+        = call(Config, Req).
+
 %% Send an accounting ACR that the server tries to answer with an
 %% inappropriate header, resulting in no answer being sent and the
 %% request timing out.
@@ -318,6 +356,15 @@ send_bad_answer(Config) ->
                   {'Accounting-Record-Number', 2}],
     {error, timeout} = call(Config, Req).
 
+%% Send an ACR that the server callback answers explicitly with a
+%% protocol error.
+send_protocol_error(Config) ->
+    Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
+                  {'Accounting-Record-Number', 4}],
+
+    #'diameter_base_answer-message'{'Result-Code' = ?TOO_BUSY}
+        = call(Config, Req).
+
 %% Send an ASR with an arbitrary AVP and expect success and the same
 %% AVP in the reply.
 send_arbitrary(Config) ->
@@ -385,6 +432,29 @@ send_unsupported_version(Config) ->
     #diameter_base_STA{'Result-Code' = ?UNSUPPORTED_VERSION}
         = call(Config, Req).
 
+%% Send a request containing an incorrect AVP length.
+send_invalid_avp_bits(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+
+    #'diameter_base_answer-message'{'Result-Code' = ?INVALID_AVP_BITS}
+        = call(Config, Req).
+
+%% Send a request containing an AVP length that doesn't match the
+%% AVP's type.
+send_invalid_avp_length(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+
+    #'diameter_base_STA'{'Result-Code' = ?INVALID_AVP_LENGTH}
+        = call(Config, Req).
+
+%% Send a request containing 5xxx errors that the server rejects with
+%% 3xxx.
+send_invalid_reject(Config) ->
+    Req = ['STR', {'Termination-Cause', ?USER_MOVED}],
+
+    #'diameter_base_answer-message'{'Result-Code' = ?TOO_BUSY}
+        = call(Config, Req).
+
 %% Send something long that will be fragmented by TCP.
 send_long(Config) ->
     Req = ['STR', {'Termination-Cause', ?LOGOUT},
@@ -559,21 +629,44 @@ call(Config, Req) ->
 
 call(Config, Req, Opts) ->
     Name = proplists:get_value(testcase, Config),
-    [Encoding, Client] = ?util:name(proplists:get_value(group, Config)),
+    [Encoding, C, E] = ?util:name(proplists:get_value(group, Config)),
     diameter:call(?CLIENT,
                   dict(Req),
-                  req(Req, Encoding),
-                  [{extra, [Name, Client]} | Opts]).
+                  msg(Req, Encoding),
+                  [{extra, [Name, client(E,C)]} | Opts]).
+
+client(E, C) ->
+    list_to_atom([$c, $0 + 2*codec(E) + container(C)]).
+
+client(N) ->
+    {codec(N bsr 1), container(N rem 2)}.
 
-req(['ACR' = H | T], record) ->
+codec(record) -> 0;
+codec(list) -> 1;
+codec(0) -> record;
+codec(1) -> list.
+
+%% Here we're just mapping booleans but the readable atoms are part of
+%% (constructed) group names, so it's good that they're readable.
+
+container(pkt) -> 0;
+container(msg) -> 1;
+container(0) -> pkt;
+container(1) -> msg.
+
+msg([H|T], record)
+  when H == 'ACR';
+       H == 'ACA' ->
     ?ACCT:'#new-'(?ACCT:msg2rec(H), T);
-req([H|T], record) ->
+msg([H|T], record) ->
     ?BASE:'#new-'(?BASE:msg2rec(H), T);
-req(T, _) ->
+msg(T, _) ->
     T.
 
 dict(['ACR' | _]) ->
     ?ACCT;
+dict(#diameter_base_accounting_ACR{}) ->
+    ?ACCT;
 dict(_) ->
     ?BASE.
 
@@ -647,6 +740,40 @@ prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, send_detach, _, _) ->
 log(#diameter_packet{} = P, T) ->
     io:format("~p: ~p~n", [T,P]).
 
+%% prepare/3
+
+prepare(Pkt, Caps, send_invalid_avp_bits) ->
+    Req = prepare(Pkt, Caps),
+    %% Last AVP in our STR is Termination-Cause of type Unsigned32:
+    %% set its length improperly.
+    #diameter_packet{header = #diameter_header{length = L},
+                     bin = B}
+        = E
+        = diameter_codec:encode(?BASE, Pkt#diameter_packet{msg = Req}),
+    Offset = L - 7,  %% to AVP Length
+    <<H:Offset/binary, 12:24/integer, T:4/binary>> = B,
+    E#diameter_packet{bin = <<H/binary, 13:24/integer, T/binary>>};
+
+prepare(Pkt, Caps, N)
+  when N == send_invalid_avp_length;
+       N == send_invalid_reject ->
+    Req = prepare(Pkt, Caps),
+    %% Second last AVP in our STR is Auth-Application-Id of type
+    %% Unsigned32: Send a value of length 8.
+    #diameter_packet{header = #diameter_header{length = L},
+                     bin = B0}
+        = E
+        = diameter_codec:encode(?BASE, Pkt#diameter_packet{msg = Req}),
+    Offset = L - 7 - 12,  %% to AVP Length
+    <<H0:Offset/binary, 12:24/integer, T:16/binary>> = B0,
+    <<V, L:24/integer, H/binary>> = H0,  %% assert
+    E#diameter_packet{bin = <<V,
+                              (L+4):24/integer,
+                              H/binary,
+                              16:24/integer,
+                              0:32/integer,
+                              T/binary>>};
+
 prepare(Pkt, Caps, send_unsupported) ->
     Req = prepare(Pkt, Caps),
     #diameter_packet{bin = <<H:5/binary, _CmdCode:3/binary, T/binary>>}
@@ -659,7 +786,7 @@ prepare(Pkt, Caps, send_unsupported_app) ->
     #diameter_packet{bin = <<H:8/binary, _ApplId:4/binary, T/binary>>}
         = E
         = diameter_codec:encode(?BASE, Pkt#diameter_packet{msg = Req}),
-    E#diameter_packet{bin = <<H/binary, 42:32/integer, T/binary>>};
+    E#diameter_packet{bin = <<H/binary, ?BAD_APP:32/integer, T/binary>>};
 
 prepare(Pkt, Caps, send_error_bit) ->
     #diameter_packet{header = Hdr} = Pkt,
@@ -678,6 +805,8 @@ prepare(Pkt, Caps, send_anything) ->
 prepare(Pkt, Caps, _Name) ->
     prepare(Pkt, Caps).
 
+%% prepare/2
+
 prepare(#diameter_packet{msg = Req}, Caps)
   when is_record(Req, diameter_base_accounting_ACR);
        'ACR' == hd(Req) ->
@@ -741,9 +870,26 @@ handle_answer(Pkt, Req, ?CLIENT, Peer, Name, _Id) ->
 handle_answer(Pkt, _Req, ?CLIENT, _Peer, send_detach, _Id, {Pid, Ref}) ->
     Pid ! {Ref, Pkt}.
 
-answer(#diameter_packet{msg = Rec, errors = []}, _Req, _Peer, _) ->
+answer(Pkt, Req, _Peer, Name) ->
+    #diameter_packet{header = H, msg = Rec, errors = Es} = Pkt,
+    ApplId = app(Req, Name),
+    #diameter_header{application_id = ApplId} = H,  %% assert
+    answer(Rec, Es, Name).
+
+answer(Rec, [_|_], N)
+  when N == send_invalid_avp_bits;
+       N == send_invalid_avp_length;
+       N == send_invalid_reject ->
+    Rec;
+answer(Rec, [], _) ->
     Rec.
 
+app(_, send_unsupported_app) ->
+    ?BAD_APP;
+app(Req, _) ->
+    Dict = dict(Req),
+    Dict:id().
+
 %% handle_error/6
 
 handle_error(Reason, _Req, ?CLIENT, _Peer, _Name, _Id) ->
@@ -761,12 +907,24 @@ handle_request(#diameter_packet{header = H, msg = M}, ?SERVER, {_Ref, Caps}) ->
     {V,B} = ?CLIENT_MASK,
     V = EI bsr B,  %% assert
     V = HI bsr B,  %%
-    request(M, Caps).
+    #diameter_caps{origin_state_id = {_,[N]}} = Caps,
+    answer(client(N), request(M, Caps)).
+
+answer(T, {Tag, Action, Post}) ->
+    {Tag, answer(T, Action), Post};
+answer({E,C}, {reply, Ans}) ->
+    answer(C, {reply, msg(Ans, E)});
+answer(pkt, {reply, Ans}) ->
+    {reply, #diameter_packet{msg = Ans}};
+answer(_, T) ->
+    T.
 
+%% send_nok
 request(#diameter_base_accounting_ACR{'Accounting-Record-Number' = 0},
         _) ->
     {eval_packet, {protocol_error, ?INVALID_AVP_BITS}, [fun log/2, invalid]};
 
+%% send_bad_answer
 request(#diameter_base_accounting_ACR{'Session-Id' = SId,
                                       'Accounting-Record-Type' = RT,
                                       'Accounting-Record-Number' = 2 = RN},
@@ -779,12 +937,27 @@ request(#diameter_base_accounting_ACR{'Session-Id' = SId,
                   {'Accounting-Record-Type', RT},
                   {'Accounting-Record-Number', RN}],
 
-    {reply, #diameter_packet{header = #diameter_header{is_error = true},%% not
+    {reply, #diameter_packet{header = #diameter_header{is_error = true},%% NOT
                              msg = Ans}};
 
+%% send_eval
+request(#diameter_base_accounting_ACR{'Session-Id' = SId,
+                                      'Accounting-Record-Type' = RT,
+                                      'Accounting-Record-Number' = 3 = RN},
+        #diameter_caps{origin_host = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    Ans = ['ACA', {'Result-Code', ?SUCCESS},
+                  {'Session-Id', SId},
+                  {'Origin-Host', OH},
+                  {'Origin-Realm', OR},
+                  {'Accounting-Record-Type', RT},
+                  {'Accounting-Record-Number', RN}],
+    {eval, {reply, Ans}, {erlang, now, []}};
+
+%% send_ok
 request(#diameter_base_accounting_ACR{'Session-Id' = SId,
                                       'Accounting-Record-Type' = RT,
-                                      'Accounting-Record-Number' = RN},
+                                      'Accounting-Record-Number' = 1 = RN},
         #diameter_caps{origin_host = {OH, _},
                        origin_realm = {OR, _}}) ->
     {reply, ['ACA', {'Result-Code', ?SUCCESS},
@@ -794,26 +967,42 @@ request(#diameter_base_accounting_ACR{'Session-Id' = SId,
                     {'Accounting-Record-Type', RT},
                     {'Accounting-Record-Number', RN}]};
 
+%% send_protocol_error
+request(#diameter_base_accounting_ACR{'Accounting-Record-Number' = 4},
+        #diameter_caps{origin_host = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    Ans = ['answer-message', {'Result-Code', ?TOO_BUSY},
+                             {'Origin-Host', OH},
+                             {'Origin-Realm', OR}],
+    {reply, Ans};
+
 request(#diameter_base_ASR{'Session-Id' = SId,
                            'AVP' = Avps},
         #diameter_caps{origin_host = {OH, _},
                        origin_realm = {OR, _}}) ->
-    {reply, #diameter_base_ASA{'Result-Code' = ?SUCCESS,
-                               'Session-Id' = SId,
-                               'Origin-Host' = OH,
-                               'Origin-Realm' = OR,
-                               'AVP' = Avps}};
+    {reply, ['ASA', {'Result-Code', ?SUCCESS},
+                    {'Session-Id', SId},
+                    {'Origin-Host', OH},
+                    {'Origin-Realm', OR},
+                    {'AVP', Avps}]};
+
+%% send_invalid_reject
+request(#diameter_base_STR{'Termination-Cause' = ?USER_MOVED}, _Caps) ->
+    {protocol_error, ?TOO_BUSY};
 
+%% send_noreply
 request(#diameter_base_STR{'Termination-Cause' = T},
         _Caps)
   when T /= ?LOGOUT ->
     discard;
 
+%% send_destination_5
 request(#diameter_base_STR{'Destination-Realm'= R},
         #diameter_caps{origin_realm = {OR, _}})
   when R /= undefined, R /= OR ->
     {protocol_error, ?REALM_NOT_SERVED};
 
+%% send_destination_6
 request(#diameter_base_STR{'Destination-Host'= [H]},
         #diameter_caps{origin_host = {OH, _}})
   when H /= OH ->
@@ -822,11 +1011,12 @@ request(#diameter_base_STR{'Destination-Host'= [H]},
 request(#diameter_base_STR{'Session-Id' = SId},
         #diameter_caps{origin_host  = {OH, _},
                        origin_realm = {OR, _}}) ->
-    {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
-                               'Session-Id' = SId,
-                               'Origin-Host' = OH,
-                               'Origin-Realm' = OR}};
+    {reply, ['STA', {'Result-Code', ?SUCCESS},
+                    {'Session-Id', SId},
+                    {'Origin-Host', OH},
+                    {'Origin-Realm', OR}]};
 
+%% send_error
 request(#diameter_base_RAR{}, _Caps) ->
     receive after 2000 -> ok end,
     {protocol_error, ?TOO_BUSY}.
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 5898e125ae..80b1769d04 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -40,7 +40,8 @@ MODULES = \
 	diameter_relay_SUITE \
 	diameter_tls_SUITE \
 	diameter_failover_SUITE \
-	diameter_dpr_SUITE
+	diameter_dpr_SUITE \
+	diameter_event_SUITE
 
 HRL_FILES = \
 	diameter_ct.hrl
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index c9f74ffcec..7b2208137b 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2012. All Rights Reserved.
+# Copyright Ericsson AB 2010-2013. All Rights Reserved.
 #
 # The 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 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.3
+DIAMETER_VSN = 1.3.1
 PRE_VSN      =
 APP_VSN      = "$(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)"
 
diff --git a/lib/edoc/priv/Makefile b/lib/edoc/priv/Makefile
index 73c42c05eb..9873136201 100644
--- a/lib/edoc/priv/Makefile
+++ b/lib/edoc/priv/Makefile
@@ -27,8 +27,11 @@ GEN_SCRIPT_SRC = edoc_generate.src
 GEN_SCRIPT = edoc_generate
 PRIV_FILES = stylesheet.css erlang.png edoc.dtd
 
-debug opt:
-	sed -e "s/%EDOC_VSN%/$(EDOC_VSN)/g" \
+debug opt: $(GEN_SCRIPT)
+
+$(GEN_SCRIPT): ../vsn.mk ../../xmerl/vsn.mk ../../syntax_tools/vsn.mk \
+		$(GEN_SCRIPT_SRC)
+	$(vsn_verbose)sed -e "s/%EDOC_VSN%/$(EDOC_VSN)/g" \
 	    -e "s/%XMERL_VSN%/$(XMERL_VSN)/g" \
 	    -e "s/%SYNTAX_TOOLS_VSN%/$(SYNTAX_TOOLS_VSN)/g" \
 		$(GEN_SCRIPT_SRC) > $(GEN_SCRIPT)
diff --git a/lib/edoc/priv/edoc.dtd b/lib/edoc/priv/edoc.dtd
index 6a332cf22f..ba4ac0db28 100644
--- a/lib/edoc/priv/edoc.dtd
+++ b/lib/edoc/priv/edoc.dtd
@@ -4,7 +4,8 @@
 <!ELEMENT overview (title, description?, author*, copyright?, version?,
                     since?, see*, reference*, todo?, packages, modules)>
 <!ATTLIST overview
-  root CDATA #IMPLIED>
+  root CDATA #IMPLIED
+  encoding CDATA #IMPLIED>
 
 <!ELEMENT title (#PCDATA)>
 
@@ -25,6 +26,7 @@
   name CDATA #REQUIRED
   private (yes | no) #IMPLIED
   hidden (yes | no) #IMPLIED
+  encoding CDATA #IMPLIED
   root CDATA #IMPLIED>
 
 <!ELEMENT description (briefDescription, fullDescription?)>
diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
index 72354ac711..4e5a4182da 100644
--- a/lib/edoc/src/Makefile
+++ b/lib/edoc/src/Makefile
@@ -67,17 +67,17 @@ distclean: clean
 realclean: clean
 
 $(EBIN)/%.$(EMULATOR):%.erl
-	erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(erlc_verbose)erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 544465b14a..599036f380 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -120,7 +120,8 @@ file(Name, Options) ->
     Suffix = proplists:get_value(file_suffix, Options,
 				 ?DEFAULT_FILE_SUFFIX),
     Dir = proplists:get_value(dir, Options, filename:dirname(Name)),
-    edoc_lib:write_file(Text, Dir, BaseName ++ Suffix).
+    Encoding = [{encoding, edoc_lib:read_encoding(Name, [])}],
+    edoc_lib:write_file(Text, Dir, BaseName ++ Suffix, '', Encoding).
 
 
 %% TODO: better documentation of files/1/2, packages/1/2, application/1/2/3
@@ -455,14 +456,14 @@ expand_sources(Ss, Opts) ->
 	  end,
     expand_sources(Ss1, Suffix, sets:new(), [], []).
 
-expand_sources([{P, F, D} | Fs], Suffix, S, As, Ms) ->
-    M = list_to_atom(packages:concat(P, filename:rootname(F, Suffix))),
+expand_sources([{'', F, D} | Fs], Suffix, S, As, Ms) ->
+    M = list_to_atom(filename:rootname(F, Suffix)),
     case sets:is_element(M, S) of
 	true ->
 	    expand_sources(Fs, Suffix, S, As, Ms);
 	false ->
 	    S1 = sets:add_element(M, S),
-	    expand_sources(Fs, Suffix, S1, [{M, P, F, D} | As],
+	    expand_sources(Fs, Suffix, S1, [{M, '', F, D} | As],
 			   [M | Ms])
     end;
 expand_sources([], _Suffix, _S, As, Ms) ->
diff --git a/lib/edoc/src/edoc.hrl b/lib/edoc/src/edoc.hrl
index 98debba4ab..44c5d6fef4 100644
--- a/lib/edoc/src/edoc.hrl
+++ b/lib/edoc/src/edoc.hrl
@@ -48,7 +48,8 @@
 %%                          functions = ordset(function_name()),
 %%                          exports = ordset(function_name()),
 %%                          attributes = ordset({atom(), term()}),
-%%                          records = [{atom(), [{atom(), term()}]}]}
+%%                          records = [{atom(), [{atom(), term()}]}],
+%%                          encoding = epp:source_encoding()}
 %%  ordset(T) = sets:ordset(T)
 %%  function_name(T) = {atom(), integer()}
 
@@ -57,7 +58,8 @@
 		 functions = [],
 		 exports = [],
 		 attributes = [],
-		 records = []
+		 records = [],
+		 encoding = latin1
 		}).
 
 %% Environment for generating documentation data
diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl
index 624f9177a2..f88ba05f4b 100644
--- a/lib/edoc/src/edoc_data.erl
+++ b/lib/edoc/src/edoc_data.erl
@@ -83,7 +83,8 @@ module(Module, Entries, Env, Opts) ->
     AllTags = get_all_tags(Entries),
     Functions = function_filter(Entries, Opts),
     Out = {module, ([{name, Name},
-		     {root, Env#env.root}]
+		     {root, Env#env.root},
+                     {encoding, Module#module.encoding}]
 		    ++ case is_private(HeaderTags) of
 			   true -> [{private, "yes"}];
 			   false -> []
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index 385d20e9ae..a0c1ae1c0f 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -192,8 +192,9 @@ source({M, P, Name, Path}, Dir, Suffix, Env, Set, Private, Hidden,
 		andalso ((not is_hidden(Doc)) orelse Hidden) of
 		true ->
 		    Text = edoc:layout(Doc, Options),
-		    Name1 = packages:last(M) ++ Suffix,
-		    edoc_lib:write_file(Text, Dir, Name1, P),
+		    Name1 = atom_to_list(M) ++ Suffix,
+                    Encoding = [{encoding,encoding(Doc)}],
+		    edoc_lib:write_file(Text, Dir, Name1, P, Encoding),
 		    {sets:add_element(Module, Set), Error};
 		false ->
 		    {Set, Error}
@@ -204,9 +205,9 @@ source({M, P, Name, Path}, Dir, Suffix, Env, Set, Private, Hidden,
     end.
 
 check_name(M, M0, P0, File) ->
-    P = list_to_atom(packages:strip_last(M)),
-    N = packages:last(M),
-    N0 = packages:last(M0),
+    P = '',
+    N = M,
+    N0 = M0,
     case N of
 	[$? | _] ->
 	    %% A module name of the form '?...' is assumed to be caused
@@ -359,14 +360,19 @@ xhtml_1(Title, CSS, Body) ->
 overview(Dir, Title, Env, Opts) ->
     File = proplists:get_value(overview, Opts,
 			       filename:join(Dir, ?OVERVIEW_FILE)),
+    Encoding = edoc_lib:read_encoding(File, [{in_comment_only, false}]),
     Tags = read_file(File, overview, Env, Opts),
-    Data = edoc_data:overview(Title, Tags, Env, Opts),
+    Data0 = edoc_data:overview(Title, Tags, Env, Opts),
+    EncodingAttribute = #xmlAttribute{name = encoding,
+                                      value = atom_to_list(Encoding)},
+    #xmlElement{attributes = As} = Data0,
+    Data = Data0#xmlElement{attributes = [EncodingAttribute | As]},
     F = fun (M) ->
 		M:overview(Data, Opts)
 	end,
     Text = edoc_lib:run_layout(F, Opts),
-    edoc_lib:write_file(Text, Dir, ?OVERVIEW_SUMMARY).
-
+    EncOpts = [{encoding,Encoding}],
+    edoc_lib:write_file(Text, Dir, ?OVERVIEW_SUMMARY, '', EncOpts).
 
 copy_image(Dir) ->
     case code:priv_dir(?EDOC_APP) of
@@ -441,6 +447,12 @@ is_hidden(E) ->
  	_ -> false
     end.
 
+encoding(E) ->
+    case get_attrval(encoding, E) of
+        "latin1" -> latin1;
+        _ -> utf8
+    end.
+
 get_attrval(Name, #xmlElement{attributes = As}) ->
     case get_attr(Name, As) of
 	[#xmlAttribute{value = V}] ->
diff --git a/lib/edoc/src/edoc_extract.erl b/lib/edoc/src/edoc_extract.erl
index 5a79e127f6..67a95e80aa 100644
--- a/lib/edoc/src/edoc_extract.erl
+++ b/lib/edoc/src/edoc_extract.erl
@@ -121,7 +121,7 @@ source1(Tree, File0, Env, Opts, TypeDocs) ->
     Module = get_module_info(Tree, File),
     {Header, Footer, Entries} = collect(Forms, Module),
     Name = Module#module.name,
-    Package = list_to_atom(packages:strip_last(Name)),
+    Package = '',
     Env1 = Env#env{module = Name,
 		   package = Package,
 		   root = edoc_refs:relative_package_path('', Package)},
@@ -226,7 +226,7 @@ add_macro_defs(Defs0, Opts, Env) ->
 %% lines of text before the first tag are ignored. `Env' is an
 %% environment created by {@link edoc_lib:get_doc_env/4}. Upon error,
 %% `Reason' is an atom returned from the call to {@link
-%% //kernel/file:read_file/1}.
+%% //kernel/file:read_file/1} or the atom 'invalid_unicode'.
 %%
 %% See {@link text/4} for options.
 
@@ -235,7 +235,13 @@ add_macro_defs(Defs0, Opts, Env) ->
 file(File, Context, Env, Opts) ->
     case file:read_file(File) of
 	{ok, Bin} ->
-	    {ok, text(binary_to_list(Bin), Context, Env, Opts, File)};
+            Enc = edoc_lib:read_encoding(File,[{in_comment_only, false}]),
+            case catch unicode:characters_to_list(Bin, Enc) of
+                String when is_list(String) ->
+                    {ok, text(String, Context, Env, Opts, File)};
+                _ ->
+                    {error, invalid_unicode}
+            end;
         {error, _} = Error ->
             Error
     end.
@@ -306,12 +312,14 @@ get_module_info(Forms, File) ->
     Exports = ordsets:from_list(get_list_keyval(exports, L)),
     Attributes = ordsets:from_list(get_list_keyval(attributes, L)),
     Records = get_list_keyval(records, L),
+    Encoding = edoc_lib:read_encoding(File, []),
     #module{name = Name,
 	    parameters = Vars,
 	    functions = Functions,
 	    exports = ordsets:intersection(Exports, Functions),
 	    attributes = Attributes,
-	    records = Records}.
+	    records = Records,
+	    encoding = Encoding}.
 
 get_list_keyval(Key, L) ->
     case lists:keyfind(Key, 1, L) of
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 951cec121c..7bd0615f5c 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -210,7 +210,8 @@ layout_module(#xmlElement{name = module, content = Es}=E, Opts) ->
 	    ++ [hr, ?NL]
 	    ++ navigation("bottom")
 	    ++ timestamp()),
-    xhtml(Title, stylesheet(Opts), Body).
+    Encoding = get_attrval(encoding, E),
+    xhtml(Title, stylesheet(Opts), Body, Encoding).
 
 module_params(Es) ->
     As = [{get_text(argName, Es1),
@@ -956,10 +957,17 @@ local_label(R) ->
     "#" ++ R.
 
 xhtml(Title, CSS, Body) ->
+    xhtml(Title, CSS, Body, "latin1").
+
+xhtml(Title, CSS, Body, Encoding) ->
+    EncString = case Encoding of
+                    "latin1" -> "ISO-8859-1";
+                    _ -> "UTF-8"
+                end,
     [{html, [?NL,
 	     {head, [?NL,
 		     {meta, [{'http-equiv',"Content-Type"},
-			     {content, "text/html; charset=ISO-8859-1"}],
+			     {content, "text/html; charset="++EncString}],
 		      []},
 		     ?NL,
 		     {title, Title},
@@ -1021,7 +1029,8 @@ overview(E=#xmlElement{name = overview, content = Es}, Options) ->
 	    ++ [?NL, hr]
 	    ++ navigation("bottom")
 	    ++ timestamp()),
-    XML = xhtml(Title, stylesheet(Opts), Body),
+    Encoding = get_attrval(encoding, E),
+    XML = xhtml(Title, stylesheet(Opts), Body, Encoding),
     xmerl:export_simple(XML, ?HTML_EXPORT, []).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NYTT
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 90fb8a679c..3d193c4bfa 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% =====================================================================
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
@@ -30,10 +31,10 @@
 	 parse_contact/2, escape_uri/1, join_uri/2, is_relative_uri/1,
 	 is_name/1, to_label/1, find_doc_dirs/0, find_sources/2,
 	 find_sources/3, find_file/3, try_subdir/2, unique/1,
-	 write_file/3, write_file/4, write_info_file/4,
+	 write_file/3, write_file/4, write_file/5, write_info_file/4,
 	 read_info_file/1, get_doc_env/1, get_doc_env/4, copy_file/2,
 	 uri_get/1, run_doclet/2, run_layout/2,
-	 simplify_path/1, timestr/1, datestr/1]).
+	 simplify_path/1, timestr/1, datestr/1, read_encoding/2]).
 
 -import(edoc_report, [report/2, warning/2]).
 
@@ -57,6 +58,13 @@ datestr({Y,M,D}) ->
     lists:flatten(io_lib:fwrite("~s ~w ~w",[lists:nth(M, Ms),D,Y])).
 
 %% @private
+read_encoding(File, Options) ->
+    case epp:read_encoding(File, Options) of
+        none -> epp:default_encoding();
+        Encoding -> Encoding
+    end.
+
+%% @private
 count(X, Xs) ->
     count(X, Xs, 0).
 
@@ -228,13 +236,13 @@ end_of_sentence_1(_, false, _) ->
 %% 173 - 176	{ - ~		punctuation
 %% 177		DEL		control
 %% 200 - 237			control
-%% 240 - 277	NBSP - �	punctuation
-%% 300 - 326	� - �		uppercase
-%% 327		�		punctuation
-%% 330 - 336	� - �		uppercase
-%% 337 - 366	� - �		lowercase
-%% 367		�		punctuation
-%% 370 - 377	� - �		lowercase
+%% 240 - 277	NBSP - ¿	punctuation
+%% 300 - 326	À - Ö		uppercase
+%% 327		×		punctuation
+%% 330 - 336	Ø - Þ		uppercase
+%% 337 - 366	ß - ö		lowercase
+%% 367		÷		punctuation
+%% 370 - 377	ø - ÿ		lowercase
 
 %% Names must begin with a lowercase letter and contain only
 %% alphanumerics and underscores.
@@ -261,6 +269,10 @@ is_name_1(_) -> false.
 
 to_atom(A) when is_atom(A) -> A;
 to_atom(S) when is_list(S) -> list_to_atom(S).
+
+to_list(A) when is_atom(A) -> atom_to_list(A);
+to_list(S) when is_list(S) -> S.
+
     
 %% @private
 unique([X | Xs]) -> [X | unique(Xs, X)];
@@ -677,7 +689,6 @@ try_subdir(Dir, Subdir) ->
 write_file(Text, Dir, Name) ->
     write_file(Text, Dir, Name, '').
 
-
 %% @spec (Text::deep_string(), Dir::edoc:filename(),
 %%        Name::edoc:filename(), Package::atom()|string()) -> ok
 %% @doc Like {@link write_file/3}, but adds path components to the target
@@ -685,10 +696,12 @@ write_file(Text, Dir, Name) ->
 %% @private
 
 write_file(Text, Dir, Name, Package) ->
-    Dir1 = filename:join([Dir | packages:split(Package)]),
-    File = filename:join(Dir1, Name),
+    write_file(Text, Dir, Name, Package, [{encoding,latin1}]).
+
+write_file(Text, Dir, Name, Package, Options) ->
+    File = filename:join([Dir, to_list(Package), Name]),
     ok = filelib:ensure_dir(File),
-    case file:open(File, [write]) of
+    case file:open(File, [write] ++ Options) of
 	{ok, FD} ->
 	    io:put_chars(FD, Text),
 	    ok = file:close(FD);
@@ -705,8 +718,9 @@ write_info_file(App, Packages, Modules, Dir) ->
     Ts1 = if App =:= ?NO_APP -> Ts;
 	     true -> [{application, App} | Ts]
 	  end,
-    S = [io_lib:fwrite("~p.\n", [T]) || T <- Ts1],
-    write_file(S, Dir, ?INFO_FILE).
+    S0 = [io_lib:fwrite("~p.\n", [T]) || T <- Ts1],
+    S = ["%% encoding: UTF-8\n" | S0],
+    write_file(S, Dir, ?INFO_FILE, '', [{encoding,unicode}]).
 
 %% @spec (Name::edoc:filename()) -> {ok, string()} | {error, Reason}
 %%
@@ -714,7 +728,14 @@ write_info_file(App, Packages, Modules, Dir) ->
 
 read_file(File) ->
     case file:read_file(File) of
-	{ok, Bin} -> {ok, binary_to_list(Bin)};
+	{ok, Bin} ->
+            Enc = edoc_lib:read_encoding(File, []),
+            case catch unicode:characters_to_list(Bin, Enc) of
+                String when is_list(String) ->
+                    {ok, String};
+                _ ->
+                    {error, invalid_unicode}
+            end;
 	{error, Reason} -> {error, Reason}
     end.
 
@@ -818,7 +839,7 @@ find_sources(Path, Pkg, Rec, Ext, Opts) ->
     lists:flatten(find_sources_1(Path, to_atom(Pkg), Rec, Ext, Skip)).
 
 find_sources_1([P | Ps], Pkg, Rec, Ext, Skip) ->
-    Dir = filename:join(P, filename:join(packages:split(Pkg))),
+    Dir = filename:join(P, atom_to_list(Pkg)),
     Fs1 = find_sources_1(Ps, Pkg, Rec, Ext, Skip),
     case filelib:is_dir(Dir) of
 	true ->
@@ -844,9 +865,9 @@ find_sources_2(Dir, Pkg, Rec, Ext, Skip) ->
 	    []
     end.
 
-find_sources_3(Es, Dir, Pkg, Rec, Ext, Skip) ->
+find_sources_3(Es, Dir, '', Rec, Ext, Skip) ->
     [find_sources_2(filename:join(Dir, E),
-		    to_atom(packages:concat(Pkg, E)), Rec, Ext, Skip)
+		    to_atom(E), Rec, Ext, Skip)
      || E <- Es, is_package_dir(E, Dir)].
 
 is_source_file(Name, Ext) ->
@@ -858,16 +879,16 @@ is_package_dir(Name, Dir) ->
 	andalso filelib:is_dir(filename:join(Dir, Name)).
 
 %% @private
-find_file([P | Ps], Pkg, Name) ->
-    Dir = filename:join(P, filename:join(packages:split(Pkg))),
-    File = filename:join(Dir, Name),
+find_file([P | Ps], []=Pkg, Name) ->
+    Pkg = [],
+    File = filename:join(P, Name),
     case filelib:is_file(File) of
 	true ->
 	    File;    
 	false ->
 	    find_file(Ps, Pkg, Name)
     end;    
-find_file([], _Pkg, _Name) ->
+find_file([], [], _Name) ->
     "".
 
 %% @private
diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl
index 70fb38bf0a..08686c4fb5 100644
--- a/lib/edoc/src/edoc_macros.erl
+++ b/lib/edoc/src/edoc_macros.erl
@@ -88,13 +88,13 @@ link_macro(S, Line, Env) ->
 		 true -> " target=\"_top\""; % note the initial space
 		 false -> ""
 	     end,
-    lists:flatten(io_lib:fwrite("<a href=\"~s\"~s>~s</a>",
+    lists:flatten(io_lib:fwrite("<a href=\"~s\"~s>~ts</a>",
 				[URI, Target, Txt])).
 
 section_macro(S, _Line, _Env) ->
     S1 = lists:reverse(edoc_lib:strip_space(
 			 lists:reverse(edoc_lib:strip_space(S)))),
-    lists:flatten(io_lib:format("<a href=\"#~s\">~s</a>",
+    lists:flatten(io_lib:format("<a href=\"#~ts\">~ts</a>",
 				[edoc_lib:to_label(S1), S1])).
 
 type_macro(S, Line, Env) ->
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index d7c1b1c045..cf1a2d6b11 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -1,6 +1,7 @@
+%% -*- coding: utf-8 -*-
 %% ========================== -*-Erlang-*- =============================
 %% EDoc type specification grammar for the Yecc parser generator,
-%% adapted from Sven-Olof Nystr�m's type specification parser.
+%% adapted from Sven-Olof Nyström's type specification parser.
 %%
 %% Also contains entry points for parsing things like typedefs,
 %% references, and throws-declarations.
@@ -317,10 +318,7 @@ tok_val(T) -> element(3, T).
 
 tok_line(T) -> element(2, T).
 
-qname([A]) ->
-    A;    % avoid unnecessary call to packages:concat/1.
-qname(List) ->
-    list_to_atom(packages:concat(lists:reverse(List))).
+qname([A]) -> A.
 
 union(Ts) ->
     case Ts of
diff --git a/lib/edoc/src/edoc_refs.erl b/lib/edoc/src/edoc_refs.erl
index 1f578a3b83..ea439490ed 100644
--- a/lib/edoc/src/edoc_refs.erl
+++ b/lib/edoc/src/edoc_refs.erl
@@ -126,7 +126,7 @@ abs_uri({package, P}, Env) ->
 module_ref(M, Env) ->
     case (Env#env.modules)(M) of
 	"" ->
-	    File = packages:last(M) ++ Env#env.file_suffix,
+	    File = atom_to_list(M) ++ Env#env.file_suffix,
 	    Path = relative_module_path(M, Env#env.package),
 	    join_uri(Path, escape_uri(File));
 	Base ->
@@ -134,8 +134,7 @@ module_ref(M, Env) ->
     end.
 
 module_absref(M, Env) ->
-    join_segments(packages:split(M))
-	++ escape_uri(Env#env.file_suffix).
+    escape_uri(atom_to_list(M)) ++ escape_uri(Env#env.file_suffix).
 
 package_ref(P, Env) ->
     case (Env#env.packages)(P) of
@@ -147,7 +146,7 @@ package_ref(P, Env) ->
     end.
 
 package_absref(P, Env) ->
-    join_uri(join_segments(packages:split(P)),
+    join_uri(escape_uri(atom_to_list(P)),
 	     escape_uri(Env#env.package_summary)).
 
 app_ref(A, Env) ->
@@ -179,14 +178,11 @@ join_segments([S | Ss]) ->
 %% The empty string is returned if the To module has only one segment,
 %% implying a local reference.
 
-relative_module_path(To, From) ->
-    case first(packages:split(To)) of
-	[] -> "";
-	P -> relative_path(P, packages:split(From))
-    end.
+relative_module_path(_To, _From) ->
+    "".
 
 relative_package_path(To, From) ->
-    relative_path(packages:split(To), packages:split(From)).
+    relative_path([atom_to_list(To)], [atom_to_list(From)]).
 
 %% This takes two lists of path segments (From, To). Note that an empty
 %% string will be returned if the paths are the same. Empty leading
@@ -210,6 +206,3 @@ relative_path_2([], []) ->
     "";
 relative_path_2([], Ts) ->
     join_segments(Ts).
-
-first([H | T]) when T /= [] -> [H | first(T)];
-first(_) -> [].
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index 5c71658af5..cc0529d2a9 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -80,6 +80,7 @@ parse_xml(Data, Line) ->
 
 parse_xml_1(Text, Line) ->
     Text1 = "<doc>" ++ Text ++ "</doc>",
+    %% Any coding except "utf-8".
     Opts = [{line, Line}, {encoding, 'iso-8859-1'}],
     case catch {ok, xmerl_scan:string(Text1, Opts)} of
 	{ok, {E, _}} ->
@@ -174,7 +175,7 @@ expand_heading_1(Cs, N, L, As) ->
 
 expand_heading_2(Ts, Cs, N, L, As) ->
     H = ?BASE_HEADING + N,
-    Ts1 = io_lib:format("<h~w><a name=\"~s\">~s</a></h~w>\n",
+    Ts1 = io_lib:format("<h~w><a name=\"~ts\">~ts</a></h~w>\n",
 			[H, make_label(Ts), Ts, H]),
     expand_new_line(Cs, L + 1, lists:reverse(lists:flatten(Ts1), As)).
 
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index 04dad2eee7..bd6f00af1f 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -68,7 +68,7 @@ filter()    See present/1, substrings/2,
       <fsummary>Open a connection to an LDAP server.</fsummary>
       <type>
 	<v>Handle = handle()</v>
-	<v>Option = {port, integer()} | {log, function()} | {timeout, integer()} | {ssl, boolean()}</v>
+	<v>Option = {port, integer()} | {log, function()} | {timeout, integer()} | {ssl, boolean()} | {sslopts, list()}</v>
       </type>
       <desc>
         <p>Setup a connection to an LDAP server, the <c>HOST</c>'s are tried in order.</p>
diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
index 46fb805bcc..ad93e1087a 100644
--- a/lib/eldap/src/Makefile
+++ b/lib/eldap/src/Makefile
@@ -75,10 +75,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(ELDAP_VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(ELDAP_VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(ELDAP_VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(ELDAP_VSN);' $< > $@
 
 docs:
 
@@ -88,7 +88,7 @@ $(TARGET_FILES): $(HRL_FILES)
 # Special Build Targets
 # ----------------------------------------------------
 $(ASN1_HRL): ../asn1/$(ASN1_FILES)
-	$(ERLC) -o $(EBIN) -bber $(ERL_COMPILE_FLAGS) ../asn1/ELDAPv3.asn1
+	$(asn_verbose)$(ERLC) -o $(EBIN) -bber $(ERL_COMPILE_FLAGS) ../asn1/ELDAPv3.asn1
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index b3249d4f56..d030408770 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -42,7 +42,8 @@
 		log,                 % User provided log function
 		timeout = infinity,  % Request timeout
 		anon_auth = false,   % Allow anonymous authentication
-		use_tls = false      % LDAP/LDAPS
+		use_tls = false,      % LDAP/LDAPS
+		tls_opts = [] % ssl:ssloptsion()
 	       }).
 
 %%% For debug purposes
@@ -320,7 +321,7 @@ present(Attribute) when is_list(Attribute) ->
 %%% will match entries containing:  'sn: Tornkvist'
 %%%
 substrings(Type, SubStr) when is_list(Type), is_list(SubStr) ->
-    Ss = {'SubstringFilter_substrings',v_substr(SubStr)},
+    Ss = v_substr(SubStr),
     {substrings,#'SubstringFilter'{type = Type,
 				   substrings = Ss}}.
 
@@ -353,6 +354,10 @@ parse_args([{ssl, true}|T], Cpid, Data) ->
     parse_args(T, Cpid, Data#eldap{use_tls = true});
 parse_args([{ssl, _}|T], Cpid, Data) ->
     parse_args(T, Cpid, Data);
+parse_args([{sslopts, Opts}|T], Cpid, Data) when is_list(Opts) ->
+    parse_args(T, Cpid, Data#eldap{use_tls = true, tls_opts = Opts ++ Data#eldap.tls_opts});
+parse_args([{sslopts, _}|T], Cpid, Data) ->
+    parse_args(T, Cpid, Data);
 parse_args([{log, F}|T], Cpid, Data) when is_function(F) ->
     parse_args(T, Cpid, Data#eldap{log = F});
 parse_args([{log, _}|T], Cpid, Data) ->
@@ -384,8 +389,8 @@ try_connect([],_) ->
 do_connect(Host, Data, Opts) when Data#eldap.use_tls == false ->
     gen_tcp:connect(Host, Data#eldap.port, Opts, Data#eldap.timeout);
 do_connect(Host, Data, Opts) when Data#eldap.use_tls == true ->
-    ssl:connect(Host, Data#eldap.port, [{verify,0}|Opts]).
-
+    SslOpts = [{verify,0} | Opts ++ Data#eldap.tls_opts],
+    ssl:connect(Host, Data#eldap.port, SslOpts).
 
 loop(Cpid, Data) ->
     receive
diff --git a/lib/erl_docgen/doc/src/doc-build.xml b/lib/erl_docgen/doc/src/doc-build.xml
index 08410a1539..ae1b17dff5 100644
--- a/lib/erl_docgen/doc/src/doc-build.xml
+++ b/lib/erl_docgen/doc/src/doc-build.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -56,7 +56,8 @@
       </p>
       <code>
 
-	1> escript $(ERL_TOP)/lib/erl_docgen/priv/bin/codeline_preprocessing.escript ex1.xmlsrc ex1.xml
+	1> escript $(ERL_TOP)/lib/erl_docgen/priv/bin/codeline_preprocessing.escript \
+	   ex1.xmlsrc ex1.xml
       </code>
     </section>
   </section>
diff --git a/lib/erl_docgen/priv/bin/xml_from_edoc.escript b/lib/erl_docgen/priv/bin/xml_from_edoc.escript
index 2cb81be1be..65a580dca2 100755
--- a/lib/erl_docgen/priv/bin/xml_from_edoc.escript
+++ b/lib/erl_docgen/priv/bin/xml_from_edoc.escript
@@ -2,7 +2,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -100,10 +100,12 @@ module(File, Args) ->
 users_guide(File, Args) ->
     case filelib:is_regular(File) of
 	true ->
+            Enc = epp:read_encoding(File, [{in_comment_only, false}]),
+            Encoding = [{encoding, Enc} || Enc =/= none],
 	    Opts = [{def,         Args#args.def},
 		    {app_default, "OTPROOT"},
 		    {file_suffix, Args#args.suffix},
-		    {layout,      Args#args.layout}],
+		    {layout,      Args#args.layout}] ++ Encoding,
 	    
 	    Env = edoc_lib:get_doc_env(Opts),
 	    
@@ -115,7 +117,7 @@ users_guide(File, Args) ->
 	    Text = edoc_lib:run_layout(F, Opts),
 	    
 	    OutFile = "chapter" ++ Args#args.suffix,
-	    edoc_lib:write_file(Text, ".", OutFile);
+	    edoc_lib:write_file(Text, ".", OutFile, '', Encoding);
 	false ->
 	    io:format("~s: not a regular file\n", [File]),
 	    usage()
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index c1237766e1..93592607df 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -26,10 +26,12 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,type_desc+,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 type                (v,d?)* >
+<!ATTLIST type                 variable CDATA #IMPLIED
+                               name_i CDATA #IMPLIED>
 <!ELEMENT v                   (#PCDATA) >
 <!ELEMENT d                   (#PCDATA|c|em)* >
 <!ELEMENT desc                (%block;|quote|br|marker|warning|note|anno)* >
@@ -41,3 +43,4 @@
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
 <!ELEMENT type_desc           (#PCDATA) >
+<!ATTLIST type_desc            variable CDATA #REQUIRED>
diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd
index 9905086ff4..0cc5cfa06d 100644
--- a/lib/erl_docgen/priv/dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/dtd/erlref.dtd
@@ -29,3 +29,6 @@
 <!-- `name' is used in common.refs.dtd and must therefore 
       be defined in each *ref. dtd -->
 <!ELEMENT name                (#PCDATA) >
+<!ATTLIST name                 name CDATA #IMPLIED
+                               arity CDATA #IMPLIED
+	                       clause_i CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/fop.xconf b/lib/erl_docgen/priv/fop.xconf
new file mode 100644
index 0000000000..70ecd608c3
--- /dev/null
+++ b/lib/erl_docgen/priv/fop.xconf
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+     #
+     # %CopyrightBegin%
+     #
+     # Copyright Ericsson AB 2009-2012. All Rights Reserved.
+     #
+     # The contents of this file are subject to the Erlang Public License,
+     # Version 1.1, (the "License"); you may not use this file except in
+     # compliance with the License. You should have received a copy of the
+     # Erlang Public License along with this software. If not, it can be
+     # retrieved online at http://www.erlang.org/.
+     #
+     # Software distributed under the License is distributed on an "AS IS"
+     # basis, 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 is the version of the configuration -->
+<fop version="1.0">
+  <!-- The substitutions of DejaVu 700 are there because FOP outputs
+       warnings about doing the substitutions otherwise -->
+  <fonts>
+    <substitutions>
+      <substitution>
+	<from font-family="DejaVuSans" font-weight="700"/>
+	<to font-family="DejaVuSans" font-weight="400"/>
+      </substitution>
+      <substitution>
+	<from font-family="DejaVuSansMono" font-weight="700"/>
+	<to font-family="DejaVuSansMono" font-weight="400"/>
+      </substitution>
+    </substitutions>
+  </fonts>
+  <renderers>
+    <renderer mime="application/pdf">
+      <fonts>
+       <auto-detect/>
+      </fonts>
+    </renderer>
+  </renderers>
+</fop>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 7de5af2a49..c846bdbf34 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1102,11 +1102,13 @@
 
   <xsl:template match="taglist/item">
     <xsl:param name="partnum"/>
-    <fo:block xsl:use-attribute-sets="tagitem">
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
-    </fo:block>
+    <fo:block-container>
+      <fo:block xsl:use-attribute-sets="tagitem">
+	<xsl:apply-templates>
+	  <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:block>
+    </fo:block-container>
   </xsl:template>
 
 
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 4e61f1f476..2e3b22acf4 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2011. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2012. All Rights Reserved.
      #
      # The 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,7 +52,7 @@
 
   <!-- XSL-FO properties -->
   <xsl:attribute-set name="caption">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-previous.within-page">always</xsl:attribute>
@@ -61,7 +61,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="pre">
-    <xsl:attribute name="font-family">monospace</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="keep-together.within-page">auto</xsl:attribute>
     <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
@@ -162,7 +162,7 @@
     <xsl:attribute name="border-after-width">1pt</xsl:attribute>
     <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="break-before">page</xsl:attribute>
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.83em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="space-after">1em</xsl:attribute>
@@ -171,7 +171,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h2">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.5em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -180,7 +180,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h3">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.33em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -189,7 +189,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h4">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.17em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -198,7 +198,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h5">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -207,7 +207,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h6">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.83em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -227,20 +227,20 @@
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">2pt</xsl:attribute>
     <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.9em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="page-footer">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.9em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="code">
     <xsl:attribute name="background-color">#e0e0ff</xsl:attribute>
-    <xsl:attribute name="font-family">monospace</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="keep-together.within-page">auto</xsl:attribute>
     <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
@@ -303,7 +303,7 @@
   <xsl:attribute-set name="module-name">
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">1pt</xsl:attribute>
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.5em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -313,7 +313,7 @@
 
   <xsl:attribute-set name="function-name">
     <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="font-family">monospace</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <!-- xsl:attribute name="font-size">0.8em</xsl:attribute -->
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
     <xsl:attribute name="space-after">0.25em</xsl:attribute>
@@ -401,7 +401,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="caption">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-previous.within-page">always</xsl:attribute>
diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
index 6c8b438b25..ef96f5dbf2 100644
--- a/lib/erl_docgen/src/Makefile
+++ b/lib/erl_docgen/src/Makefile
@@ -78,10 +78,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index cbaa93a15d..e3cc354206 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -1,19 +1,20 @@
-%% ``The contents of this file are subject to the Erlang Public License,
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance 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 expressed or implied. See
-%% the Licence for the specific language governing rights and limitations
+%% 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.
-%% Portions created by Ericsson are Copyright 1999-2006, Ericsson AB.
-%% All Rights Reserved.��
-%%
-%%     $Id$
+%% %CopyrightEnd%
 %%
 -module(docgen_edoc_xml_cb).
 
@@ -39,12 +40,14 @@
 module(Element, Opts) ->
     SortP = proplists:get_value(sort_functions, Opts, true),
     XML = layout_module(Element, SortP),
-    xmerl:export_simple([XML], docgen_xmerl_xml_cb, []).
+    RootAttributes = root_attributes(Element, Opts),
+    xmerl:export_simple([XML], docgen_xmerl_xml_cb, RootAttributes).
 
 %% CHAPTER
-overview(Element, _Opts) ->
+overview(Element, Opts) ->
     XML = layout_chapter(Element),
-    xmerl:export_simple([XML], docgen_xmerl_xml_cb, []).
+    RootAttributes = root_attributes(Element, Opts),
+    xmerl:export_simple([XML], docgen_xmerl_xml_cb, RootAttributes).
 
 %%--Internal functions--------------------------------------------------
 
@@ -99,6 +102,16 @@ layout_module(#xmlElement{name = module, content = Es}=E, SortP) ->
       ?NL,Authors]
     }.
 
+root_attributes(Element, Opts) ->
+    Encoding = case get_attrval(encoding, Element) of
+                   "" ->
+                       DefaultEncoding = epp:default_encoding(),
+                       proplists:get_value(encoding, Opts, DefaultEncoding);
+                   Enc ->
+                       Enc
+               end,
+    [#xmlAttribute{name=encoding, value=Encoding}].
+
 layout_chapter(#xmlElement{name=overview, content=Es}) ->
     Title = get_text(title, Es),
     Header = {header, [
diff --git a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
index 884932ed12..d713b61c0a 100644
--- a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
@@ -1,19 +1,20 @@
-%% ``The contents of this file are subject to the Erlang Public License,
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance 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 expressed or implied. See
-%% the Licence for the specific language governing rights and limitations
+%% 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.
-%% Portions created by Ericsson are Copyright 1999-2006, Ericsson AB.
-%% All Rights Reserved.��
-%%
-%%     $Id$
+%% %CopyrightEnd%
 %%
 -module(docgen_xmerl_xml_cb).
 
@@ -35,9 +36,14 @@
 '#xml-inheritance#'() ->
     [xmerl_xml].
 
-'#root#'(Data, _Attrs, [], _E) -> 
+'#root#'(Data, Attrs, [], _E) ->
+    Encoding =
+        case [E || #xmlAttribute{name = encoding, value = E} <- Attrs] of
+            [E] -> E;
+            _ -> atom_to_list(epp:default_encoding())
+        end,
     ["<",DTD,">"] = hd(hd(Data)),
-    ["<?xml version=\"1.0\" encoding=\"latin1\" ?>\n",
+    ["<?xml version=\"1.0\" encoding=\"",Encoding,"\" ?>\n",
      "<!DOCTYPE "++DTD++" SYSTEM \""++DTD++".dtd\">\n",
      Data].
 
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 2599dc0ff7..a2262198dc 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1,2 +1 @@
-ERL_DOCGEN_VSN = 0.3.3
-
+ERL_DOCGEN_VSN = 0.3.4
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4
index 9578cd35c4..918e30a886 100644
--- a/lib/erl_interface/aclocal.m4
+++ b/lib/erl_interface/aclocal.m4
@@ -1849,6 +1849,31 @@ case $erl_gethrvtime in
 esac
 ])dnl
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $$2";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $$2")
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
 dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
 dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index 97f1cff345..d511f2e240 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -273,6 +273,8 @@ esac
 AC_SUBST(WFLAGS)
 
 if test "x$GCC" = xyes; then
+  # Treat certain GCC warnings as errors
+  LM_TRY_ENABLE_CFLAG([-Werror=return-type], [WERRORFLAGS])
   WFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline"
   # check which GCC version
   GCC_VERSION=`$CC -v 2>&1 | sed -n 's/gcc version //p'`
@@ -287,8 +289,10 @@ if test "x$GCC" = xyes; then
     *)
         WFLAGS="$WFLAGS -fno-strict-aliasing";;
   esac
+  CFLAGS="$WERRORFLAGS $CFLAGS"
 else
   WFLAGS=""
+  WERRORFLAGS=""
 fi
 
 # ---------------------------------------------------------------------------
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index 5f0367bec1..03e2ce14f0 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -22,10 +22,11 @@
 
 # FIXME let configure put in this last part TARGET
 
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 
 debug opt shared purify quantify purecov gcov:
-	$(MAKE) -f $(TARGET)/Makefile TYPE=$@
+	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile TYPE=$@
 
 clean depend docs release release_docs tests release_tests check:
-	$(MAKE) -f $(TARGET)/Makefile $@
+	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile $@
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index cb41391fe9..ebacc1cee0 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -38,6 +38,8 @@ TARGET = @TARGET@
 include ../vsn.mk
 include $(TARGET)/eidefs.mk
 
+include $(ERL_TOP)/make/output.mk
+
 USING_MINGW=@MIXED_CYGWIN_MINGW@
 USING_MSYS_VC==@MIXED_MSYS_VC@
 USING_CYGWIN_VC==@MIXED_MSYS_VC@
@@ -98,6 +100,12 @@ LD = @LD@
 AR = @AR@
 RANLIB = @RANLIB@
 
+ifeq ($(V),0)
+AR_FLAGS=rc
+else
+AR_FLAGS=rcv
+endif
+
 INCFLAGS = -I. -I../include -Iconnect -Iencode -Idecode -Imisc -Iepmd \
 	-Iregistry -I$(TARGET) 
 
@@ -552,16 +560,18 @@ distclean: clean
 
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 $(TARGET)/config.h:
-	echo "/* Generated by Makefile */" > $@
-	echo "#define HAVE_STRERROR 1" >> $@
-	echo "#define HAVE_SOCKLEN_T 1" >> $@
+	$(gen_verbose)
+	$(V_at)echo "/* Generated by Makefile */" > $@
+	$(V_at)echo "#define HAVE_STRERROR 1" >> $@
+	$(V_at)echo "#define HAVE_SOCKLEN_T 1" >> $@
 endif
 
 ifeq ($(findstring ose,$(TARGET)),ose)
 $(TARGET)/config.h:
-	echo "/* Generated by Makefile */" > $@
-	echo "#define HAVE_STRERROR 1" >> $@
-	echo "#define HAVE_SOCKLEN_T 1" >> $@
+	$(gen_verbose)
+	$(V_at)echo "/* Generated by Makefile */" > $@
+	$(V_at)echo "#define HAVE_STRERROR 1" >> $@
+	$(V_at)echo "#define HAVE_SOCKLEN_T 1" >> $@
 endif
 
 ###########################################################################
@@ -569,19 +579,19 @@ endif
 ###########################################################################
 
 $(ST_OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@ 
+	$(V_CC) $(CFLAGS) -c $< -o $@
 
 $(MT_OBJDIR)/%.o: %.c
-	$(CC) $(MTFLAG) $(CFLAGS) $(THR_DEFS) -c $< -o $@ 
+	$(V_CC) $(MTFLAG) $(CFLAGS) $(THR_DEFS) -c $< -o $@
 
 $(MD_OBJDIR)/%.o: %.c
-	$(CC) -MD $(CFLAGS) $(THR_DEFS) -c $< -o $@ 
+	$(V_CC) -MD $(CFLAGS) $(THR_DEFS) -c $< -o $@
 
 $(MD_OBJDIR)/%.o: %.c
-	$(CC) -MD $(CFLAGS) $(THR_DEFS) -c $< -o $@ 
+	$(V_CC) -MD $(CFLAGS) $(THR_DEFS) -c $< -o $@
 
 $(MDD_OBJDIR)/%.o: %.c
-	$(CC) -MDd $(CFLAGS) $(THR_DEFS) -c $< -o $@ 
+	$(V_CC) -MDd $(CFLAGS) $(THR_DEFS) -c $< -o $@
 
 ###########################################################################
 #  Create directories
@@ -598,67 +608,67 @@ ifeq ($(TARGET),win32)
 # Windows archive creation
 
 $(ST_EILIB) : $(ST_EIOBJECTS)
-	$(AR) -out:$@ $(ST_EIOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(ST_EIOBJECTS)
+	$(V_RANLIB) $@
 
 $(ST_ERLLIB) : $(ST_ERLOBJECTS)
-	$(AR) -out:$@ $(ST_ERLOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(ST_ERLOBJECTS)
+	$(V_RANLIB) $@
 
 $(MT_EILIB) : $(MT_EIOBJECTS)
-	$(AR) -out:$@ $(MT_EIOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(MT_EIOBJECTS)
+	$(V_RANLIB) $@
 
 $(MT_ERLLIB) : $(MT_ERLOBJECTS)
-	$(AR) -out:$@ $(MT_ERLOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(MT_ERLOBJECTS)
+	$(V_RANLIB) $@
 
 $(MD_EILIB) : $(MD_EIOBJECTS)
-	$(AR) -out:$@ $(MD_EIOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(MD_EIOBJECTS)
+	$(V_RANLIB) $@
 
 $(MD_ERLLIB) : $(MD_ERLOBJECTS)
-	$(AR) -out:$@ $(MD_ERLOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(MD_ERLOBJECTS)
+	$(V_RANLIB) $@
 
 $(MDD_EILIB) : $(MDD_EIOBJECTS)
-	$(AR) -out:$@ $(MDD_EIOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(MDD_EIOBJECTS)
+	$(V_RANLIB) $@
 
 $(MDD_ERLLIB) : $(MDD_ERLOBJECTS)
-	$(AR) -out:$@ $(MDD_ERLOBJECTS)
-	$(RANLIB) $@
+	$(V_AR) -out:$@ $(MDD_ERLOBJECTS)
+	$(V_RANLIB) $@
 
 else
 
 # Unix archive creation
 
 $(ST_EILIB) : $(ST_EIOBJECTS)
-	rm -f $@
-	$(AR) rcv $@ $(ST_EIOBJECTS)
+	$(V_at)rm -f $@
+	$(V_AR) $(AR_FLAGS) $@ $(ST_EIOBJECTS)
 ifdef RANLIB
-	$(RANLIB) $@
+	$(V_RANLIB) $@
 endif
 
 $(ST_ERLLIB) : $(ST_ERLOBJECTS)
-	rm -f $@
-	$(AR) rcv $@ $(ST_ERLOBJECTS)
+	$(V_at)rm -f $@
+	$(V_AR) $(AR_FLAGS) $@ $(ST_ERLOBJECTS)
 ifdef RANLIB
-	$(RANLIB) $@
+	$(V_RANLIB) $@
 endif
 
 $(MT_EILIB) : $(MT_EIOBJECTS)
-	rm -f $@
-	$(AR) rcv $@ $(MT_EIOBJECTS)
+	$(V_at)rm -f $@
+	$(V_AR) $(AR_FLAGS) $@ $(MT_EIOBJECTS)
 ifdef RANLIB
-	$(RANLIB) $@
+	$(V_RANLIB) $@
 endif
 
 $(MT_ERLLIB) : $(MT_ERLOBJECTS)
-	rm -f $@
-	$(AR) rcv $@ $(MT_ERLOBJECTS)
+	$(V_at)rm -f $@
+	$(V_AR) $(AR_FLAGS) $@ $(MT_ERLOBJECTS)
 ifdef RANLIB
-	$(RANLIB) $@
+	$(V_RANLIB) $@
 endif
 
 endif
@@ -669,18 +679,18 @@ endif
 
 ifeq ($(TARGET),win32)
 $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MD_EILIB)
-	$(PURIFY) $(CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \
+	$(ld_verbose)$(PURIFY) $(CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \
 		-L$(OBJDIR) -lei_md $(THR_LIBS) $(LIBS) -lsocket
 else
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 $(ERL_CALL): $(ST_OBJDIR)/erl_call.o $(ST_OBJDIR)/erl_start.o ../include/ei.h $(ST_EILIB)
-	$(LD) -r -d -o $@ $(ST_OBJDIR)/erl_call.o $(ST_OBJDIR)/erl_start.o -L$(OBJDIR) -lei $(LIBS)
+	$(V_LD) -r -d -o $@ $(ST_OBJDIR)/erl_call.o $(ST_OBJDIR)/erl_start.o -L$(OBJDIR) -lei $(LIBS)
 
 $(ST_OBJDIR)/erl_call.o: prog/erl_call.c
-	$(CC) $(CFLAGS) -c $< -o $@ 
+	$(V_CC) $(CFLAGS) -c $< -o $@
 
 $(ST_OBJDIR)/erl_start.o: prog/erl_start.c
-	$(CC) $(CFLAGS) -c $< -o $@ 
+	$(V_CC) $(CFLAGS) -c $< -o $@
 
 else
 ifeq ($(findstring ose,$(TARGET)),ose)
@@ -688,11 +698,11 @@ $(ERL_CALL):
 else
 ifdef THR_DEFS
 $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
-	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \
+	$(ld_verbose)$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \
 		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
 else
 $(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
-	$(PURIFY) $(CC) $(PROG_CFLAGS) $(LDFLAGS) -o $@ $(ERLCALL) \
+	$(ld_verbose)$(PURIFY) $(CC) $(PROG_CFLAGS) $(LDFLAGS) -o $@ $(ERLCALL) \
 		-L$(OBJDIR) -lei $(LIBS)
 endif
 endif
@@ -707,36 +717,36 @@ check: $(FAKE_TARGETS)
 
 ifndef THR_DEFS
 $(ST_OBJDIR)/erl_fake_prog_st$(EXE): prog/erl_fake_prog.c $(ST_ERLLIB) $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lerl_interface -lei \
+	$(V_CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lerl_interface -lei \
 		$(LIBS)
 
 $(ST_OBJDIR)/ei_fake_prog_st$(EXE): prog/ei_fake_prog.c $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lei $(LIBS)
+	$(V_CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lei $(LIBS)
 
 $(ST_OBJDIR)/erl_fake_prog_cxx_st$(EXE): prog/erl_fake_prog.c \
 		$(ST_ERLLIB) $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) \
+	$(V_CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) \
 		-lerl_interface -lei $(LIBS)
 
 $(ST_OBJDIR)/ei_fake_prog_cxx_st$(EXE): prog/ei_fake_prog.c $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) -lei $(LIBS)
+	$(V_CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) -lei $(LIBS)
 
 else
 
 $(ST_OBJDIR)/erl_fake_prog_st$(EXE): prog/erl_fake_prog.c $(ST_ERLLIB) $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lerl_interface_st -lei_st \
+	$(V_CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lerl_interface_st -lei_st \
 		$(LIBS)
 
 $(ST_OBJDIR)/ei_fake_prog_st$(EXE): prog/ei_fake_prog.c $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lei_st $(LIBS)
+	$(V_CC) $(PROG_CFLAGS) -o $@ $< -L$(OBJDIR) -lei_st $(LIBS)
 
 $(ST_OBJDIR)/erl_fake_prog_cxx_st$(EXE): prog/erl_fake_prog.c \
 		$(ST_ERLLIB) $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) \
+	$(V_CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) \
 		-lerl_interface_st -lei_st $(LIBS)
 
 $(ST_OBJDIR)/ei_fake_prog_cxx_st$(EXE): prog/ei_fake_prog.c $(ST_EILIB)
-	$(CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) -lei_st $(LIBS)
+	$(V_CC) $(PROG_CFLAGS) -o $@ -xc++ $< -L$(OBJDIR) -lei_st $(LIBS)
 
 endif
 
@@ -744,63 +754,63 @@ endif
 
 $(MT_OBJDIR)/erl_fake_prog_mt$(EXE): prog/erl_fake_prog.c \
 		$(MT_ERLLIB) $(MT_EILIB)
-	$(CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< -L$(OBJDIR) \
+	$(V_CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< -L$(OBJDIR) \
 		-lerl_interface -lei $(THR_LIBS) $(LIBS)
 
 $(MT_OBJDIR)/ei_fake_prog_mt$(EXE): prog/ei_fake_prog.c $(MT_EILIB)
-	$(CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< \
+	$(V_CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< \
 		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
 
 $(MT_OBJDIR)/erl_fake_prog_mt_cxx$(EXE): prog/erl_fake_prog.c \
 		$(MT_ERLLIB) $(MT_EILIB)
-	$(CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
+	$(V_CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
 		-L$(OBJDIR) -lerl_interface -lei \
 		$(THR_LIBS) $(LIBS)
 
 $(MT_OBJDIR)/ei_fake_prog_mt_cxx$(EXE): prog/ei_fake_prog.c $(MT_EILIB)
-	$(CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
+	$(V_CC) $(MTFLAG) $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
 		-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
 
 ####
 
 $(MD_OBJDIR)/erl_fake_prog_md$(EXE): prog/erl_fake_prog.c \
 		$(MD_ERLLIB) $(MD_EILIB)
-	$(CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< -L$(OBJDIR) \
+	$(V_CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< -L$(OBJDIR) \
 		-lerl_interface_r -lei_r $(THR_LIBS) $(LIBS)
 
 $(MD_OBJDIR)/ei_fake_prog_md$(EXE): prog/ei_fake_prog.c $(MD_EILIB)
-	$(CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< \
+	$(V_CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< \
 		-L$(OBJDIR) -lei_r $(THR_LIBS) $(LIBS)
 
 $(MD_OBJDIR)/erl_fake_prog_md_cxx$(EXE): prog/erl_fake_prog.c \
 		$(MD_ERLLIB) $(MD_EILIB)
-	$(CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
+	$(V_CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
 		-L$(OBJDIR) -lerl_interface_r -lei_r \
 		$(THR_LIBS) $(LIBS)
 
 $(MD_OBJDIR)/ei_fake_prog_md_cxx$(EXE): prog/ei_fake_prog.c $(MD_EILIB)
-	$(CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
+	$(V_CC) -MD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
 		-L$(OBJDIR) -lei_r $(THR_LIBS) $(LIBS)
 
 ####
 
 $(MDD_OBJDIR)/erl_fake_prog_mdd$(EXE): prog/erl_fake_prog.c \
 		$(MDD_ERLLIB) $(MDD_EILIB)
-	$(CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< -L$(OBJDIR) \
+	$(V_CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< -L$(OBJDIR) \
 		-lerl_interface_r -lei_r $(THR_LIBS) $(LIBS)
 
 $(MDD_OBJDIR)/ei_fake_prog_mdd$(EXE): prog/ei_fake_prog.c $(MDD_EILIB)
-	$(CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< \
+	$(V_CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ $< \
 		-L$(OBJDIR) -lei_r $(THR_LIBS) $(LIBS)
 
 $(MDD_OBJDIR)/erl_fake_prog_mdd_cxx$(EXE): prog/erl_fake_prog.c \
 		$(MDD_ERLLIB) $(MDD_EILIB)
-	$(CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
+	$(V_CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
 		-L$(OBJDIR) -lerl_interface_r -lei_r \
 		$(THR_LIBS) $(LIBS)
 
 $(MDD_OBJDIR)/ei_fake_prog_mdd_cxx$(EXE): prog/ei_fake_prog.c $(MDD_EILIB)
-	$(CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
+	$(V_CC) -MDD $(PROG_CFLAGS) $(THR_DEFS) -o $@ -xc++ $< \
 		-L$(OBJDIR) -lei_r $(THR_LIBS) $(LIBS)
 
 ###########################################################################
@@ -808,9 +818,10 @@ $(MDD_OBJDIR)/ei_fake_prog_mdd_cxx$(EXE): prog/ei_fake_prog.c $(MDD_EILIB)
 ###########################################################################
 
 depend:
-	@echo "Generating dependency file depend.mk..."
+	$(gen_verbose)
+	$(V_colon)@echo "Generating dependency file depend.mk..."
 	@echo "# Generated dependency rules" > depend.mk;		\
-	$(CC) $(CFLAGS) -MM $(SOURCES) | 				\
+	$(V_CC) $(CFLAGS) -MM $(SOURCES) | 			\
 		sed 's&$(TARGET)&\$$\(TARGET\)&g' |			\
 		sed 's/^.*:/\$$\(ST_OBJDIR\)\/&/' >> depend.mk;		\
 	echo >> depend.mk;						\
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index bb44b78854..2c4b6e5541 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -204,15 +205,15 @@ test_ei_decode_misc(Config) when is_list(Config) ->
 
     ?line send_term_as_binary(P,foo),
     ?line send_term_as_binary(P,''),
-    ?line send_term_as_binary(P,'������'),
+    ?line send_term_as_binary(P,'ÅÄÖåäö'),
 
     ?line send_term_as_binary(P,"foo"),
     ?line send_term_as_binary(P,""),
-    ?line send_term_as_binary(P,"������"),
+    ?line send_term_as_binary(P,"ÅÄÖåäö"),
 
     ?line send_term_as_binary(P,<<"foo">>),
     ?line send_term_as_binary(P,<<>>),
-    ?line send_term_as_binary(P,<<"������">>),
+    ?line send_term_as_binary(P,<<"ÅÄÖåäö">>),
 
 %    ?line send_term_as_binary(P,{}),
 %    ?line send_term_as_binary(P,[]),
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index cefd33e5f6..537e9cb01c 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -213,19 +214,19 @@ test_ei_encode_misc(Config) when is_list(Config) ->
     ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
     ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
     ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,6,"������">>,'������'} = get_buf_and_term(P),
-    ?line {<<100,0,6,"������">>,'������'} = get_buf_and_term(P),
+    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
 
     ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
     ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
     ?line {<<106>>,""}                    = get_buf_and_term(P),
     ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<107,0,6,"������">>,"������"} = get_buf_and_term(P),
-    ?line {<<107,0,6,"������">>,"������"} = get_buf_and_term(P),
+    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
 
     ?line {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
     ?line {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
-    ?line {<<109,0,0,0,6,"������">>,<<"������">>} = get_buf_and_term(P),
+    ?line {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
 
     ?line {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
     ?line {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index 2a3ed81f53..6305302e28 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -136,7 +136,7 @@ lists(Config) when is_list(Config) ->
 
 %%    ?line {term, "[{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]"} = 
 %%	get_term(P),
-    %% kanske regexp i st�llet?
+    %% maybe regexp instead?
     ?line {term, "[{pi, 3.141500}, {'cos(70)', 0.342020}]"} = get_term(P),
     ?line {term, "[[pi, 3.141500], ['cos(70)', 0.342020]]"} = get_term(P),
 
diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
index c68a3f4efd..386169fe95 100644
--- a/lib/et/src/Makefile
+++ b/lib/et/src/Makefile
@@ -92,10 +92,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/et/src/et.erl b/lib/et/src/et.erl
index e2cd8564c3..c9ba4f6816 100644
--- a/lib/et/src/et.erl
+++ b/lib/et/src/et.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -102,7 +102,7 @@
 %% From        = actor()
 %% To          = actor()
 %% FromTo      = actor()
-%% Label       = atom() | string() |�term()
+%% Label       = atom() | string() | term()
 %% Contents    = [{Key, Value}] | term()
 %%
 %% actor()  = term()
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl
index fba840c3bd..8ebdb6ba16 100644
--- a/lib/eunit/include/eunit.hrl
+++ b/lib/eunit/include/eunit.hrl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -13,7 +14,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% Copyright (C) 2004-2006 Micka�l R�mond, Richard Carlsson
+%% Copyright (C) 2004-2006 Mickaël Rémond, Richard Carlsson
 
 %% Including this file turns on testing and defines TEST, unless NOTEST
 %% is defined before the file is included. If both NOTEST and TEST are
@@ -124,8 +125,8 @@
 -ifndef(UNDER_EUNIT).
 -define(UNDER_EUNIT,
 	(?MATCHES({current_function,{eunit_proc,_,_}},
-		  .erlang:process_info(.erlang:group_leader(),
-				       current_function)))).
+		  erlang:process_info(erlang:group_leader(),
+				      current_function)))).
 -endif.
 
 %% The plain assert macro should be defined to do nothing if this file
@@ -142,14 +143,14 @@
 	((fun () ->
 	    case (BoolExpr) of
 		true -> ok;
-		__V -> .erlang:error({assertion_failed,
-				      [{module, ?MODULE},
-				       {line, ?LINE},
-				       {expression, (??BoolExpr)},
-				       {expected, true},
-				       {value, case __V of false -> __V;
-						   _ -> {not_a_boolean,__V}
-					       end}]})
+		__V -> erlang:error({assertion_failed,
+				     [{module, ?MODULE},
+				      {line, ?LINE},
+				      {expression, (??BoolExpr)},
+				      {expected, true},
+				      {value, case __V of false -> __V;
+						  _ -> {not_a_boolean,__V}
+					      end}]})
 	    end
 	  end)())).
 -endif.
@@ -170,12 +171,12 @@
 	((fun () ->
 	    case (Expr) of
 		Guard -> ok;
-		__V -> .erlang:error({assertMatch_failed,
-				      [{module, ?MODULE},
-				       {line, ?LINE},
-				       {expression, (??Expr)},
-				       {pattern, (??Guard)},
-				       {value, __V}]})
+		__V -> erlang:error({assertMatch_failed,
+				     [{module, ?MODULE},
+				      {line, ?LINE},
+				      {expression, (??Expr)},
+				      {pattern, (??Guard)},
+				      {value, __V}]})
 	    end
 	  end)())).
 -endif.
@@ -189,12 +190,12 @@
 	((fun () ->
 	    __V = (Expr),
 	    case __V of
-		Guard -> .erlang:error({assertNotMatch_failed,
-					[{module, ?MODULE},
-					 {line, ?LINE},
-					 {expression, (??Expr)},
-					 {pattern, (??Guard)},
-					 {value, __V}]});
+		Guard -> erlang:error({assertNotMatch_failed,
+				       [{module, ?MODULE},
+					{line, ?LINE},
+					{expression, (??Expr)},
+					{pattern, (??Guard)},
+					{value, __V}]});
 		_ -> ok
 	    end
 	  end)())).
@@ -210,12 +211,12 @@
 	((fun (__X) ->
 	    case (Expr) of
 		__X -> ok;
-		__V -> .erlang:error({assertEqual_failed,
-				      [{module, ?MODULE},
-				       {line, ?LINE},
-				       {expression, (??Expr)},
-				       {expected, __X},
-				       {value, __V}]})
+		__V -> erlang:error({assertEqual_failed,
+				     [{module, ?MODULE},
+				      {line, ?LINE},
+				      {expression, (??Expr)},
+				      {expected, __X},
+				      {value, __V}]})
 	    end
 	  end)(Expect))).
 -endif.
@@ -228,11 +229,11 @@
 -define(assertNotEqual(Unexpected, Expr),
 	((fun (__X) ->
 	    case (Expr) of
-		__X -> .erlang:error({assertNotEqual_failed,
-				      [{module, ?MODULE},
-				       {line, ?LINE},
-				       {expression, (??Expr)},
-				       {value, __X}]});
+		__X -> erlang:error({assertNotEqual_failed,
+				     [{module, ?MODULE},
+				      {line, ?LINE},
+				      {expression, (??Expr)},
+				      {value, __X}]});
 		_ -> ok
 	    end
 	  end)(Unexpected))).
@@ -248,7 +249,7 @@
 -define(assertException(Class, Term, Expr),
 	((fun () ->
 	    try (Expr) of
-	        __V -> .erlang:error({assertException_failed,
+	        __V -> erlang:error({assertException_failed,
 				      [{module, ?MODULE},
 				       {line, ?LINE},
 				       {expression, (??Expr)},
@@ -259,16 +260,16 @@
 	    catch
 		Class:Term -> ok;
 	        __C:__T ->
-		    .erlang:error({assertException_failed,
-				   [{module, ?MODULE},
-				    {line, ?LINE},
-				    {expression, (??Expr)},
-				    {pattern,
-				     "{ "++(??Class)++" , "++(??Term)
-				     ++" , [...] }"},
-				    {unexpected_exception,
-				     {__C, __T,
-				      .erlang:get_stacktrace()}}]})
+		    erlang:error({assertException_failed,
+				  [{module, ?MODULE},
+				   {line, ?LINE},
+				   {expression, (??Expr)},
+				   {pattern,
+				    "{ "++(??Class)++" , "++(??Term)
+				    ++" , [...] }"},
+				   {unexpected_exception,
+				    {__C, __T,
+				     erlang:get_stacktrace()}}]})
 	    end
 	  end)())).
 -endif.
@@ -299,17 +300,17 @@
 			Class ->
 			    case __T of
 				Term ->
-				    .erlang:error({assertNotException_failed,
-						   [{module, ?MODULE},
-						    {line, ?LINE},
-						    {expression, (??Expr)},
-						    {pattern,
-						     "{ "++(??Class)++" , "
-						     ++(??Term)++" , [...] }"},
-						    {unexpected_exception,
-						     {__C, __T,
-						      .erlang:get_stacktrace()
-						     }}]});
+				    erlang:error({assertNotException_failed,
+						  [{module, ?MODULE},
+						   {line, ?LINE},
+						   {expression, (??Expr)},
+						   {pattern,
+						    "{ "++(??Class)++" , "
+						    ++(??Term)++" , [...] }"},
+						   {unexpected_exception,
+						    {__C, __T,
+						     erlang:get_stacktrace()
+						    }}]});
 				_ -> ok
 			    end;
 			_ -> ok
@@ -324,17 +325,17 @@
 %% require EUnit to be present at runtime, or at least eunit_lib.)
 
 %% these can be used for simply running commands in a controlled way
--define(_cmd_(Cmd), (.eunit_lib:command(Cmd))).
+-define(_cmd_(Cmd), (eunit_lib:command(Cmd))).
 -define(cmdStatus(N, Cmd),
 	((fun () ->
 	    case ?_cmd_(Cmd) of
 		{(N), __Out} -> __Out;
-		{__N, _} -> .erlang:error({command_failed,
-					   [{module, ?MODULE},
-					    {line, ?LINE},
-					    {command, (Cmd)},
-					    {expected_status,(N)},
-					    {status,__N}]})
+		{__N, _} -> erlang:error({command_failed,
+					  [{module, ?MODULE},
+					   {line, ?LINE},
+					   {command, (Cmd)},
+					   {expected_status,(N)},
+					   {status,__N}]})
 	    end
 	  end)())).
 -define(_cmdStatus(N, Cmd), ?_test(?cmdStatus(N, Cmd))).
@@ -350,12 +351,12 @@
  	((fun () ->
 	    case ?_cmd_(Cmd) of
 		{(N), _} -> ok;
-		{__N, _} -> .erlang:error({assertCmd_failed,
-					   [{module, ?MODULE},
-					    {line, ?LINE},
-					    {command, (Cmd)},
-					    {expected_status,(N)},
-					    {status,__N}]})
+		{__N, _} -> erlang:error({assertCmd_failed,
+					  [{module, ?MODULE},
+					   {line, ?LINE},
+					   {command, (Cmd)},
+					   {expected_status,(N)},
+					   {status,__N}]})
 	    end
 	  end)())).
 -endif.
@@ -368,12 +369,12 @@
  	((fun () ->
 	    case ?_cmd_(Cmd) of
 		{_, (T)} -> ok;
-		{_, __T} -> .erlang:error({assertCmdOutput_failed,
-					   [{module, ?MODULE},
-					    {line, ?LINE},
-					    {command,(Cmd)},
-					    {expected_output,(T)},
-					    {output,__T}]})
+		{_, __T} -> erlang:error({assertCmdOutput_failed,
+					  [{module, ?MODULE},
+					   {line, ?LINE},
+					   {command,(Cmd)},
+					   {expected_output,(T)},
+					   {output,__T}]})
 	    end
 	  end)())).
 -endif.
@@ -394,12 +395,12 @@
 -else.
 -define(debugMsg(S),
 	(begin
-	     .io:fwrite(user, <<"~s:~w:~w: ~s\n">>,
-                        [?FILE, ?LINE, self(), S]),
+	     io:fwrite(user, <<"~s:~w:~w: ~s\n">>,
+		       [?FILE, ?LINE, self(), S]),
 	     ok
 	 end)).
 -define(debugHere, (?debugMsg("<-"))).
--define(debugFmt(S, As), (?debugMsg(.io_lib:format((S), (As))))).
+-define(debugFmt(S, As), (?debugMsg(io_lib:format((S), (As))))).
 -define(debugVal(E),
 	((fun (__V) ->
 		  ?debugFmt(<<"~s = ~P">>, [(??E), __V, 15]),
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index 0a2e71cf7b..e88e28df83 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -104,10 +104,10 @@ $(OBJECTS): $(PARSE_TRANSFORM_BIN)
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index 51846d73b3..5763949519 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -13,8 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% @copyright 2004-2009 Micka�l R�mond, Richard Carlsson
-%% @author Micka�l R�mond <[email protected]>
+%% @copyright 2004-2009 Mickaël Rémond, Richard Carlsson
+%% @author Mickaël Rémond <[email protected]>
 %%   [http://www.process-one.net/]
 %% @author Richard Carlsson <[email protected]>
 %% @version {@version}, {@date} {@time}
diff --git a/lib/eunit/src/eunit_autoexport.erl b/lib/eunit/src/eunit_autoexport.erl
index 099bcb222e..36ae3b71d7 100644
--- a/lib/eunit/src/eunit_autoexport.erl
+++ b/lib/eunit/src/eunit_autoexport.erl
@@ -80,10 +80,9 @@ rewrite([F | Fs], As, Module, Test) ->
     rewrite(Fs, [F | As], Module, Test);
 rewrite([], As, Module, Test) ->
     {if Test ->
-	     EUnit = {record_field,0,{atom,0,''},{atom,0,eunit}},
 	     [{function,0,test,0,
 	       [{clause,0,[],[],
-		 [{call,0,{remote,0,EUnit,{atom,0,test}},
+		 [{call,0,{remote,0,{atom,0,eunit},{atom,0,test}},
 		   [{atom,0,Module}]}]}]}
 	      | As];
 	true ->
@@ -92,9 +91,7 @@ rewrite([], As, Module, Test) ->
      Test}.
 
 module_decl(Name, M, Fs, Exports) ->
-    Module = if is_atom(Name) -> Name;
-		true -> list_to_atom(packages:concat(Name))
-	     end,
+    Module = Name,
     {Fs1, Test} = rewrite(Fs, [], Module, true),
     Es = if Test -> [{test,0} | Exports];
 	    true -> Exports
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index ea9e944d7e..809cb7ab7b 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -13,8 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% @copyright 2004-2007 Micka�l R�mond, Richard Carlsson
-%% @author Micka�l R�mond <[email protected]>
+%% @copyright 2004-2007 Mickaël Rémond, Richard Carlsson
+%% @author Mickaël Rémond <[email protected]>
 %%   [http://www.process-one.net/]
 %% @author Richard Carlsson <[email protected]>
 %% @private
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index 46b8c8b503..cc021625d5 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -13,8 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% @author Micka�l R�mond <[email protected]>
-%% @copyright 2009 Micka�l R�mond, Paul Guyot
+%% @author Mickaël Rémond <[email protected]>
+%% @copyright 2009 Mickaël Rémond, Paul Guyot
 %% @see eunit
 %% @doc Surefire reports for EUnit (Format used by Maven and Atlassian
 %% Bamboo for example to integrate test results). Based on initial code
diff --git a/lib/gs/contribs/bonk/Makefile b/lib/gs/contribs/bonk/Makefile
index a630deaf24..d160ca8b73 100644
--- a/lib/gs/contribs/bonk/Makefile
+++ b/lib/gs/contribs/bonk/Makefile
@@ -81,12 +81,12 @@ clean:
 # ----------------------------------------------------
 
 $(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	rm -f $@
-	cp $(TOOLNAME).gif $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).gif $@
 
 $(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	rm -f $@
-	cp $(TOOLNAME).tool $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).tool $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/gs/contribs/cols/Makefile b/lib/gs/contribs/cols/Makefile
index 3af91e1dae..3036e9565e 100644
--- a/lib/gs/contribs/cols/Makefile
+++ b/lib/gs/contribs/cols/Makefile
@@ -74,16 +74,16 @@ clean:
 # ----------------------------------------------------
 
 $(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	rm -f $@
-	cp $(TOOLNAME).gif $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).gif $@
 
 $(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	rm -f $@
-	cp $(TOOLNAME).tool $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).tool $@
 
 $(EBIN)/help.gif: help.gif
-	rm -f $@
-	cp help.gif $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp help.gif $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/gs/contribs/mandel/Makefile b/lib/gs/contribs/mandel/Makefile
index 5f0b047955..308ba0cbb0 100644
--- a/lib/gs/contribs/mandel/Makefile
+++ b/lib/gs/contribs/mandel/Makefile
@@ -73,16 +73,16 @@ clean:
 # ----------------------------------------------------
 
 $(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	rm -f $@
-	cp $(TOOLNAME).gif $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).gif $@
 
 $(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	rm -f $@
-	cp $(TOOLNAME).tool $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).tool $@
 
 $(EBIN)/help.gif: help.gif
-	rm -f $@
-	cp help.gif $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp help.gif $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/gs/contribs/mandel/mandel.erl b/lib/gs/contribs/mandel/mandel.erl
index 8ecd649532..a7a786ce98 100644
--- a/lib/gs/contribs/mandel/mandel.erl
+++ b/lib/gs/contribs/mandel/mandel.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -34,7 +35,7 @@
 %%%-----------------------------------------------------------------
 %%% Distributed Mandelbrot program.
 %%% Originally written i C++/rpc/lwp/interviews by Klas Eriksson.(1200 lines)
-%%% Rewritten in Erlang by Klas Eriksson and Martin Bj�rklund.
+%%% Rewritten in Erlang by Klas Eriksson and Martin Björklund.
 %%%-----------------------------------------------------------------
 
 %% unix>erl -sname foo            (all nodes will get the same name)
diff --git a/lib/gs/contribs/othello/Makefile b/lib/gs/contribs/othello/Makefile
index 5f37d164f5..f9d131c315 100644
--- a/lib/gs/contribs/othello/Makefile
+++ b/lib/gs/contribs/othello/Makefile
@@ -76,12 +76,12 @@ clean:
 # ----------------------------------------------------
 
 $(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	rm -f $@
-	cp $(TOOLNAME).gif $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).gif $@
 
 $(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	rm -f $@
-	cp $(TOOLNAME).tool $@
+	$(gen_verbose)rm -f $@
+	$(V_at)cp $(TOOLNAME).tool $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
index 4b7a4523b9..0a63d5466e 100644
--- a/lib/gs/src/Makefile
+++ b/lib/gs/src/Makefile
@@ -91,13 +91,13 @@ clean:
 # ----------------------------------------------------
 
 gstk_generic.hrl: gs_make.erl ../ebin/gs_make.$(EMULATOR) ../ebin/gs.$(EMULATOR)
-	$(ERL) -pa $(EBIN) -s gs_make -s erlang halt -noshell
+	$(gen_verbose)$(ERL) -pa $(EBIN) -s gs_make -s erlang halt -noshell
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(GSTK_GENERIC_TARGET): gstk_generic.hrl
 
diff --git a/lib/gs/src/gstk_editor.erl b/lib/gs/src/gstk_editor.erl
index e918d93147..cb422aef95 100644
--- a/lib/gs/src/gstk_editor.erl
+++ b/lib/gs/src/gstk_editor.erl
@@ -90,9 +90,9 @@
 %%	type
 %%
 
-%.t tag names 2.7 -> red blue (blue �r f�rgen)
-%.t tag add blue 2.1 2.10    tagga text
-%.t tag configure blue -foregr blue skapa tag
+%.t tag names 2.7 -> red blue (blue is the colour)
+%.t tag add blue 2.1 2.10    tag the text
+%.t tag configure blue -foregr blue create tag
 % .t index end -> MaxRows.cols
 % .t yview moveto (Row-1)/MaxRows
 
diff --git a/lib/hipe/Makefile b/lib/hipe/Makefile
index 2294f98158..a9e24f4d17 100644
--- a/lib/hipe/Makefile
+++ b/lib/hipe/Makefile
@@ -57,20 +57,20 @@ edocs:
 	fi
 
 all-subdirs:
-	for dir in $(SUB_DIRECTORIES); do \
+	$(V_at)for dir in $(SUB_DIRECTORIES); do \
 		(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=$(EBIN); cd ..); \
 	done
 
 # distclean and realclean should clean the bootstrap files
 all-subdirs-x:
-	for dir in $(SUB_DIRECTORIES); do \
+	$(V_at)for dir in $(SUB_DIRECTORIES); do \
 		(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=../boot_ebin; cd ..); \
 	done
 
 clean:
-	$(MAKE) MAKETARGET="clean" all-subdirs all-subdirs-x
+	$(V_at)$(MAKE) MAKETARGET="clean" all-subdirs all-subdirs-x
 distclean:
-	$(MAKE) MAKETARGET="distclean" all-subdirs all-subdirs-x
+	$(V_at)$(MAKE) MAKETARGET="distclean" all-subdirs all-subdirs-x
 realclean:
-	$(MAKE) MAKETARGET="realclean" all-subdirs all-subdirs-x
+	$(V_at)$(MAKE) MAKETARGET="realclean" all-subdirs all-subdirs-x
 
diff --git a/lib/hipe/amd64/hipe_amd64_encode.erl b/lib/hipe/amd64/hipe_amd64_encode.erl
index ee68dfb3b8..cbdab25b25 100644
--- a/lib/hipe/amd64/hipe_amd64_encode.erl
+++ b/lib/hipe/amd64/hipe_amd64_encode.erl
@@ -1,7 +1,7 @@
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%% 
 %%% The contents of this file are subject to the Erlang Public License,
 %%% Version 1.1, (the "License"); you may not use this file except in
@@ -373,16 +373,16 @@ sse2_arith_binop_encode(Prefix, Opcode, {{xmm, XMM64}, {rm64fp, RM64}}) ->
     [Prefix, 16#0F, Opcode | encode_rm(RM64, XMM64, [])].
 
 sse2_cvtsi2sd_encode({{xmm,XMM64}, {rm64,RM64}}) ->
-    [rex([{w, 1}]), 16#F2, 16#0F, 16#2A�| encode_rm(RM64, XMM64, [])].
+    [rex([{w, 1}]), 16#F2, 16#0F, 16#2A | encode_rm(RM64, XMM64, [])].
 
 sse2_mov_encode(Opnds) ->
     case Opnds of
         {{xmm, XMM64}, {rm64fp, RM64}} -> % movsd
-            [16#F2, 16#0F, 16#10�| encode_rm(RM64, XMM64, [])];
+            [16#F2, 16#0F, 16#10 | encode_rm(RM64, XMM64, [])];
         {{rm64fp, RM64}, {xmm, XMM64}} -> % movsd
-            [16#F2, 16#0F, 16#11�| encode_rm(RM64, XMM64, [])]
+            [16#F2, 16#0F, 16#11 | encode_rm(RM64, XMM64, [])]
 %        {{xmm, XMM64}, {rm64, RM64}} -> % cvtsi2sd
-%            [rex([{w, 1}]), 16#F2, 16#0F, 16#2A�| encode_rm(RM64, XMM64, [])]
+%            [rex([{w, 1}]), 16#F2, 16#0F, 16#2A | encode_rm(RM64, XMM64, [])]
     end.
 
 %% arith_binop_sizeof(Opnds) ->
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 98d65abba1..d93ad10bd4 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -765,7 +765,6 @@ type(erlang, node, 0, _) -> t_node();
 %% Guard bif, needs to be here.
 type(erlang, node, 1, Xs) ->
   strict(arg_types(erlang, node, 1), Xs, fun (_) -> t_node() end);
-type(erlang, nodes, 0, _) -> t_list(t_node());
 %% Guard bif, needs to be here.
 type(erlang, round, 1, Xs) ->
   strict(arg_types(erlang, round, 1), Xs, fun (_) -> t_integer() end);
@@ -2250,8 +2249,6 @@ arg_types(erlang, node, 0) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, node, 1) ->
   [t_identifier()];
-arg_types(erlang, nodes, 0) ->
-  [];
 %% Guard bif, needs to be here.
 arg_types(erlang, round, 1) ->
   [t_number()];
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index bc7ea17077..ea1e7b1292 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -3432,7 +3432,7 @@ record_field_diffs_to_string(?tuple([_|Fs], Arity, Tag), RecDict) ->
 
 field_diffs([F|Fs], [{FName, DefType}|FDefs], RecDict, Acc) ->
   NewAcc =
-    case t_is_subtype(F, DefType) of
+    case not t_is_none(t_inf(F, DefType)) of
       true -> Acc;
       false ->
 	Str = atom_to_string(FName) ++ "::" ++ t_to_string(DefType, RecDict),
@@ -3566,7 +3566,7 @@ t_from_form({type, _L, function, []}, _TypeNames, _InOpaque, _RecDict,
 t_from_form({type, _L, 'fun', []}, _TypeNames, _InOpaque, _RecDict,
             _VarDict) ->
   {t_fun(), []};
-t_from_form({type, _L, 'fun', [{type, _, any, []}, Range]}, TypeNames,
+t_from_form({type, _L, 'fun', [{type, _, any}, Range]}, TypeNames,
             InOpaque, RecDict, VarDict) ->
   {T, R} = t_from_form(Range, TypeNames, InOpaque, RecDict, VarDict),
   {t_fun(T), R};
@@ -3909,7 +3909,7 @@ t_form_to_string({type, _L, binary, [Base, Unit]} = Type) ->
     _ -> io_lib:format("Badly formed bitstr type ~w", [Type])
   end;
 t_form_to_string({type, _L, 'fun', []}) -> "fun()";
-t_form_to_string({type, _L, 'fun', [{type, _, any, []}, Range]}) -> 
+t_form_to_string({type, _L, 'fun', [{type, _, any}, Range]}) -> 
   "fun(...) -> " ++ t_form_to_string(Range);
 t_form_to_string({type, _L, 'fun', [{type, _, product, Domain}, Range]}) ->
   "fun((" ++ string:join(t_form_to_string_list(Domain), ",") ++ ") -> "
diff --git a/lib/hipe/flow/hipe_dominators.erl b/lib/hipe/flow/hipe_dominators.erl
index 17357461a5..1f2c830eaf 100644
--- a/lib/hipe/flow/hipe_dominators.erl
+++ b/lib/hipe/flow/hipe_dominators.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
 %% The 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 @@
 %%
 %%------------------------------------------------------------------------
 %% File    : hipe_dominators.erl
-%% Author  : Christoffer Vikstr�m <[email protected]>
+%% Author  : Christoffer Vikström <[email protected]>
 %%           Daniel Deogun        <[email protected]>
 %%           Jesper Bengtsson     <[email protected]>
 %% Created : 18 Mar 2002
diff --git a/lib/hipe/icode/hipe_icode_mulret.erl b/lib/hipe/icode/hipe_icode_mulret.erl
index a3cae621ab..0bf9f89994 100644
--- a/lib/hipe/icode/hipe_icode_mulret.erl
+++ b/lib/hipe/icode/hipe_icode_mulret.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The 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,9 @@
 %%
 %%----------------------------------------------------------------------
 %% File    : hipe_icode_mulret.erl
-%% Author  : Christoffer Vikstr�m <[email protected]>
+%% Author  : Christoffer Vikström <[email protected]>
 %% Purpose : 
-%% Created : 23 Jun 2004 by Christoffer Vikstr�m <[email protected]>
+%% Created : 23 Jun 2004 by Christoffer Vikström <[email protected]>
 %%----------------------------------------------------------------------
 
 -module(hipe_icode_mulret).
@@ -890,7 +890,7 @@ removeUnElems([I|Code], [OldVar] = OldVars, DstLst, Res, Def, Lab)  ->
 	      %%			  [I|Res], Def, Lab)
 	      %% end;
 	    false ->
-	      io:format("Borde aldrig kunna hamna h�r!", []),
+	      io:format("Borde aldrig kunna hamna här!", []),
 	      removeUnElems(Code, OldVars, DstLst, [I|Res], Def, Lab)
 	  end
       end;
@@ -1159,8 +1159,8 @@ printCallList([]) -> io:format("~n").
 %% %  Purpose   : 
 %% %  Arguments : 
 %% %  Return    : 
-%% %  Notes     : Fixa s� att funktionen anv�nder defines(I) ist�llet och 
-%% %              selektorer ist�llet f�r att matcha p� #call{}. L�tt gjort.  
+%% %  Notes     : Fixa så att funktionen använder defines(I) istället och
+%% %              selektorer istället för att matcha på #call{}. Lätt gjort.
 %% %%>----------------------------------------------------------------------<
 %% removeUnElems(List, Var) -> removeUnElems(List, Var, []).
 %% removeUnElems([#icode_call{'fun'={unsafe_element,_}, args=Var}|List], Var, Res) ->
diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
index 673431a175..66e4c3e39a 100644
--- a/lib/hipe/main/Makefile
+++ b/lib/hipe/main/Makefile
@@ -76,7 +76,7 @@ ERL_COMPILE_FLAGS += +nowarn_shadow_vars +warn_missing_spec +warn_untyped_record
 # ----------------------------------------------------
 
 hipe.hrl: ../vsn.mk hipe.hrl.src
-	sed -e "s;%VSN%;$(HIPE_VSN);" ../../hipe/main/hipe.hrl.src > ../../hipe/main/hipe.hrl
+	$(vsn_verbose)sed -e "s;%VSN%;$(HIPE_VSN);" ../../hipe/main/hipe.hrl.src > ../../hipe/main/hipe.hrl
 
 $(EBIN)/hipe.beam: hipe.hrl ../../compiler/src/beam_disasm.hrl
 $(EBIN)/hipe_main.beam: hipe.hrl ../icode/hipe_icode.hrl #../rtl/hipe_rtl.hrl
@@ -97,17 +97,17 @@ distclean: clean
 realclean: clean
 
 $(DOCS)/%.html:%.erl
-	erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
+	$(gen_verbose)erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
 
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/hipe/regalloc/hipe_coalescing_regalloc.erl b/lib/hipe/regalloc/hipe_coalescing_regalloc.erl
index 5a4b017c71..7169dd18f3 100644
--- a/lib/hipe/regalloc/hipe_coalescing_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_coalescing_regalloc.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The 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,8 @@
 %%-----------------------------------------------------------------------
 %% File    : hipe_coalescing_regalloc.erl
 %% Authors : Andreas Wallin <[email protected]>
-%%           Thorild Sel�n <[email protected]>
-%%           Ingemar �berg <[email protected]>
+%%           Thorild Selén <[email protected]>
+%%           Ingemar Åberg <[email protected]>
 %% Purpose : Play paintball with registers on a target machine.  We win
 %%           if they are all colored.  This is an iterated coalescing
 %%           register allocator.
diff --git a/lib/hipe/regalloc/hipe_optimistic_regalloc.erl b/lib/hipe/regalloc/hipe_optimistic_regalloc.erl
index 183ec1994c..fc3718cbc0 100644
--- a/lib/hipe/regalloc/hipe_optimistic_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_optimistic_regalloc.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1657,9 +1657,9 @@ findPrimitiveNodes(Node, N, Alias, PrimitiveNodes) ->
 %  %?debug_msg("Node ~p~n", [Node]),
 %  NextNode = Node - 1,
 %  Coalesced_to = hipe_reg_worklists:member_coalesced_to(NextNode, Worklists),
-%  ?debug_msg("��-- member coalesced: ~p~n", [Coalesced_to]),
+%  ?debug_msg("³³-- member coalesced: ~p~n", [Coalesced_to]),
 %  {Primitives, Alias1} = undoCoalescing(NextNode, No_temporaries, Alias),
-%  ?debug_msg("��-- primitivenodes ~w\n", [Primitives]),
+%  ?debug_msg("½½-- primitivenodes ~w\n", [Primitives]),
 %  case (Coalesced_to) of
 %    true -> printAlias(Alias1);
 %    _ -> true
@@ -1683,9 +1683,9 @@ findPrimitiveNodes(Node, N, Alias, PrimitiveNodes) ->
 fixAdj(N, SavedAdj, IG, Target) ->
   %Saved = hipe_vectors:get(SavedAdj, N),
   Saved = hipe_adj_list:edges(N, SavedAdj),
-  ?debug_msg("��--adj to ~p: ~p~n", [N, Saved]),
+  ?debug_msg("§§--adj to ~p: ~p~n", [N, Saved]),
   Adj = hipe_ig:node_adj_list(N, IG),
-  ?debug_msg("��--adj to ~p: ~p~n", [N, Adj]),
+  ?debug_msg("««--adj to ~p: ~p~n", [N, Adj]),
   New = findNew(Adj, Saved),
   ?debug_msg("++--new adj to ~p: ~p~n", [N, New]),
   removeAdj(New, N, IG, Target),
diff --git a/lib/hipe/regalloc/hipe_reg_worklists.erl b/lib/hipe/regalloc/hipe_reg_worklists.erl
index 67a5788c7c..e22cc8dc07 100644
--- a/lib/hipe/regalloc/hipe_reg_worklists.erl
+++ b/lib/hipe/regalloc/hipe_reg_worklists.erl
@@ -1,8 +1,8 @@
-%%% -*- erlang-indent-level: 2 -*-
+%%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %%% 
 %%% The 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 @@
 %%%----------------------------------------------------------------------
 
 -module(hipe_reg_worklists).
--author(['Andreas Wallin',  'Thorild Sel�n']).
+-author(['Andreas Wallin',  'Thorild Selén']).
 -export([new/5,			% only used by optimistic allocator
          new/6,
 	 simplify/1,
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index 426d1bd3ee..7852a2172b 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -134,13 +134,13 @@ HIPE_MKLITERALS=$(ERL_TOP)/bin/$(TARGET)/hipe_mkliterals$(TYPE_STR)$(FLAVOR_STR)
 
 
 hipe_literals.hrl: $(HIPE_MKLITERALS)
-	$(HIPE_MKLITERALS) $(MKLIT_FLAGS) -e > hipe_literals.hrl
+	$(gen_verbose)$(HIPE_MKLITERALS) $(MKLIT_FLAGS) -e > hipe_literals.hrl
 
 # Need to generate hipe.hrl from one and only one target in one and only
 # one makefile; otherwise, clearmake will force rebuilds of hipe over and
 # over again.
 ../main/hipe.hrl: ../vsn.mk ../main/hipe.hrl.src
-	(cd ../main && $(MAKE) hipe.hrl)
+	$(V_at)(cd ../main && $(MAKE) hipe.hrl)
 
 # 2012-02-24. Please keep these dependencies up to date. They tend to rot.
 # grep ^-include *.erl says a lot, but you need to dig further, e.g:
diff --git a/lib/hipe/rtl/hipe_rtl_arith.inc b/lib/hipe/rtl/hipe_rtl_arith.inc
index e608506234..7b587e882d 100644
--- a/lib/hipe/rtl/hipe_rtl_arith.inc
+++ b/lib/hipe/rtl/hipe_rtl_arith.inc
@@ -1,9 +1,9 @@
 %% -*- Erlang -*-
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %% 
 %% The 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 @@ eval_alu(Op, Arg1, Arg2)
 eval_alu(Op, Arg1, Arg2) ->
   ?EXIT({argument_overflow,Op,Arg1,Arg2}).
 
-%% Bj�rn & Bjarni:
+%% Björn & Bjarni:
 %% We need to be able to do evaluations based only on the bits, since
 %% there are cases where we can evaluate a subset of the bits, but can
 %% not do a full eval-alub call (eg. a + 0 gives no carry)
diff --git a/lib/hipe/rtl/hipe_rtl_mk_switch.erl b/lib/hipe/rtl/hipe_rtl_mk_switch.erl
index e5175217d6..d859c50b7d 100644
--- a/lib/hipe/rtl/hipe_rtl_mk_switch.erl
+++ b/lib/hipe/rtl/hipe_rtl_mk_switch.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The 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 @@
 %%  History  :	* 2001-02-28 Erik Johansson ([email protected]): 
 %%                Created.
 %%              * 2001-04-01 Erik Trulsson ([email protected]):
-%%                           Stefan Lindstr�m ([email protected]):
+%%                           Stefan Lindström ([email protected]):
 %%                Added clustering and inlined binary search trees.
 %%              * 2001-07-30 EJ ([email protected]):
 %%                Fixed some bugs and started cleanup.
diff --git a/lib/hipe/rtl/hipe_rtl_primops.erl b/lib/hipe/rtl/hipe_rtl_primops.erl
index 53aaa72aa6..d9d08356ce 100644
--- a/lib/hipe/rtl/hipe_rtl_primops.erl
+++ b/lib/hipe/rtl/hipe_rtl_primops.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -738,7 +738,7 @@ gen_mkfun([Dst], {_Mod, _FunId, _Arity} = MFidA, MagicNr, Index, FreeVars) ->
 
   %%  Tag the thing and increase the heap_pointer.
   %%    make_fun(funp);
-  WordSize�= hipe_rtl_arch:word_size(),
+  WordSize = hipe_rtl_arch:word_size(),
   HeapNeed = (?ERL_FUN_SIZE + NumFree) * WordSize,
   TagCode = [hipe_tagscheme:tag_fun(Dst, HP), 
 	     %%  AdjustHPCode 
@@ -829,7 +829,7 @@ load_struct_field(Dest, StructP, Offset, int32) ->
 
 gen_free_vars(Vars, HPReg) ->
   HPVar = hipe_rtl:mk_new_var(),
-  WordSize�= hipe_rtl_arch:word_size(),
+  WordSize = hipe_rtl_arch:word_size(),
   [hipe_rtl:mk_alu(HPVar, HPReg, add, hipe_rtl:mk_imm(?EFT_ENV)) |
    gen_free_vars(Vars, HPVar, 0, WordSize, [])].
 
diff --git a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
index 194cf29b64..1c900d767e 100644
--- a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -190,7 +190,7 @@ set_to(Dst, Val, Env) ->
 %% Returns   : { FlowWorkList, SSAWorkList, NewEnvironment}
 %%-----------------------------------------------------------------------------
 
-visit_branch(Inst, Env) -> %% Titta ocks� p� exekverbarflagga
+visit_branch(Inst, Env) -> %% Titta också på exekverbarflagga
   Val1 = lookup_lattice_value(hipe_rtl:branch_src1(Inst), Env),
   Val2 = lookup_lattice_value(hipe_rtl:branch_src2(Inst), Env),
   CFGWL = case evaluate_relop(Val1, hipe_rtl:branch_cond(Inst), Val2) of
diff --git a/lib/hipe/rtl/hipe_rtl_ssapre.erl b/lib/hipe/rtl/hipe_rtl_ssapre.erl
index a9e92e5688..34897ba4b7 100644
--- a/lib/hipe/rtl/hipe_rtl_ssapre.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssapre.erl
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The 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 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% File        : hipe_rtl_ssapre.erl
-%% Author      : He Bingwen and Fr�d�ric Haziza
+%% Author      : He Bingwen and Frédéric Haziza
 %% Description : Performs Partial Redundancy Elimination on SSA form.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% @doc
@@ -552,7 +552,7 @@ emend_with_processed_xsis(E, [I|Rest], Pred, XsiGraph) ->
  	    true -> %% It's a computation of E!
  	      case xsi_arg(Xsi,Pred) of
  		undetermined_operand ->
- 		  exit({?MODULE,check_operand_sharing,"######## �h Dear, we trusted Kostis !!!!!!!!! #############"});
+                  exit({?MODULE,check_operand_sharing,"######## Ôh Dear, we trusted Kostis !!!!!!!!! #############"});
  		XsiOp ->
  		  {sharing_operand,XsiOp} %% They share operands
  	      end;
@@ -571,7 +571,7 @@ emend_with_processed_xsis(E, [I|Rest], Pred, XsiGraph) ->
               NewE = emend(E,Def,A#eop.var),
   	      emend_with_processed_xsis(NewE,Rest,Pred,XsiGraph);
             undetermined_operand ->
- 	      exit({?MODULE,emend_with_processed_xsis,"######## �h Dear, we trusted Kostis, again !!!!!!!!! #############"});
+              exit({?MODULE,emend_with_processed_xsis,"######## Ôh Dear, we trusted Kostis, again !!!!!!!!! #############"});
  	    XsiOp ->
  	      NewE = emend(E,Def,XsiOp),
  	      emend_with_processed_xsis(NewE,Rest,Pred,XsiGraph)
diff --git a/lib/hipe/ssa/hipe_ssa.inc b/lib/hipe/ssa/hipe_ssa.inc
index d15b5ddd56..e766a83c41 100644
--- a/lib/hipe/ssa/hipe_ssa.inc
+++ b/lib/hipe/ssa/hipe_ssa.inc
@@ -1,8 +1,8 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %% 
 %% The 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 @@
 %%
 %%----------------------------------------------------------------------
 %% File    : hipe_ssa.inc
-%% Authors : Christoffer Vikstr�m, Daniel Deogun, and Jesper Bengtsson
+%% Authors : Christoffer Vikström, Daniel Deogun, and Jesper Bengtsson
 %% Created : March 2002
 %% Purpose : Provides code which converts the code of a CFG into SSA
 %%           (Static Single Assignment) form and back.
diff --git a/lib/hipe/x86/hipe_x86_assemble.erl b/lib/hipe/x86/hipe_x86_assemble.erl
index 4e65736db3..7878c7219d 100644
--- a/lib/hipe/x86/hipe_x86_assemble.erl
+++ b/lib/hipe/x86/hipe_x86_assemble.erl
@@ -2,7 +2,7 @@
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %%% 
 %%% The contents of this file are subject to the Erlang Public License,
 %%% Version 1.1, (the "License"); you may not use this file except in
@@ -698,7 +698,7 @@ mem_to_ea_common(#x86_mem{base=#x86_temp{reg=Base}, off=#x86_imm{value=Off}}) ->
 
 %% jmp_switch
 -ifdef(HIPE_AMD64).
-resolve_jmp_switch_arg(I,�_Context) ->
+resolve_jmp_switch_arg(I, _Context) ->
   Base = hipe_x86:temp_reg(hipe_x86:jmp_switch_jtab(I)),
   Index = hipe_x86:temp_reg(hipe_x86:jmp_switch_temp(I)),
   SINDEX = hipe_amd64_encode:sindex(3, Index),
diff --git a/lib/hipe/x86/hipe_x86_postpass.erl b/lib/hipe/x86/hipe_x86_postpass.erl
index 34e3d7a11b..c0918c4f89 100644
--- a/lib/hipe/x86/hipe_x86_postpass.erl
+++ b/lib/hipe/x86/hipe_x86_postpass.erl
@@ -1,8 +1,8 @@
-%%% -*- erlang-indent-level: 2 -*-
+%%% -*- coding: utf-8; erlang-indent-level: 2 -*-
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%% 
 %%% The 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,9 @@
 %%%
 %%%----------------------------------------------------------------------
 %%% File    : hipe_x86_postpass.erl
-%%% Author  : Christoffer Vikstr�m <[email protected]>
+%%% Author  : Christoffer Vikström <[email protected]>
 %%% Purpose : Contain postpass optimisations for x86-assembler code.
-%%% Created : 5 Aug 2003 by Christoffer Vikstr�m <[email protected]>
+%%% Created : 5 Aug 2003 by Christoffer Vikström <[email protected]>
 %%%----------------------------------------------------------------------
 
 -ifndef(HIPE_X86_POSTPASS).
diff --git a/lib/hipe/x86/hipe_x86_ra_postconditions.erl b/lib/hipe/x86/hipe_x86_ra_postconditions.erl
index 0b70764daf..6d7e90df43 100644
--- a/lib/hipe/x86/hipe_x86_ra_postconditions.erl
+++ b/lib/hipe/x86/hipe_x86_ra_postconditions.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -224,7 +224,7 @@ do_byte_move(Src0, Dst0, TempMap, Strategy) ->
 
 do_move64(I, TempMap, Strategy) ->
   #move64{dst=Dst} = I,
-  case�is_spilled(Dst, TempMap) of
+  case is_spilled(Dst, TempMap) of
     false ->
       {[I], false};
     true ->
diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
index de46eadb3b..856823b1b3 100644
--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
@@ -67,7 +67,11 @@ ifeq ($(findstring solaris,$(HOST_OS)),solaris)
 SKIP_BUILDING_BINARIES := true
 endif
 else
+ifeq ($(V),0)
+AR_OUT = rc
+else
 AR_OUT = rcv
+endif
 CC_FLAGS = @DED_CFLAGS@
 LIBRARY = $(LIBDIR)/libic.a
 SKIP_BUILDING_BINARIES := false
@@ -128,11 +132,13 @@ docs:
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
 $(LIBRARY): $(OBJ_FILES) 
-	-$(AR) $(AR_OUT) $@ $(OBJ_FILES) 
+	$(ar_verbose)
+	-$(AR) $(AR_OUT) $@ $(OBJ_FILES)
+	$(ranlib_verbose)
 	-$(RANLIB) $@
 
 $(OBJDIR)/%.o: %.c
-	$(CC) $(CC_FLAGS) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_CC) $(CC_FLAGS) -c -o $@ $(ALL_CFLAGS) $<
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile
index d18f81fec9..53e647e793 100644
--- a/lib/ic/examples/pre_post_condition/Makefile
+++ b/lib/ic/examples/pre_post_condition/Makefile
@@ -109,9 +109,9 @@ test: $(TEST_TARGET_FILES)
 
 
 IDL-GENERATED: ex.idl
-	erlc $(ERL_LOCAL_FLAGS) +'{precond,{tracer,pre}}' \
+	$(gen_verbose)erlc $(ERL_LOCAL_FLAGS) +'{precond,{tracer,pre}}' \
 		+'{{postcond,"m::i::f"},{tracer,post}}' ex.idl
-	>IDL-GENERATED
+	$(V_at)>IDL-GENERATED
 
 $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES): IDL-GENERATED
 
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
index cf4c353f3f..273614e8d9 100644
--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
@@ -85,7 +85,10 @@ JAR= jar
 
 JAVADOCFLAGS=-d $(DOCDIR)
 JAVAFLAGS=-d $(JAVA_DEST_ROOT) 
-JARFLAGS= -cvf
+JARFLAGS= -cf
+ifneq ($(V),0)
+JARFLAGS= -cfv
+endif
 
 JAVA_OPTIONS = 
 
diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
index 280d86a8a4..e8769d2335 100644
--- a/lib/ic/src/Makefile
+++ b/lib/ic/src/Makefile
@@ -175,7 +175,7 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
@@ -183,7 +183,7 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 ../ebin/icparse.beam: icparse.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) +nowarn_unused_vars +nowarn_unused_function -o$(EBIN) +pj $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) +nowarn_unused_vars +nowarn_unused_function -o$(EBIN) +pj $<
 
 icparse.erl: icparse.yrl icyeccpre.hrl
 
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
index 3143ab427b..a2440adc92 100644
--- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
@@ -86,15 +86,15 @@ clean:
 		java_erl_test.built_erl java_erl_test.built_java
 
 java_erl_test.built_java: java_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,java}" java_erl_test.idl
-	echo done > java_erl_test.built_java
+	$(gen_verbose)$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,java}" java_erl_test.idl
+	$(V_at)echo done > java_erl_test.built_java
 
 $(CLASS_FILES) : $(JAVA_FILES)
-	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
+	$(V_JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
 
 java_erl_test.built_erl: java_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" java_erl_test.idl
-	echo done > java_erl_test.built_erl
+	$(gen_verbose)$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" java_erl_test.idl
+	$(V_at)echo done > java_erl_test.built_erl
 
 .erl.@EMULATOR@:
-	$(ERLC) -I $(IC_INCLUDE_PATH) $<
+	$(V_ERLC) -I $(IC_INCLUDE_PATH) $<
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index bd31ae42d2..d9e8587bbf 100644
--- a/lib/inets/doc/src/http_uri.xml
+++ b/lib/inets/doc/src/http_uri.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2012</year><year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -55,7 +55,8 @@ string()  = list of ASCII characters
     <p>For more information about URI, see RFC 3986. </p>
 
     <code type="none"><![CDATA[
-uri()       = string() - Syntax according to the URI definition in rfc 3986, ex: "http://www.erlang.org/"
+uri()       = string() - Syntax according to the URI definition in rfc 3986,
+                         e.g.: "http://www.erlang.org/"
 user_info() = string()
 scheme()    = atom()   - Example: http, https
 host()      = string()
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 7d68145287..22426eee79 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -99,10 +99,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
 # ----------------------------------------------------
diff --git a/lib/jinterface/java_src/Makefile b/lib/jinterface/java_src/Makefile
index 19f99831eb..0aa9c09548 100644
--- a/lib/jinterface/java_src/Makefile
+++ b/lib/jinterface/java_src/Makefile
@@ -47,7 +47,7 @@ POM_SRC= $(POM_FILE).src
 # ----------------------------------------------------
 
 $(POM_TARGET): $(POM_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
 include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
index 8ae63a1561..f476d4594d 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -61,7 +61,10 @@ CLASSPATH = $(JAVA_SRC_ROOT)
 
 JAVADOCFLAGS=-d $(DOCDIR)
 JAVAFLAGS=-d $(JAVA_DEST_ROOT) 
-JARFLAGS=-cvf
+JARFLAGS=-cf
+ifneq ($(V),0)
+JARFLAGS=-cfv
+endif
 
 JAVA_OPTIONS = 
 
@@ -79,13 +82,13 @@ endif
 debug opt: make_dirs $(JAVA_DEST_ROOT)$(JARFILE)
 
 make_dirs:
-	if [ ! -d "$(JAVA_DEST_ROOT)" ];then mkdir "$(JAVA_DEST_ROOT)"; fi
+	$(V_at)if [ ! -d "$(JAVA_DEST_ROOT)" ];then mkdir "$(JAVA_DEST_ROOT)"; fi
 
 $(JAVA_DEST_ROOT)$(JARFILE): $(TARGET_FILES)
 	@(cd $(JAVA_DEST_ROOT) ; $(JAR) $(JARFLAGS) $(JARFILE) $(JAVA_CLASS_SUBDIR))
 
 clean:
-	rm -f $(TARGET_FILES) *~
+	$(V_at)rm -f $(TARGET_FILES) *~
 
 docs:
 
@@ -96,13 +99,13 @@ docs:
 # include $(ERL_TOP)/make/otp_release_targets.mk
 
 release release_docs release_tests release_html:
-	$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
+	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
 
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
-	$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
+	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+	$(V_at)$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
+	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+	$(V_at)$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
 
 release_docs_spec:
 
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index d5388e54f4..c91c743498 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -361,8 +362,8 @@ unicode(doc) -> [];
 unicode(suite) -> [];
 unicode(Config) when is_list(Config) ->
     S1 = "plain ascii",
-    S2 = "iso-latin ��� �",
-    S3 = "Codepoints... ��� \x{1000}",
+    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],
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index 5e04bff0c1..de3ca1e176 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -58,7 +58,6 @@ XML_REF3_FILES = application.xml \
 	net_adm.xml \
 	net_kernel.xml \
 	os.xml \
-	packages.xml \
 	pg2.xml \
 	rpc.xml \
 	seq_trace.xml \
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 51a3311ec2..9f19efc793 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -121,6 +121,15 @@
       </desc>
     </func>
     <func>
+      <name name="get_env" arity="3"/>
+      <fsummary>Get the value of a configuration parameter using a default</fsummary>
+      <desc>
+        <p>Works like <seealso marker="#get_env/2">get_env/2</seealso> but returns
+          <c><anno>Def</anno></c> value when configuration parameter
+          <c><anno>Par</anno></c> does not exist.</p>
+      </desc>
+    </func>
+    <func>
       <name name="get_key" arity="1"/>
       <name name="get_key" arity="2"/>
       <fsummary>Get the value of an application specification key</fsummary>
diff --git a/lib/kernel/doc/src/error_handler.xml b/lib/kernel/doc/src/error_handler.xml
index acbf9a2c6e..610b65f0a2 100644
--- a/lib/kernel/doc/src/error_handler.xml
+++ b/lib/kernel/doc/src/error_handler.xml
@@ -43,19 +43,39 @@
         A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
       </type_desc>
       <desc>
-        <p>This function is evaluated if a call is made to
+        <p>This function is called by the run-time system if a call is made to
           <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> and
           <c><anno>Module</anno>:<anno>Function</anno>/N</c> is undefined. Note that
           <c>undefined_function/3</c> is evaluated inside the process
           making the original call.</p>
-        <p>If <c><anno>Module</anno></c> is interpreted, the interpreter is invoked
-          and the return value of the interpreted
-          <c><anno>Function</anno>(Arg1,.., ArgN)</c> call is returned.</p>
-        <p>Otherwise, it returns, if possible, the value of
-          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> after an attempt has been
-          made to autoload <c><anno>Module</anno></c>. If this is not possible, the
-          call to <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> fails with
-          exit reason <c>undef</c>.</p>
+
+	<p>This function will first attempt to autoload
+	  <c><anno>Module</anno></c>. If that is not possible,
+	  an <c>undef</c> exception will be raised.</p>
+
+	<p>If it was possible to load <c><anno>Module</anno></c>
+	  and the function <c><anno>Function</anno>/N</c> is exported,
+	  it will be called.</p>
+
+	<p>Otherwise, if the function <c>'$handle_undefined_function'/2</c>
+	  is exported, it will be called as
+          <c>'$handle_undefined_function'(</c><anno>Function</anno>,
+	  <anno>Args</anno>).
+	</p>
+	<p>Otherwise an <c>undef</c> exception will be raised.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="raise_undef_exception" arity="3"/>
+      <fsummary>Raise an undef exception</fsummary>
+      <type_desc variable="Args">
+        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
+      </type_desc>
+      <desc>
+	<p>Raise an <c>undef</c> exception with a stacktrace indicating
+	that <c><anno>Module</anno>:<anno>Function</anno>/N</c> is
+	undefined.
+	</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index b2a259080d..4a9b7d2ceb 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -100,7 +100,11 @@
       <name name="deep_list"/>
     </datatype>
     <datatype>
-      <name name="fd"/>
+      <name><marker id="type-fd">fd()</marker></name>
+      <desc>
+        <p>A file descriptor representing a file opened in <seealso
+          marker="#raw">raw</seealso> mode.</p>
+      </desc>
     </datatype>
     <datatype>
       <name name="filename"/>
@@ -109,8 +113,8 @@
       <name name="io_device"/>
       <desc>
         <p>As returned by
-          <seealso marker="#open/2">file:open/2</seealso>,
-          a process handling IO protocols.</p>
+          <seealso marker="#open/2">file:open/2</seealso>;
+          <c>pid()</c> is a process handling I/O-protocols.</p>
       </desc>
     </datatype>
     <datatype>
@@ -170,6 +174,18 @@
       </desc>
     </func>
     <func>
+      <name name="allocate" arity="3"/>
+      <fsummary>Allocate file space</fsummary>
+      <desc>
+        <p><c>allocate/3</c> can be used to preallocate space for a file.</p>
+        <p>This function only succeeds in platforms that implement this
+          feature. When it succeeds, space is preallocated for the file but
+          the file size might not be updated. This behaviour depends on the
+          preallocation implementation. To guarantee the file size is updated
+          one must truncate the file to the new size.</p>
+      </desc>
+    </func>
+    <func>
       <name name="change_group" arity="2"/>
       <fsummary>Change group of a file</fsummary>
       <desc>
@@ -261,6 +277,9 @@
         {person, "pelle", 30}.</code>
 <pre>1> <input>file:consult("f.txt").</input>
 {ok,[{person,"kalle",25},{person,"pelle",30}]}</pre>
+        <p>The encoding of of <c><anno>Filename</anno></c> can be set
+          by a comment as described in <seealso
+          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -399,6 +418,9 @@
               of the error.</p>
           </item>
         </taglist>
+        <p>The encoding of of <c><anno>Filename</anno></c> can be set
+          by a comment as described in <seealso
+          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -610,7 +632,7 @@
       <name name="open" arity="2"/>
       <fsummary>Open a file</fsummary>
       <desc>
-        <p>Opens the file <c><anno>Filename</anno></c> in the mode determined
+        <p>Opens the file <c><anno>File</anno></c> in the mode determined
           by <c><anno>Modes</anno></c>, which may contain one or more of the
           following items:</p>
         <taglist>
@@ -644,7 +666,8 @@
           </item>
           <tag><c>raw</c></tag>
           <item>
-            <p>The <c>raw</c> option allows faster access to a file,
+            <p><marker id="raw"/>
+              The <c>raw</c> option allows faster access to a file,
               because no Erlang process is needed to handle the file.
               However, a file opened in this way has the following
               limitations:</p>
@@ -767,6 +790,10 @@
 	    <p>The Encoding can be changed for a file "on the fly" by using the <seealso marker="stdlib:io#setopts/2">io:setopts/2</seealso> function, why a file can be analyzed in latin1 encoding for i.e. a BOM, positioned beyond the BOM and then be set for the right encoding before further reading.See the <seealso marker="stdlib:unicode">unicode(3)</seealso> module for functions identifying BOM's.</p>
 	    <p>This option is not allowed on <c>raw</c> files.</p>
           </item>
+          <tag><c>ram</c></tag>
+          <item>
+            <p><c>File</c> must be <c>iodata()</c>. Returns an <c>fd()</c> which lets the <c>file</c> module operate on the data in-memory as if it is a file.</p>
+          </item>
         </taglist>
         <p>Returns:</p>
         <taglist>
@@ -861,6 +888,9 @@
               the error.</p>
           </item>
         </taglist>
+        <p>The encoding of of <c><anno>Filename</anno></c> can be set
+          by a comment as described in <seealso
+          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -902,6 +932,9 @@
               of the error.</p>
           </item>
         </taglist>
+        <p>The encoding of of <c><anno>Filename</anno></c> can be set
+          by a comment as described in <seealso
+          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -971,7 +1004,10 @@
               of the error.</p>
           </item>
         </taglist>
-      </desc>
+        <p>The encoding of of <c><anno>Filename</anno></c> can be set
+          by a comment as described in <seealso
+          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+   </desc>
     </func>
     <func>
       <name name="path_script" arity="3"/>
@@ -1220,11 +1256,11 @@
         
         <p>The record <c>file_info</c> contains the following fields.</p>
         <taglist>
-          <tag><c>size = integer()</c></tag>
+          <tag><c>size = integer() >= 0</c></tag>
           <item>
             <p>Size of file in bytes.</p>
           </item>
-          <tag><c>type = device | directory | regular | other</c></tag>
+          <tag><c>type = device | directory | other | regular | symlink</c></tag>
           <item>
             <p>The type of the file.</p>
           </item>
@@ -1232,22 +1268,22 @@
           <item>
             <p>The current system access to the file.</p>
           </item>
-          <tag><c>atime = <seealso marker="#type-date_time">date_time()</seealso> | integer() </c></tag> 
+          <tag><c>atime = <seealso marker="#type-date_time">date_time()</seealso> | integer() >= 0</c></tag>
           <item>
             <p>The last time the file was read.</p>
           </item>
-          <tag><c>mtime = <seealso marker="#type-date_time">date_time()</seealso> | integer() </c></tag> 
+          <tag><c>mtime = <seealso marker="#type-date_time">date_time()</seealso> | integer() >= 0</c></tag>
           <item>
             <p>The last time the file was written.</p>
           </item>
-          <tag><c>ctime = <seealso marker="#type-date_time">date_time()</seealso> | integer() </c></tag> 
+          <tag><c>ctime = <seealso marker="#type-date_time">date_time()</seealso> | integer() >=0</c></tag>
           <item>
             <p>The interpretation of this time field depends on
               the operating system. On Unix, it is the last time
               the file or the inode was changed. In Windows, it is
               the create time.</p>
           </item>
-          <tag><c>mode = integer()</c></tag>
+          <tag><c>mode = integer() >= 0</c></tag>
           <item>
             <p>The file permissions as the sum of the following bit
               values:</p>
@@ -1278,33 +1314,33 @@
             <p>On Unix platforms, other bits than those listed above
               may be set.</p>
           </item>
-          <tag><c>links = integer()</c></tag>
+          <tag><c>links = integer() >= 0</c></tag>
           <item>
             <p>Number of links to the file (this will always be 1 for
               file systems which have no concept of links).</p>
           </item>
-          <tag><c>major_device = integer()</c></tag>
+          <tag><c>major_device = integer() >= 0</c></tag>
           <item>
             <p>Identifies the file system where the file is located.
               In Windows, the number indicates a drive as follows:
               0 means A:, 1 means B:, and so on.</p>
           </item>
-          <tag><c>minor_device = integer()</c></tag>
+          <tag><c>minor_device = integer() >= 0</c></tag>
           <item>
             <p>Only valid for character devices on Unix. In all other
               cases, this field is zero.</p>
           </item>
-          <tag><c>inode = integer()</c></tag>
+          <tag><c>inode = integer() >= 0</c></tag>
           <item>
             <p>Gives the <c>inode</c> number. On non-Unix file systems,
               this field will be zero.</p>
           </item>
-          <tag><c>uid = integer()</c></tag>
+          <tag><c>uid = integer() >= 0</c></tag>
           <item>
             <p>Indicates the owner of the file. Will be zero for
               non-Unix file systems.</p>
           </item>
-          <tag><c>gid = integer()</c></tag>
+          <tag><c>gid = integer() >= 0</c></tag>
           <item>
             <p>Gives the group that the owner of the file belongs to.
               Will be zero for non-Unix file systems.</p>
@@ -1502,6 +1538,9 @@
               of the error.</p>
           </item>
         </taglist>
+        <p>The encoding of of <c><anno>Filename</anno></c> can be set
+          by a comment as described in <seealso
+          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -1732,22 +1771,22 @@
         <p>The following fields are used from the record, if they are
           given.</p>
         <taglist>
-          <tag><c>atime = <seealso marker="#type-date_time">date_time()</seealso> | integer()</c></tag>
+          <tag><c>atime = <seealso marker="#type-date_time">date_time()</seealso> | integer() >= 0</c></tag>
           <item>
             <p>The last time the file was read.</p>
           </item>
-          <tag><c>mtime = <seealso marker="#type-date_time">date_time()</seealso> | integer()</c></tag>
+          <tag><c>mtime = <seealso marker="#type-date_time">date_time()</seealso> | integer() >= 0</c></tag>
           <item>
             <p>The last time the file was written.</p>
           </item>
-          <tag><c>ctime = <seealso marker="#type-date_time">date_time()</seealso> | integer()</c></tag>
+          <tag><c>ctime = <seealso marker="#type-date_time">date_time()</seealso> | integer() >= 0</c></tag>
           <item>
             <p>On Unix, any value give for this field will be ignored
               (the "ctime" for the file will be set to the current
               time). On Windows, this field is the new creation time to
               set for the file.</p>
           </item>
-          <tag><c>mode = integer()</c></tag>
+          <tag><c>mode = integer() >= 0</c></tag>
           <item>
             <p>The file permissions as the sum of the following bit
               values:</p>
@@ -1778,15 +1817,15 @@
             <p>On Unix platforms, other bits than those listed above
               may be set.</p>
           </item>
-          <tag><c>uid = integer()</c></tag>
+          <tag><c>uid = integer() >= 0</c></tag>
           <item>
             <p>Indicates the owner of the file. Ignored for non-Unix
               file systems.</p>
           </item>
-          <tag><c>gid = integer()</c></tag>
+          <tag><c>gid = integer() >= 0</c></tag>
           <item>
             <p>Gives the group that the owner of the file belongs to.
-              Ignored non-Unix file systems.</p>
+              Ignored for non-Unix file systems.</p>
           </item>
         </taglist>
         <p>Typical error reasons:</p>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index a1590c2dce..3d929a772e 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -323,8 +323,11 @@ fe80::204:acff:fe17:bf38
       <type name="stat_option"/>
       <desc>
         <p>Gets one or more statistic options for a socket.</p>
+
 	<p><c>getstat(<anno>Socket</anno>)</c> is equivalent to
-	<c>getstat(<anno>Socket</anno>,&nbsp;[recv_avg,&nbsp;recv_cnt,&nbsp;recv_dvi,&nbsp;recv_max,&nbsp;recv_oct,&nbsp;send_avg,&nbsp;send_cnt,&nbsp;send_dvi,&nbsp;send_max,&nbsp;send_oct])</c></p>
+	  <c>getstat(<anno>Socket</anno>, [recv_avg, recv_cnt, recv_dvi,
+	  recv_max, recv_oct, send_avg, send_cnt, send_dvi, send_max,
+	  send_oct])</c>.</p>
 	  <p>The following options are available:</p>
         <taglist>
 	  <tag><c>recv_avg</c></tag>
diff --git a/lib/kernel/doc/src/packages.xml b/lib/kernel/doc/src/packages.xml
deleted file mode 100644
index 8a82b91a90..0000000000
--- a/lib/kernel/doc/src/packages.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2004</year><year>2012</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>packages</title>
-    <prepared>Kenneth Lundin</prepared>
-    <responsible>Kenneth Lundin</responsible>
-    <docno>1</docno>
-    <approved>Kenneth Lundin</approved>
-    <checked></checked>
-    <date>2004-09-07</date>
-    <rev>A</rev>
-    <file>packages.sgml</file>
-  </header>
-  <module>packages</module>
-  <modulesummary>Packages in Erlang</modulesummary>
-  <description>
-    <warning><p>
-      Packages has since it was introduced more than 5 years ago been an 
-      experimental feature. Use it at your own risk, we do not
-      actively maintain and develop this feature. It might however be 
-      supported some 
-      day.
-      </p>
-      <p>
-	In spite of this packages work quite well, but there are some 
-	known issues in tools and other parts where packages don't work well.
-    </p>
-    </warning>
-    <p><em>Introduction</em></p>
-    <p>Packages are simply namespaces for modules. 
-      All old Erlang modules automatically belong to the top level 
-      ("empty-string") namespace, and do not need any changes.</p>
-    <p>The full name of a packaged module is written as e.g. 
-      "<c>fee.fie.foe.foo</c>",
-      i.e., as atoms separated by periods, 
-      where the package name is the part up to
-      but not including the last period; 
-      in this case "<c>fee.fie.foe</c>".
-      A more concrete example is the module <c>erl.lang.term</c>, 
-      which is in the
-      package <c>erl.lang</c>. 
-      Package names can have any number of segments, as in 
-      <c>erl.lang.list.sort</c>.
-      The atoms in the name can be quoted, as in <c>foo.'Bar'.baz</c>, 
-      or even the
-      whole name, as in <c>'foo.bar.baz'</c> but the concatenation of 
-      atoms and
-      periods must not contain two consecutive period characters or 
-      end with a period,
-      as in <c>'foo..bar'</c>, <c>foo.'.bar'</c>, or <c>foo.'bar.'</c>. 
-      The periods must not be followed by whitespace.</p>
-    <p>The code loader maps module names onto the file system directory 
-      structure.
-      E.g., the module <c>erl.lang.term</c> corresponds to a file 
-      <c>.../erl/lang/term.beam</c>
-      in the search path. 
-      Note that the name of the actual object file corresponds to
-      the last part only of the full module name. 
-      (Thus, old existing modules such as <c>lists</c>
-      simply map to <c>.../lists.beam</c>, exactly as before.)</p>
-    <p>A packaged module in a file "<c>foo/bar/fred.erl</c>" is declared
-      as:</p>
-    <code type="none">
--module(foo.bar.fred).</code>
-    <p>This can be compiled and loaded from the Erlang shell using 
-      <c>c(fred)</c>, if
-      your current directory is the same as that of the file. 
-      The object file will be named <c>fred.beam</c>.</p>
-    <p>The Erlang search path works exactly as before, 
-      except that the package segments will be appended to each 
-      directory in the path in order to find the
-      file. E.g., assume the path is <c>["/usr/lib/erl", "/usr/local/lib/otp/legacy/ebin", "/home/barney/erl"]</c>.
-      Then, the code for a module named <c>foo.bar.fred</c> will be 
-      searched for
-      first as <c>"/usr/lib/erl/foo/bar/fred.beam"</c>, then 
-      <c>"/usr/local/lib/otp/legacy/ebin/foo/bar/fred.beam"</c>
-      and lastly <c>"/home/barney/erl/foo/bar/fred.beam"</c>. 
-      A module
-      like <c>lists</c>, which is in the top-level package, 
-      will be looked for as <c>"/usr/lib/erl/lists.beam"</c>,
-      <c>"/usr/local/lib/otp/legacy/ebin/lists.beam"</c> and 
-      <c>"/home/barney/erl/lists.beam"</c>.</p>
-    <p><em>Programming</em></p>
-    <p>Normally, if a call is made from one module to another, 
-      it is assumed that the
-      called module belongs to the same package as the source module. 
-      The compiler
-      automatically expands such calls. E.g., in:</p>
-    <code type="none">
--module(foo.bar.m1).
--export([f/1]).
-
-f(X) -> m2:g(X).</code>
-    <p><c>m2:g(X)</c> becomes a call to <c>foo.bar.m2</c>
-      If this is not what was intended, the call can be written 
-      explicitly, as in</p>
-    <code type="none">
--module(foo.bar.m1).
--export([f/1]).
-
-f(X) -> fee.fie.foe.m2:g(X).</code>
-    <p>Because the called module is given with an explicit package name, 
-      no expansion is done in this case.</p>
-    <p>If a module from another package is used repeatedly in a module, 
-      an import declaration can make life easier:</p>
-    <code type="none">
--module(foo.bar.m1).
--export([f/1, g/1]).
--import(fee.fie.foe.m2).
-
-f(X) -> m2:g(X).
-g(X) -> m2:h(X).</code>
-    <p>will make the calls to <c>m2</c> refer to <c>fee.fie.foe.m2</c>. 
-      More generally, a declaration <c>-import(Package.Module).</c> 
-      will cause calls to <c>Module</c>
-      to be expanded to <c>Package.Module</c>.</p>
-    <p>Old-style function imports work as normal (but full module 
-      names must be
-      used); e.g.:</p>
-    <code type="none">
--import(fee.fie.foe.m2, [g/1, h/1]).</code>
-    <p>however, it is probably better to avoid this form of import 
-      altogether in new
-      code, since it makes it hard to see what calls are really "remote".</p>
-    <p>If it is necessary to call a module in the top-level package 
-      from within a
-      named package, the module name can be written either with an 
-      initial period as
-      in e.g. "<c>.lists</c>", or with an empty initial atom, as in 
-      "<c>''.lists</c>".
-      However, the best way is to use an import declaration - 
-      this is most obvious to
-      the eye, and makes sure we don't forget adding a period somewhere:</p>
-    <code type="none">
--module(foo.bar.fred).
--export([f/1]).
--import(lists).
-
-f(X) -> lists:reverse(X).</code>
-    <p>The dot-syntax for module names can be used in any expression. 
-      All segments must
-      be constant atoms, and the result must be a well-formed 
-      package/module name.
-      E.g.:</p>
-    <code type="none">
-spawn(foo.bar.fred, f, [X])</code>
-    <p>is equivalent to <c>spawn('foo.bar.fred', f, [X])</c>.</p>
-    <p><em>The Erlang Shell</em></p>
-    <p>The shell also automatically expands remote calls, 
-      however currently no
-      expansions are made by default. 
-      The user can change the behaviour by using the <c>import/1</c>
-      shell command (or its abbreviation <c>use/1</c>). E.g.:</p>
-    <pre>
-1> <input>import(foo.bar.m).</input>
-ok
-2> <input>m:f().</input></pre>
-    <p>will evaluate <c>foo.bar.m:f()</c>. 
-      If a new import is made of the same name,
-      this overrides any previous import. 
-      (It is likely that in the future, some
-      system packages will be pre-imported.)</p>
-    <p>In addition, the shell command <c>import_all/1</c> 
-      (and its alias <c>use_all/1</c>)
-      imports all modules currently found in the path for a given 
-      package name. E.g.,
-      assuming the files "<c>.../foo/bar/fred.beam</c>", 
-      "<c>.../foo/bar/barney.beam</c>"
-      and "<c>.../foo/bar/bambam.beam</c>" can be found from our current
-      path,</p>
-    <pre>
-1> <input>import_all(foo.bar).</input></pre>
-    <p>will make <c>fred</c>, <c>barney</c> and <c>bambam</c> 
-      expand to <c>foo.bar.fred</c>,
-      <c>foo.bar.barney</c> and <c>foo.bar.bambam</c>, respectively.</p>
-    <p>Note: The compiler does not have an "import all" directive, for the
-      reason that Erlang has no compile time type checking. 
-      E.g. if the wrong search
-      path is used at compile time, a call <c>m:f(...)</c> 
-      could be expanded to <c>foo.bar.m:f(...)</c>
-      without any warning, instead of the intended 
-      <c>frob.ozz.m:f(...)</c>, if
-      package <c>foo.bar</c> happens to be found first in the path. 
-      Explicitly
-      declaring each use of a module makes for safe code.</p>
-  </description>
-</erlref>
-
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml
index 9ef0959271..67d91ba585 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml
@@ -64,6 +64,5 @@
   <xi:include href="zlib_stub.xml"/>
   <xi:include href="app.xml"/>
   <xi:include href="config.xml"/>
-  <xi:include href="packages.xml"/>
 </application>
 
diff --git a/lib/kernel/include/file.hrl b/lib/kernel/include/file.hrl
index bf97173122..69aec1ee36 100644
--- a/lib/kernel/include/file.hrl
+++ b/lib/kernel/include/file.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The 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,32 +22,37 @@
 %%--------------------------------------------------------------------------
 
 -record(file_info,
-	{size   :: non_neg_integer(),	% Size of file in bytes.
-	 type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink',
-	 access :: 'read' | 'write' | 'read_write' | 'none',
-	 atime  :: file:date_time() | integer(), % The local time the file was last read:
-					         % {{Year, Mon, Day}, {Hour, Min, Sec}}.
-						 % atime, ctime, mtime may also be unix epochs()
-	 mtime  :: file:date_time() | integer(), % The local time the file was last written.
-	 ctime  :: file:date_time() | integer(), % The interpretation of this time field
-					% is dependent on operating system.
-					% On Unix it is the last time the file
-					% or the inode was changed.  On Windows,
-					% it is the creation time.
-	 mode   :: integer(),		% File permissions.  On Windows,
-	 				% the owner permissions will be
-					% duplicated for group and user.
-	 links  :: non_neg_integer(),	% Number of links to the file (1 if the
-					% filesystem doesn't support links).
-	 major_device :: integer(),	% Identifies the file system (Unix),
-	 				% or the drive number (A: = 0, B: = 1)
-					% (Windows).
-	 %% The following are Unix specific.
-	 %% They are set to zero on other operating systems.
-	 minor_device :: integer(),	% Only valid for devices.
-	 inode  :: integer(),  		% Inode number for file.
-	 uid    :: integer(),  		% User id for owner.
-	 gid    :: integer()}).	        % Group id for owner.
+        {size   :: non_neg_integer(),   % Size of file in bytes.
+         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink',
+         access :: 'read' | 'write' | 'read_write' | 'none',
+         atime  :: file:date_time() | non_neg_integer(),
+                                     % The local time the file was last read:
+                                     % {{Year, Mon, Day}, {Hour, Min, Sec}}.
+                                     % atime, ctime, mtime may also be unix epochs()
+         mtime  :: file:date_time() | non_neg_integer(),
+                                     % The local time the file was last written.
+         ctime  :: file:date_time() | non_neg_integer(),
+                                     % The interpretation of this time field
+                                     % is dependent on operating system.
+                                     % On Unix it is the last time the file
+                                     % or the inode was changed.  On Windows,
+                                     % it is the creation time.
+         mode   :: non_neg_integer(), % File permissions.  On Windows,
+                                     % the owner permissions will be
+                                     % duplicated for group and user.
+         links  :: non_neg_integer(),
+                                     % Number of links to the file (1 if the
+                                     % filesystem doesn't support links).
+         major_device :: non_neg_integer(),
+                                     % Identifies the file system (Unix),
+                                     % or the drive number (A: = 0, B: = 1)
+                                     % (Windows).
+         %% The following are Unix specific.
+         %% They are set to zero on other operating systems.
+         minor_device :: non_neg_integer(), % Only valid for devices.
+         inode   :: non_neg_integer(),       % Inode number for file.
+         uid     :: non_neg_integer(),       % User id for owner.
+         gid     :: non_neg_integer()}).     % Group id for owner.
 
 
 -record(file_descriptor,
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index c76ff9e2f0..eaced4861a 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -107,7 +107,6 @@ MODULES = \
 	net_adm \
 	net_kernel \
 	os \
-	packages \
 	pg2 \
 	ram_file \
 	rpc \
@@ -171,13 +170,13 @@ docs:
 # ----------------------------------------------------
 
 ../../hipe/main/hipe.hrl: ../../hipe/vsn.mk ../../hipe/main/hipe.hrl.src
-	sed -e "s;%VSN%;$(HIPE_VSN);" ../../hipe/main/hipe.hrl.src > ../../hipe/main/hipe.hrl
+	$(vsn_verbose)sed -e "s;%VSN%;$(HIPE_VSN);" ../../hipe/main/hipe.hrl.src > ../../hipe/main/hipe.hrl
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(KERNEL_VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(KERNEL_VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(KERNEL_VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(KERNEL_VSN);' $< > $@
 
 
 EPMD_FLAGS = -Depmd_port_no=$(EPMD_PORT_NO)	\
@@ -187,10 +186,10 @@ EPMD_FLAGS = -Depmd_port_no=$(EPMD_PORT_NO)	\
              -Derlang_daemon_port=$(EPMD_PORT_NO)
 
 $(ESRC)/inet_dns_record_adts.hrl: $(ESRC)/inet_dns_record_adts.pl
-	LANG=C $(PERL) $< > $@
+	$(gen_verbose)LANG=C $(PERL) $< > $@
 
 $(EBIN)/erl_epmd.beam: $(ESRC)/erl_epmd.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) $(EPMD_FLAGS) -o$(EBIN) $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) $(EPMD_FLAGS) -o$(EBIN) $<
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index 9b7c4aa7b8..4e65883be7 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -23,7 +23,7 @@
 	 which_applications/0, which_applications/1,
 	 loaded_applications/0, permit/2]).
 -export([set_env/3, set_env/4, unset_env/2, unset_env/3]).
--export([get_env/1, get_env/2, get_all_env/0, get_all_env/1]).
+-export([get_env/1, get_env/2, get_env/3, get_all_env/0, get_all_env/1]).
 -export([get_key/1, get_key/2, get_all_key/0, get_all_key/1]).
 -export([get_application/0, get_application/1, info/0]).
 -export([start_type/0]).
@@ -264,6 +264,20 @@ get_env(Key) ->
 get_env(Application, Key) -> 
     application_controller:get_env(Application, Key).
 
+-spec get_env(Application, Par, Def) -> Val when
+      Application :: atom(),
+      Par :: atom(),
+      Def :: term(),
+      Val :: term().
+
+get_env(Application, Key, Def) ->
+    case get_env(Application, Key) of
+    {ok, Val} ->
+        Val;
+    undefined ->
+        Def
+    end.
+
 -spec get_all_env() -> Env when
       Env :: [{Par :: atom(), Val :: term()}].
 
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index 68cd26ec10..75ce852001 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -1960,5 +1960,5 @@ to_string(Term) ->
 	true ->
 	    Term;
 	false ->
-	    lists:flatten(io_lib:write(Term))
+	    lists:flatten(io_lib:format("~134217728p", [Term]))
     end.
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index c808ac7cb7..361f2bdf8a 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -359,7 +359,6 @@ load_code_server_prerequisites() ->
 	      hipe_unified_loader,
 	      lists,
 	      os,
-	      packages,
 	      unicode],
     [M = M:module_info(module) || M <- Needed],
     ok.
@@ -413,7 +412,7 @@ which(Module) when is_atom(Module) ->
     end.
 
 which2(Module) ->
-    Base = to_path(Module),
+    Base = atom_to_list(Module),
     File = filename:basename(Base) ++ objfile_extension(),
     Path = get_path(),
     which(File, filename:dirname(Base), Path).
@@ -547,9 +546,6 @@ has_ext(Ext, Extlen, File) ->
 	_ -> false
     end.
 
-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),
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 00ad923466..b2d2c19f78 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1229,7 +1229,7 @@ load_abs(File, Mod0, Caller, St) ->
     end.
 
 try_load_module(Mod, Dir, Caller, St) ->
-    File = filename:append(Dir, to_path(Mod) ++ 
+    File = filename:append(Dir, to_list(Mod) ++
 			   objfile_extension()),
     case erl_prim_loader:get_file(File) of
 	error -> 
@@ -1347,7 +1347,7 @@ load_file_1(Mod, Caller, #state{cache=Cache}=St0) ->
     end.
 
 mod_to_bin([Dir|Tail], Mod) ->
-    File = filename:append(Dir, to_path(Mod) ++ objfile_extension()),
+    File = filename:append(Dir, to_list(Mod) ++ objfile_extension()),
     case erl_prim_loader:get_file(File) of
 	error -> 
 	    mod_to_bin(Tail, Mod);
@@ -1356,7 +1356,7 @@ mod_to_bin([Dir|Tail], Mod) ->
     end;
 mod_to_bin([], Mod) ->
     %% At last, try also erl_prim_loader's own method
-    File = to_path(Mod) ++ objfile_extension(),
+    File = to_list(Mod) ++ objfile_extension(),
     case erl_prim_loader:get_file(File) of
 	error -> 
 	    error;     % No more alternatives !
@@ -1570,6 +1570,3 @@ to_list(X) when is_atom(X) -> atom_to_list(X).
 
 to_atom(X) when is_atom(X) -> X;
 to_atom(X) when is_list(X) -> list_to_atom(X).
-
-to_path(X) ->
-    filename:join(packages:split(X)).
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index f0d54a2f3e..e3511988a6 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -757,7 +757,8 @@ setup_timer(Pid, Timeout) ->
     end.
 
 reset_timer(Timer) ->
-    Timer ! {self(), reset}.
+    Timer ! {self(), reset},
+    ok.
 
 cancel_timer(Timer) ->
     unlink(Timer),
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index f8bc5f499c..a3aa1f1dcf 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -23,10 +23,12 @@
 %% "error_handler: add no_native compiler directive"
 -compile(no_native).
 
-%% A simple error handler.
+%% Callbacks called from the run-time system.
+-export([undefined_function/3,undefined_lambda/3,breakpoint/3]).
 
--export([undefined_function/3, undefined_lambda/3, stub_function/3,
-	 breakpoint/3]).
+%% Exported utility functions.
+-export([raise_undef_exception/3]).
+-export([stub_function/3]).
 
 -spec undefined_function(Module, Function, Args) ->
 	any() when
@@ -41,12 +43,7 @@ undefined_function(Module, Func, Args) ->
 		true ->
 		    apply(Module, Func, Args);
 		false ->
-		    case check_inheritance(Module, Args) of
-			{value, Base, Args1} ->
-			    apply(Base, Func, Args1);
-			none ->
-			    crash(Module, Func, Args)
-		    end
+		    call_undefined_function_handler(Module, Func, Args)
 	    end;
 	{module, _} ->
 	    crash(Module, Func, Args);
@@ -77,6 +74,14 @@ undefined_lambda(Module, Fun, Args) ->
 breakpoint(Module, Func, Args) ->
     (int()):eval(Module, Func, Args).
 
+-spec raise_undef_exception(Module, Function, Args) -> no_return() when
+      Module :: atom(),
+      Function :: atom(),
+      Args :: list().
+
+raise_undef_exception(Module, Func, Args) ->
+    crash({Module,Func,Args,[]}).
+
 %% Used to make the call to the 'int' module a "weak" one, to avoid
 %% building strong components in xref or dialyzer.
 
@@ -130,27 +135,11 @@ ensure_loaded(Module) ->
 stub_function(Mod, Func, Args) ->
     exit({undef,[{Mod,Func,Args,[]}]}).
 
-check_inheritance(Module, Args) ->
-    Attrs = erlang:get_module_info(Module, attributes),
-    case lists:keyfind(extends, 1, Attrs) of
-	{extends, [Base]} when is_atom(Base), Base =/= Module ->
-	    %% This is just a heuristic for detecting abstract modules
-	    %% with inheritance so they can be handled; it would be
-	    %% much better to do it in the emulator runtime
-	    case lists:keyfind(abstract, 1, Attrs) of
-		{abstract, [true]} ->
-		    case lists:reverse(Args) of
-			[M|Rs] when tuple_size(M) > 1,
-			element(1,M) =:= Module,
-			tuple_size(element(2,M)) > 0,
-			is_atom(element(1,element(2,M))) ->
-			    {value, Base, lists:reverse(Rs, [element(2,M)])};
-			_ ->
-			    {value, Base, Args}
-		    end;
-		_ ->
-		    {value, Base, Args}
-	    end;
-	_ ->
-	    none
+call_undefined_function_handler(Module, Func, Args) ->
+    Handler = '$handle_undefined_function',
+    case erlang:function_exported(Module, Handler, 2) of
+	false ->
+	    crash(Module, Func, Args);
+	true ->
+	    Module:Handler(Func, Args)
     end.
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 22af38c598..16f2dde464 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -38,7 +38,7 @@
 %% Specialized
 -export([ipread_s32bu_p32bu/3]).
 %% Generic file contents.
--export([open/2, close/1, advise/4,
+-export([open/2, close/1, advise/4, allocate/3,
 	 read/2, write/2, 
 	 pread/2, pread/3, pwrite/2, pwrite/3,
 	 read_line/1,
@@ -397,9 +397,10 @@ raw_write_file_info(Name, #file_info{} = Info) ->
 
 %% Contemporary mode specification - list of options
 
--spec open(Filename, Modes) -> {ok, IoDevice} | {error, Reason} when
+-spec open(File, Modes) -> {ok, IoDevice} | {error, Reason} when
+      File :: Filename | iodata(),
       Filename :: name(),
-      Modes :: [mode()],
+      Modes :: [mode() | ram],
       IoDevice :: io_device(),
       Reason :: posix() | badarg | system_limit.
 
@@ -489,6 +490,18 @@ advise(#file_descriptor{module = Module} = Handle, Offset, Length, Advise) ->
 advise(_, _, _, _) ->
     {error, badarg}.
 
+-spec allocate(File, Offset, Length) ->
+	'ok' | {'error', posix()} when
+      File :: io_device(),
+      Offset :: non_neg_integer(),
+      Length :: non_neg_integer().
+
+allocate(File, Offset, Length) when is_pid(File) ->
+    R = file_request(File, {allocate, Offset, Length}),
+    wait_file_reply(File, R);
+allocate(#file_descriptor{module = Module} = Handle, Offset, Length) ->
+    Module:allocate(Handle, Offset, Length).
+
 -spec read(IoDevice, Number) -> {ok, Data} | eof | {error, Reason} when
       IoDevice :: io_device() | atom(),
       Number :: non_neg_integer(),
@@ -1314,6 +1327,7 @@ sendfile_send(Sock, Data, Old) ->
 %%% Helpers
 
 consult_stream(Fd) ->
+    _ = epp:set_encoding(Fd),
     consult_stream(Fd, 1, []).
 
 consult_stream(Fd, Line, Acc) ->
@@ -1327,6 +1341,7 @@ consult_stream(Fd, Line, Acc) ->
     end.
 
 eval_stream(Fd, Handling, Bs) ->
+    _ = epp:set_encoding(Fd),
     eval_stream(Fd, Handling, 1, undefined, [], Bs).
 
 eval_stream(Fd, H, Line, Last, E, Bs) ->
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index 0bff56cf46..fad2ed7fb3 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -40,6 +40,8 @@ format_error({_Line, ?MODULE, Reason}) ->
     io_lib:format("~w", [Reason]);
 format_error({_Line, Mod, Reason}) ->
     Mod:format_error(Reason);
+format_error(invalid_unicode) ->
+    io_lib:format("cannot translate from UTF-8", []);
 format_error(ErrorId) ->
     erl_posix_msg:message(ErrorId).
 
@@ -209,6 +211,10 @@ file_request({advise,Offset,Length,Advise},
     Reply ->
         {reply,Reply,State}
     end;
+file_request({allocate, Offset, Length},
+         #state{handle = Handle} = State) ->
+    Reply = ?PRIM_FILE:allocate(Handle, Offset, Length),
+    {reply, Reply, State};
 file_request({pread,At,Sz}, 
 	     #state{handle=Handle,buf=Buf,read_mode=ReadMode}=State) ->
     case position(Handle, At, Buf) of
@@ -549,7 +555,7 @@ get_chars_notempty(Mod, Func, XtraArg, S, OutEnc,
 		<<>> ->
 		    get_chars_apply(Mod, Func, XtraArg, S, OutEnc, State, eof);
 		_ ->
-		    {stop,invalid_unicode,{error,invalid_unicode},State}
+                    {stop,invalid_unicode,invalid_unicode_error(Mod, Func, XtraArg, S),State}
 	    end;
 	{error,Reason}=Error ->
 	    {stop,Reason,Error,State}
@@ -616,12 +622,22 @@ get_chars_apply(Mod, Func, XtraArg, S0, OutEnc,
 	end
     catch
 	exit:ExReason ->
-	   {stop,ExReason,{error,err_func(Mod, Func, XtraArg)},State};
+            {stop,ExReason,invalid_unicode_error(Mod, Func, XtraArg, S0),State};
 	error:ErrReason ->
 	   {stop,ErrReason,{error,err_func(Mod, Func, XtraArg)},State}
     end.
 	    
-
+%% A hack that tries to inform the caller about the position where the
+%% error occured.
+invalid_unicode_error(Mod, Func, XtraArg, S) ->
+    try
+        {erl_scan,tokens,_Args} = XtraArg,
+        Location = erl_scan:continuation_location(S),
+        {error,{Location, ?MODULE, invalid_unicode},Location}
+    catch
+        _:_ ->
+            {error,err_func(Mod, Func, XtraArg)}
+    end.
 
 %% Convert error code to make it look as before
 err_func(io_lib, get_until, {_,F,_}) ->
diff --git a/lib/kernel/src/group.erl b/lib/kernel/src/group.erl
index f92c6f7208..c66e823a04 100644
--- a/lib/kernel/src/group.erl
+++ b/lib/kernel/src/group.erl
@@ -424,7 +424,7 @@ get_password_chars(Drv,Buf) ->
     end.
 
 get_chars(Prompt, M, F, Xa, Drv, Buf, Encoding) ->
-    Pbs = prompt_bytes(Prompt),
+    Pbs = prompt_bytes(Prompt, Encoding),
     get_chars_loop(Pbs, M, F, Xa, Drv, Buf, start, Encoding).
 
 get_chars_loop(Pbs, M, F, Xa, Drv, Buf0, State, Encoding) ->
@@ -515,6 +515,27 @@ get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls0, Encoding)
 		      Drv,
 		      Ls, Encoding)
     end;
+%% ^R = backward search, ^S = forward search.
+%% Search is tricky to implement and does a lot of back-and-forth
+%% work with edlin.erl (from stdlib). Edlin takes care of writing
+%% and handling lines and escape characters to get out of search,
+%% whereas this module does the actual searching and appending to lines.
+%% Erlang's shell wasn't exactly meant to traverse the wall between
+%% line and line stack, so we at least restrict it by introducing
+%% new modes: search, search_quit, search_found. These are added to
+%% the regular ones (none, meta_left_sq_bracket) and handle special
+%% cases of history search.
+get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls, Encoding)
+  when ((Mode =:= none) and (Char =:= $\^R)) ->
+    send_drv_reqs(Drv, Rs),
+    %% drop current line, move to search mode. We store the current
+    %% prompt ('N>') and substitute it with the search prompt.
+    send_drv_reqs(Drv, edlin:erase_line(Cont)),
+    put(search_quit_prompt, edlin:prompt(Cont)),
+    Pbs = prompt_bytes("(search)`': ", Encoding),
+    {more_chars,Ncont,Nrs} = edlin:start(Pbs, search),
+    send_drv_reqs(Drv, Nrs),
+    get_line1(edlin:edit_line1(Cs, Ncont), Drv, Ls, Encoding);
 get_line1({expand, Before, Cs0, Cont,Rs}, Drv, Ls0, Encoding) ->
     send_drv_reqs(Drv, Rs),
     ExpandFun = get(expand_fun),
@@ -535,8 +556,59 @@ get_line1({undefined,_Char,Cs,Cont,Rs}, Drv, Ls, Encoding) ->
     send_drv_reqs(Drv, Rs),
     send_drv(Drv, beep),
     get_line1(edlin:edit_line(Cs, Cont), Drv, Ls, Encoding);
+%% The search item was found and accepted (new line entered on the exact
+%% result found)
+get_line1({_What,Cont={line,_Prompt,_Chars,search_found},Rs}, Drv, Ls0, Encoding) ->
+    Line = edlin:current_line(Cont),
+    %% this may create duplicate entries.
+    Ls = save_line(new_stack(get_lines(Ls0)), Line),
+    get_line1({done, Line, "", Rs}, Drv, Ls, Encoding);
+%% The search mode has been exited, but the user wants to remain in line
+%% editing mode wherever that was, but editing the search result.
+get_line1({What,Cont={line,_Prompt,_Chars,search_quit},Rs}, Drv, Ls, Encoding) ->
+    Line = edlin:current_chars(Cont),
+    %% Load back the old prompt with the correct line number.
+    case get(search_quit_prompt) of
+	undefined -> % should not happen. Fallback.
+	    LsFallback = save_line(new_stack(get_lines(Ls)), Line),
+	    get_line1({done, "\n", Line, Rs}, Drv, LsFallback, Encoding);
+	Prompt -> % redraw the line and keep going with the same stack position
+	    NCont = {line,Prompt,{lists:reverse(Line),[]},none},
+	    send_drv_reqs(Drv, Rs),
+	    send_drv_reqs(Drv, edlin:erase_line(Cont)),
+	    send_drv_reqs(Drv, edlin:redraw_line(NCont)),
+	    get_line1({What, NCont ,[]}, Drv, pad_stack(Ls), Encoding)
+    end;
+%% Search mode is entered.
+get_line1({What,{line,Prompt,{RevCmd0,_Aft},search},Rs},
+       Drv, Ls0, Encoding) ->
+    send_drv_reqs(Drv, Rs),
+    %% Figure out search direction. ^S and ^R are returned through edlin
+    %% whenever we received a search while being already in search mode.
+    {Search, Ls1, RevCmd} = case RevCmd0 of
+	[$\^S|RevCmd1] ->
+	    {fun search_down_stack/2, Ls0, RevCmd1};
+	[$\^R|RevCmd1] ->
+	    {fun search_up_stack/2, Ls0, RevCmd1};
+	_ -> % new search, rewind stack for a proper search.
+	    {fun search_up_stack/2, new_stack(get_lines(Ls0)), RevCmd0}
+    end,
+    Cmd = lists:reverse(RevCmd),
+    {Ls, NewStack} = case Search(Ls1, Cmd) of
+	{none, Ls2} ->
+	    send_drv(Drv, beep),
+	    {Ls2, {RevCmd, "': "}};
+	{Line, Ls2} -> % found. Complete the output edlin couldn't have done.
+	    send_drv_reqs(Drv, [{put_chars, Encoding, Line}]),
+	    {Ls2, {RevCmd, "': "++Line}}
+    end,
+    Cont = {line,Prompt,NewStack,search},
+    more_data(What, Cont, Drv, Ls, Encoding);
 get_line1({What,Cont0,Rs}, Drv, Ls, Encoding) ->
     send_drv_reqs(Drv, Rs),
+    more_data(What, Cont0, Drv, Ls, Encoding).
+
+more_data(What, Cont0, Drv, Ls, Encoding) ->
     receive
 	{Drv,{data,Cs}} ->
 	    get_line1(edlin:edit_line(Cs, Cont0), Drv, Ls, Encoding);
@@ -557,7 +629,6 @@ get_line1({What,Cont0,Rs}, Drv, Ls, Encoding) ->
 	    get_line1(edlin:edit_line([], Cont0), Drv, Ls, Encoding)
     end.
 
-
 get_line_echo_off(Chars, Pbs, Drv) ->
     send_drv_reqs(Drv, [{put_chars, unicode,Pbs}]),
     get_line_echo_off1(edit_line(Chars,[]), Drv).
@@ -632,12 +703,46 @@ save_line({stack, U, {}, []}, Line) ->
 save_line({stack, U, _L, D}, Line) ->
     {stack, U, Line, D}.
 
-get_lines({stack, U, {}, []}) ->
+get_lines(Ls) -> get_all_lines(Ls).
+%get_lines({stack, U, {}, []}) ->
+%    U;
+%get_lines({stack, U, {}, D}) ->
+%    tl(lists:reverse(D, U));
+%get_lines({stack, U, L, D}) ->
+%    get_lines({stack, U, {}, [L|D]}).
+
+%% There's a funny behaviour whenever the line stack doesn't have a "\n"
+%% at its end -- get_lines() seemed to work on the assumption it *will* be
+%% there, but the manipulations done with search history do not require it.
+%%
+%% It is an assumption because the function was built with either the full
+%% stack being on the 'Up' side (we're on the new line) where it isn't
+%% stripped. The only other case when it isn't on the 'Up' side is when
+%% someone has used the up/down arrows (or ^P and ^N) to navigate lines,
+%% in which case, a line with only a \n is stored at the end of the stack
+%% (the \n is returned by edlin:current_line/1).
+%%
+%% get_all_lines works the same as get_lines, but only strips the trailing
+%% character if it's a linebreak. Otherwise it's kept the same. This is
+%% because traversing the stack due to search history will *not* insert
+%% said empty line in the stack at the same time as other commands do,
+%% and thus it should not always be stripped unless we know a new line
+%% is the last entry.
+get_all_lines({stack, U, {}, []}) ->
     U;
-get_lines({stack, U, {}, D}) ->
-    tl(lists:reverse(D, U));
-get_lines({stack, U, L, D}) ->
-    get_lines({stack, U, {}, [L|D]}).
+get_all_lines({stack, U, {}, D}) ->
+    case lists:reverse(D, U) of
+	["\n"|Lines] -> Lines;
+	Lines -> Lines
+    end;
+get_all_lines({stack, U, L, D}) ->
+    get_all_lines({stack, U, {}, [L|D]}).
+
+%% For the same reason as above, though, we need to expand the stack
+%% in some cases to make sure we play nice with up/down arrows. We need
+%% to insert newlines, but not always.
+pad_stack({stack, U, L, D}) ->
+    {stack, U, L, D++["\n"]}.
 
 save_line_buffer("\n", Lines) ->
     save_line_buffer(Lines);
@@ -649,6 +754,27 @@ save_line_buffer(Line, Lines) ->
 save_line_buffer(Lines) ->
     put(line_buffer, Lines).
 
+search_up_stack(Stack, Substr) ->
+    case up_stack(Stack) of
+	{none,NewStack} -> {none,NewStack};
+	{L, NewStack} ->
+	    case string:str(L, Substr) of
+		0 -> search_up_stack(NewStack, Substr);
+		_ -> {string:strip(L,right,$\n), NewStack}
+	    end
+    end.
+
+search_down_stack(Stack, Substr) ->
+    case down_stack(Stack) of
+	{none,NewStack} -> {none,NewStack};
+	{L, NewStack} ->
+	    case string:str(L, Substr) of
+		0 -> search_down_stack(NewStack, Substr);
+		_ -> {string:strip(L,right,$\n), NewStack}
+	    end
+    end.
+
+
 %% This is get_line without line editing (except for backspace) and
 %% without echo.
 get_password_line(Chars, Drv) ->
@@ -687,10 +813,10 @@ edit_password([$\177|Cs],[_|Chars]) ->%% is backspace enough?
 edit_password([Char|Cs],Chars) ->
     edit_password(Cs,[Char|Chars]).
 
-%% prompt_bytes(Prompt)
-%%  Return a flat list of bytes for the Prompt.
-prompt_bytes(Prompt) ->
-    lists:flatten(io_lib:format_prompt(Prompt)).
+%% prompt_bytes(Prompt, Encoding)
+%%  Return a flat list of characters for the Prompt.
+prompt_bytes(Prompt, Encoding) ->
+    lists:flatten(io_lib:format_prompt(Prompt, Encoding)).
 
 cast(L, binary,latin1) when is_list(L) ->
     list_to_binary(L);
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 17ab84c177..9a20baf8d0 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -28,7 +28,6 @@
 	     application_starter,
 	     auth,
 	     code,
-	     packages,
 	     code_server,
 	     dist_util,
 	     erl_boot_server,
diff --git a/lib/kernel/src/packages.erl b/lib/kernel/src/packages.erl
deleted file mode 100644
index e0b1f36b85..0000000000
--- a/lib/kernel/src/packages.erl
+++ /dev/null
@@ -1,158 +0,0 @@
-%%
-%% %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%
-%%
--module(packages).
-
--export([to_string/1, concat/1, concat/2, is_valid/1, is_segmented/1,
-	 split/1, last/1, first/1, strip_last/1, find_modules/1,
-	 find_modules/2]).
-
-%% A package name (or a package-qualified module name) may be an atom or
-%% a string (list of nonnegative integers) - not a deep list, and not a
-%% list containing atoms. A name may be empty, but may not contain two
-%% consecutive period (`.') characters or end with a period character.
-
--type package_name() :: atom() | string().
-
--spec to_string(package_name()) -> string().
-to_string(Name) when is_atom(Name) ->
-    atom_to_list(Name);
-to_string(Name) ->
-    Name.
-
-%% `concat' does not insert a leading period if the first segment is
-%% empty. However, the result may contain leading, consecutive or
-%% dangling period characters, if any of the segments after the first
-%% are empty. Use 'is_valid' to check the result if necessary.
-
--spec concat(package_name(), package_name()) -> string().
-concat(A, B) ->
-    concat([A, B]).
-
--spec concat([package_name()]) -> string().
-concat([H | T]) when is_atom(H) ->
-    concat([atom_to_list(H) | T]);
-concat(["" | T]) ->
-    concat_1(T);
-concat(L) ->
-    concat_1(L).
-
-concat_1([H | T]) when is_atom(H) ->
-    concat_1([atom_to_list(H) | T]);
-concat_1([H]) ->
-    H;
-concat_1([H | T]) ->
-    H ++ "." ++ concat_1(T);
-concat_1([]) ->
-    "";
-concat_1(Name) ->
-    erlang:error({badarg, Name}).
-
--spec is_valid(package_name()) -> boolean().
-is_valid(Name) when is_atom(Name) ->
-    is_valid_1(atom_to_list(Name));
-is_valid([$. | _]) ->
-    false;
-is_valid(Name) ->
-    is_valid_1(Name).
-
-is_valid_1([$.]) -> false;
-is_valid_1([$., $. | _]) -> false;
-is_valid_1([H | T]) when is_integer(H), H >= 0 ->
-    is_valid_1(T);
-is_valid_1([]) -> true;
-is_valid_1(_) -> false.
-
--spec split(package_name()) -> [string()].
-split(Name) when is_atom(Name) ->
-    split_1(atom_to_list(Name), []);
-split(Name) ->
-    split_1(Name, []).
-
-split_1([$. | T], Cs) ->
-    [lists:reverse(Cs) | split_1(T, [])];
-split_1([H | T], Cs) when is_integer(H), H >= 0 ->
-    split_1(T, [H | Cs]);
-split_1([], Cs) ->
-    [lists:reverse(Cs)];
-split_1(_, _) ->
-    erlang:error(badarg).
-
-%% This is equivalent to testing if `split(Name)' yields a list of
-%% length larger than one (i.e., if the name can be split into two or
-%% more segments), but is cheaper.
-
--spec is_segmented(package_name()) -> boolean().
-is_segmented(Name) when is_atom(Name) ->
-    is_segmented_1(atom_to_list(Name));
-is_segmented(Name) ->
-    is_segmented_1(Name).
-
-is_segmented_1([$. | _]) -> true;
-is_segmented_1([H | T]) when is_integer(H), H >= 0 ->
-    is_segmented_1(T);
-is_segmented_1([]) -> false;
-is_segmented_1(_) ->
-    erlang:error(badarg).
-
--spec last(package_name()) -> string().
-last(Name) ->
-    last_1(split(Name)).
-
-last_1([H]) -> H;
-last_1([_ | T]) -> last_1(T).
-
--spec first(package_name()) -> [string()].
-first(Name) ->
-    first_1(split(Name)).
-
-first_1([H | T]) when T =/= [] -> [H | first_1(T)];
-first_1(_) -> [].
-
--spec strip_last(package_name()) -> string().
-strip_last(Name) ->
-    concat(first(Name)).
-
-%% This finds all modules available for a given package, using the
-%% current code server search path. (There is no guarantee that the
-%% modules are loadable; only that the object files exist.)
-
--spec find_modules(package_name()) -> [string()].
-find_modules(P) ->
-    find_modules(P, code:get_path()).
-
--spec find_modules(package_name(), [string()]) -> [string()].
-find_modules(P, Paths) ->
-    P1 = filename:join(packages:split(P)),
-    find_modules(P1, Paths, code:objfile_extension(), sets:new()).
-
-find_modules(P, [Path | Paths], Ext, S0) ->
-    case file:list_dir(filename:join(Path, P)) of
-	{ok, Fs} ->
-	    Fs1 = [F || F <- Fs, filename:extension(F) =:= Ext],
-	    S1 = lists:foldl(fun (F, S) ->
-				     F1 = filename:rootname(F, Ext),
-				     sets:add_element(F1, S)
-			     end,
-			     S0, Fs1),
-	    find_modules(P, Paths, Ext, S1);
-	_ ->
-	    find_modules(P, Paths, Ext, S0)
-    end;   
-find_modules(_P, [], _Ext, S) ->
-    sets:to_list(S).
diff --git a/lib/kernel/src/ram_file.erl b/lib/kernel/src/ram_file.erl
index 48ea871433..ca881ff8a4 100644
--- a/lib/kernel/src/ram_file.erl
+++ b/lib/kernel/src/ram_file.erl
@@ -29,6 +29,7 @@
 %% Specialized file operations
 -export([get_size/1, get_file/1, set_file/2, get_file_close/1]).
 -export([compress/1, uncompress/1, uuencode/1, uudecode/1, advise/4]).
+-export([allocate/3]).
 
 -export([open_mode/1]).  %% used by ftp-file
 
@@ -72,6 +73,7 @@
 -define(RAM_FILE_UUDECODE,       36).
 -define(RAM_FILE_SIZE,           37).
 -define(RAM_FILE_ADVISE,         38).
+-define(RAM_FILE_ALLOCATE,       39).
 
 %% Open modes for RAM_FILE_OPEN
 -define(RAM_FILE_MODE_READ,       1).
@@ -383,6 +385,11 @@ advise(#file_descriptor{module = ?MODULE, data = Port}, Offset,
 advise(#file_descriptor{}, _Offset, _Length, _Advise) ->
     {error, enotsup}.
 
+allocate(#file_descriptor{module = ?MODULE, data = Port}, Offset, Length) ->
+    call_port(Port, <<?RAM_FILE_ALLOCATE, Offset:64/signed, Length:64/signed>>);
+allocate(#file_descriptor{}, _Offset, _Length) ->
+    {error, enotsup}.
+
 
 
 %%%-----------------------------------------------------------------
diff --git a/lib/kernel/src/user.erl b/lib/kernel/src/user.erl
index 88f32df20b..d6449d9e5e 100644
--- a/lib/kernel/src/user.erl
+++ b/lib/kernel/src/user.erl
@@ -81,7 +81,7 @@ server(PortName,PortSettings) ->
 
 run(P) ->
     put(read_mode,list),
-    put(unicode,false),
+    put(encoding,latin1),
     case init:get_argument(noshell) of
 	%% non-empty list -> noshell
 	{ok, [_|_]} -> 
@@ -191,39 +191,27 @@ do_io_request(Req, From, ReplyAs, Port, Q0) ->
 %% New in R13B
 %% Encoding option (unicode/latin1)
 io_request({put_chars,unicode,Chars}, Port, Q) -> % Binary new in R9C
-    put_chars(wrap_characters_to_binary(Chars,unicode,
-					case get(unicode) of 
-					    true -> unicode;
-					    _ -> latin1
-					end), Port, Q);
+    put_chars(wrap_characters_to_binary(Chars,unicode, get(encoding)), Port, Q);
 io_request({put_chars,unicode,Mod,Func,Args}, Port, Q) ->
     Result = case catch apply(Mod,Func,Args) of
 		 Data when is_list(Data); is_binary(Data) ->
-		     wrap_characters_to_binary(Data,unicode,
-					       case get(unicode) of 
-						   true -> unicode;
-						   _ -> latin1
-					       end);
+		     wrap_characters_to_binary(Data,unicode,get(encoding));
 		 Undef ->
 		     Undef
 	     end,
     put_chars(Result, Port, Q);
 io_request({put_chars,latin1,Chars}, Port, Q) -> % Binary new in R9C
-    Data = case get(unicode) of
-	       true ->
+    Data = case get(encoding) of
+	       unicode ->
 		   unicode:characters_to_binary(Chars,latin1,unicode);
-	       false ->
+	       latin1 ->
 		   erlang:iolist_to_binary(Chars)
 	   end,
     put_chars(Data, Port, Q);
 io_request({put_chars,latin1,Mod,Func,Args}, Port, Q) ->
     Result = case catch apply(Mod,Func,Args) of
 		 Data when is_list(Data); is_binary(Data) ->
-		     unicode:characters_to_binary(Data,latin1,
-						  case get(unicode) of 
-						      true -> unicode;
-						      _ -> latin1
-						  end);
+		     unicode:characters_to_binary(Data,latin1,get(encoding));
 		 Undef ->
 		     Undef
 	     end,
@@ -351,9 +339,9 @@ check_valid_opts(_) ->
 do_setopts(Opts, _Port, Q) ->
     case proplists:get_value(encoding,Opts) of
 	Valid when Valid =:= unicode; Valid =:= utf8 ->
-	    put(unicode,true);
+	    put(encoding,unicode);
 	latin1 ->
-	    put(unicode,false);
+	    put(encoding,latin1);
 	undefined ->
 	    ok
     end,
@@ -370,12 +358,7 @@ do_setopts(Opts, _Port, Q) ->
 
 getopts(_Port,Q) ->
     Bin = {binary, get(read_mode) =:= binary},
-    Uni = {encoding, case get(unicode) of
-		       true ->
-			   unicode;
-		       _ ->
-			   latin1
-		   end},
+    Uni = {encoding, get(encoding)},
     {ok,[Bin,Uni],Q}.
 
 
@@ -575,31 +558,32 @@ binrev(L, T) ->
 %%  		    end
 %%  	    end
 %%      end.
-%% get_chars(Prompt, Module, Function, XtraArg, Port, Queue)
+%% get_chars(Prompt, Module, Function, XtraArg, Port, Queue, Encoding)
 %%  Gets characters from the input port until the applied function
 %%  returns {stop,Result,RestBuf}. Does not block output until input 
-%%  has been received.
+%%  has been received. Encoding is the encoding of the data sent to
+%%  the client and to Function.
 %%  Returns:
 %%	{Status,Result,NewQueue}
 %%	{exit,Reason}
     
 %% Entry function.
-get_chars(Prompt, M, F, Xa, Port, Q, Fmt) ->
+get_chars(Prompt, M, F, Xa, Port, Q, Enc) ->
     prompt(Port, Prompt),
     case {get(eof),queue:is_empty(Q)} of
 	{true,true} ->
 	    {ok,eof,Q};
 	_ ->
-	    get_chars(Prompt, M, F, Xa, Port, Q, start, Fmt)
+	    get_chars(Prompt, M, F, Xa, Port, Q, start, Enc)
     end.
 
 %% First loop. Wait for port data. Respond to output requests.
-get_chars(Prompt, M, F, Xa, Port, Q, State, Fmt) ->
+get_chars(Prompt, M, F, Xa, Port, Q, State, Enc) ->
     case queue:is_empty(Q) of
 	true ->
 	    receive
 		{Port,{data,Bytes}} ->
-		    get_chars_bytes(State, M, F, Xa, Port, Q, Bytes, Fmt);
+		    get_chars_bytes(State, M, F, Xa, Port, Q, Bytes, Enc);
 		{Port, eof} ->
 		    put(eof, true),
 		    {ok, eof, []};
@@ -610,41 +594,41 @@ get_chars(Prompt, M, F, Xa, Port, Q, State, Fmt) ->
                     do_io_request(Req, From, ReplyAs, Port, 
                                   queue:new()), %Keep Q over this call
                     %% No prompt.
-                    get_chars(Prompt, M, F, Xa, Port, Q, State, Fmt);
+                    get_chars(Prompt, M, F, Xa, Port, Q, State, Enc);
 		{io_request,From,ReplyAs,Request} when is_pid(From) ->
 		    get_chars_req(Prompt, M, F, Xa, Port, Q, State,
-				  Request, From, ReplyAs, Fmt);
+				  Request, From, ReplyAs, Enc);
 		{'EXIT',From,What} when node(From) =:= node() ->
 		    {exit,What}
 	    end;
 	false ->
-	    get_chars_apply(State, M, F, Xa, Port, Q, Fmt)
+	    get_chars_apply(State, M, F, Xa, Port, Q, Enc)
     end.
 
 get_chars_req(Prompt, M, F, XtraArg, Port, Q, State,
-	      Req, From, ReplyAs, Fmt) ->
+	      Req, From, ReplyAs, Enc) ->
     do_io_request(Req, From, ReplyAs, Port, queue:new()), %Keep Q over this call
     prompt(Port, Prompt),
-    get_chars(Prompt, M, F, XtraArg, Port, Q, State, Fmt).
+    get_chars(Prompt, M, F, XtraArg, Port, Q, State, Enc).
 
 %% Second loop. Pass data to client as long as it wants more.
 %% A ^G in data interrupts loop if 'noshell' is not undefined.
-get_chars_bytes(State, M, F, Xa, Port, Q, Bytes, Fmt) ->
+get_chars_bytes(State, M, F, Xa, Port, Q, Bytes, Enc) ->
     case get(shell) of
 	noshell ->
-	    get_chars_apply(State, M, F, Xa, Port, queue:snoc(Q, Bytes),Fmt);
+	    get_chars_apply(State, M, F, Xa, Port, queue:snoc(Q, Bytes),Enc);
 	_ ->
 	    case contains_ctrl_g_or_ctrl_c(Bytes) of
 		false ->
 		    get_chars_apply(State, M, F, Xa, Port, 
-				    queue:snoc(Q, Bytes),Fmt);
+				    queue:snoc(Q, Bytes),Enc);
 		_ ->
 		    throw(new_shell)
 	    end
     end.
 
-get_chars_apply(State0, M, F, Xa, Port, Q, Fmt) ->
-    case catch M:F(State0, cast(queue:head(Q),Fmt), Fmt, Xa) of
+get_chars_apply(State0, M, F, Xa, Port, Q, Enc) ->
+    case catch M:F(State0, cast(queue:head(Q),Enc), Enc, Xa) of
 	{stop,Result,<<>>} ->
 	    {ok,Result,queue:tail(Q)};
 	{stop,Result,[]} ->
@@ -653,32 +637,32 @@ get_chars_apply(State0, M, F, Xa, Port, Q, Fmt) ->
 	    {ok,Result,queue:tail(Q)};
 	{stop,Result,Buf} ->
 	    {ok,Result,queue:cons(Buf, queue:tail(Q))};
-	{'EXIT',_} ->
+	{'EXIT',_Why} ->
 	    {error,{error,err_func(M, F, Xa)},queue:new()};
 	State1 ->
-	    get_chars_more(State1, M, F, Xa, Port, queue:tail(Q), Fmt)
+	    get_chars_more(State1, M, F, Xa, Port, queue:tail(Q), Enc)
     end.
 
-get_chars_more(State, M, F, Xa, Port, Q, Fmt) ->
+get_chars_more(State, M, F, Xa, Port, Q, Enc) ->
     case queue:is_empty(Q) of
 	true ->
 	    case get(eof) of
 		undefined ->
 		    receive
 			{Port,{data,Bytes}} ->
-			    get_chars_bytes(State, M, F, Xa, Port, Q, Bytes, Fmt);
+			    get_chars_bytes(State, M, F, Xa, Port, Q, Bytes, Enc);
 			{Port,eof} ->
 			    put(eof, true),
 			    get_chars_apply(State, M, F, Xa, Port, 
-					    queue:snoc(Q, eof), Fmt);
+					    queue:snoc(Q, eof), Enc);
 			{'EXIT',From,What} when node(From) =:= node() ->
 			    {exit,What}
 		    end;
 		_ ->
-		    get_chars_apply(State, M, F, Xa, Port, queue:snoc(Q, eof), Fmt)
+		    get_chars_apply(State, M, F, Xa, Port, queue:snoc(Q, eof), Enc)
 	    end;
 	false ->
-	    get_chars_apply(State, M, F, Xa, Port, Q, Fmt)
+	    get_chars_apply(State, M, F, Xa, Port, Q, Enc)
     end.
 
 
@@ -689,11 +673,10 @@ get_chars_more(State, M, F, Xa, Port, Q, Fmt) ->
 prompt(_Port, '') -> ok;
 
 prompt(Port, Prompt) ->
-    put_port(wrap_characters_to_binary(io_lib:format_prompt(Prompt),unicode,
-				       case get(unicode) of 
-					   true -> unicode;
-					   _ -> latin1
-				       end), Port).
+    Encoding = get(encoding),
+    put_port(wrap_characters_to_binary(io_lib:format_prompt(Prompt, Encoding),
+                                       unicode, Encoding),
+             Port).
 
 %% Convert error code to make it look as before
 err_func(io_lib, get_until, {_,F,_}) ->
@@ -710,56 +693,65 @@ contains_ctrl_g_or_ctrl_c(BinOrList)->
     end.
 
 %% Convert a buffer between list and binary
-cast(Data, _Format) when is_atom(Data) ->
+cast(Data, _Encoding) when is_atom(Data) ->
     Data;
-cast(Data, Format) ->
-    cast(Data, get(read_mode), Format, get(unicode)).
+cast(Data, Encoding) ->
+    IoEncoding =  get(encoding),
+    cast(Data, get(read_mode), IoEncoding, Encoding).
 
-cast(B, binary, latin1, false) when is_binary(B) ->
+cast(B, binary, latin1, latin1) when is_binary(B) ->
     B;
-cast(B, binary, latin1, true) when is_binary(B) ->
-    unicode:characters_to_binary(B, unicode, latin1);
-cast(L, binary, latin1, false) ->
-    erlang:iolist_to_binary(L);
-cast(L, binary, latin1, true) ->
-    case unicode:characters_to_binary(
-	   erlang:iolist_to_binary(L),unicode,latin1) of % may fail
-	{error,_,_} -> exit({no_translation, unicode, latin1});
-	Else -> Else
+cast(L, binary, latin1, latin1) ->
+    case catch erlang:iolist_to_binary(L) of
+        Bin when is_binary(Bin) -> Bin;
+        _ -> exit({no_translation, latin1, latin1})
+    end;
+cast(Data, binary, unicode, latin1) when is_binary(Data); is_list(Data) ->
+    case catch unicode:characters_to_binary(Data, unicode, latin1) of
+        Bin when is_binary(Bin) -> Bin;
+        _ -> exit({no_translation, unicode, latin1})
+    end;
+cast(Data, binary, latin1, unicode) when is_binary(Data); is_list(Data) ->
+    case catch unicode:characters_to_binary(Data, latin1, unicode) of
+        Bin when is_binary(Bin) -> Bin;
+        _ -> exit({no_translation, latin1, unicode})
     end;
-cast(B, binary, unicode, true) when is_binary(B) ->
+cast(B, binary, unicode, unicode) when is_binary(B) ->
     B;
-cast(B, binary, unicode, false) when is_binary(B) ->
-    unicode:characters_to_binary(B,latin1,unicode);
-cast(L, binary, unicode, true) ->
-    % possibly a list containing UTF-8 encoded characters
-    unicode:characters_to_binary(erlang:iolist_to_binary(L));
-cast(L, binary, unicode, false) ->
-    unicode:characters_to_binary(L, latin1, unicode);
-cast(L, list, latin1, UniTerm) ->
-    case UniTerm of
-	true -> % Convert input characters to protocol format (i.e latin1)
-	    case unicode:characters_to_list(
-		   erlang:iolist_to_binary(L),unicode) of % may fail
-		{error,_,_} -> exit({no_translation, unicode, latin1});
-		Else -> [ case X of 
-			      High when High > 255 -> 
-				  exit({no_translation, unicode, latin1}); 
-			      Low -> 
-				  Low 
-			  end || X <- Else ]
-	    end;
-	_ ->
-	    binary_to_list(erlang:iolist_to_binary(L))
+cast(L, binary, unicode, unicode) ->
+    case catch unicode:characters_to_binary(L, unicode) of
+        Bin when is_binary(Bin) -> Bin;
+        _ -> exit({no_translation, unicode, unicode})
     end;
-cast(L, list, unicode, UniTerm)  ->
-    unicode:characters_to_list(erlang:iolist_to_binary(L),
-			       case UniTerm of 
-				   true -> unicode; 
-				   _ -> latin1 
-			       end);
-cast(Other, _, _,_) ->
-    Other.
+cast(B, list, latin1, latin1) when is_binary(B) ->
+    binary_to_list(B);
+cast(L, list, latin1, latin1) ->
+    case catch erlang:iolist_to_binary(L) of
+        Bin when is_binary(Bin) -> binary_to_list(Bin);
+        _ -> exit({no_translation, latin1, latin1})
+    end;
+cast(Data, list, unicode, latin1) when is_binary(Data); is_list(Data) ->
+    case catch unicode:characters_to_list(Data, unicode) of
+        Chars when is_list(Chars) ->
+            [ case X of 
+                  High when High > 255 -> 
+                      exit({no_translation, unicode, latin1}); 
+                  Low -> 
+                      Low 
+              end || X <- Chars ];
+        _ ->
+            exit({no_translation, unicode, latin1})
+    end;
+cast(Data, list, latin1, unicode) when is_binary(Data); is_list(Data) ->
+    case catch unicode:characters_to_list(Data, latin1) of
+        Chars when is_list(Chars) -> Chars;
+        _ -> exit({no_translation, latin1, unicode})
+    end;
+cast(Data, list, unicode, unicode) when is_binary(Data); is_list(Data) ->
+    case catch unicode:characters_to_list(Data, unicode) of
+        Chars when is_list(Chars) -> Chars;
+        _ -> exit({no_translation, unicode, unicode})
+    end.
 
 wrap_characters_to_binary(Chars,unicode,latin1) ->
     case unicode:characters_to_binary(Chars,unicode,latin1) of
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 8eca37029d..8d2d55777b 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -48,6 +48,7 @@ MODULES= \
 	erl_distribution_SUITE \
 	erl_distribution_wb_SUITE \
 	erl_prim_loader_SUITE \
+	error_handler_SUITE \
 	error_logger_SUITE \
 	error_logger_warn_SUITE \
 	file_SUITE \
@@ -73,6 +74,7 @@ MODULES= \
 	seq_trace_SUITE \
 	wrap_log_reader_SUITE \
 	cleanup \
+	ignore_cores \
 	zlib_SUITE \
 	loose_node \
 	sendfile_SUITE
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index f469a0af98..2ca8840e1f 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -27,7 +27,7 @@
 	 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,
 	 otp_5606/1,
-	 start_phases/1, get_key/1, 
+	 start_phases/1, get_key/1, get_env/1,
 	 permit_false_start_local/1, permit_false_start_dist/1, script_start/1, 
 	 nodedown_start/1, init2973/0, loop2973/0, loop5606/1]).
 
@@ -49,7 +49,7 @@ all() ->
     [failover, failover_comp, permissions, load,
      load_use_cache, {group, reported_bugs}, start_phases,
      script_start, nodedown_start, permit_false_start_local,
-     permit_false_start_dist, get_key,
+     permit_false_start_dist, get_key, get_env,
      {group, distr_changed}, config_change, shutdown_func, shutdown_timeout].
 
 groups() -> 
@@ -1503,6 +1503,15 @@ loop5606(Pid) ->
 	    Pid ! {self(), Res}
     end.
 	    
+get_env(suite) -> [];
+get_env(doc) ->
+    ["Tests get_env/* functions"];
+get_env(Conf) when is_list(Conf) ->
+    {ok, _}   = application:get_env(kernel, error_logger),
+    undefined = application:get_env(undefined_app, a),
+    undefined = application:get_env(kernel, error_logger_xyz),
+    default   = application:get_env(kernel, error_logger_xyz, default),
+    ok.
 
 %%-----------------------------------------------------------------
 %% Should be started in a CC view with:
diff --git a/lib/kernel/test/error_handler_SUITE.erl b/lib/kernel/test/error_handler_SUITE.erl
new file mode 100644
index 0000000000..2a86d39b74
--- /dev/null
+++ b/lib/kernel/test/error_handler_SUITE.erl
@@ -0,0 +1,68 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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(error_handler_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 undefined_function_handler/1]).
+
+%% Callback from error_handler.
+-export(['$handle_undefined_function'/2]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [undefined_function_handler].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%-----------------------------------------------------------------
+
+undefined_function_handler(_) ->
+    42 = ?MODULE:forty_two(),
+    42 = (id(?MODULE)):forty_two(),
+    {ok,{a,b,c}} = ?MODULE:one_arg({a,b,c}),
+    {ok,{a,b,c}} = (id(?MODULE)):one_arg({a,b,c}),
+    {'EXIT',{undef,[{?MODULE,undef_and_not_handled,[[1,2,3]],[]}|_]}} =
+	(catch ?MODULE:undef_and_not_handled([1,2,3])),
+    ok.
+
+'$handle_undefined_function'(forty_two, []) ->
+    42;
+'$handle_undefined_function'(one_arg, [Arg]) ->
+    {ok,Arg};
+'$handle_undefined_function'(Func, Args) ->
+    error_handler:raise_undef_exception(?MODULE, Func, Args).
+
+id(I) ->
+    I.
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index 265e1ae4c8..2bf467610e 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -310,7 +310,7 @@ nice_stop_node(Name) ->
 	{nodedown,Name} -> ok
     end.
 
-%rensa rd() f�re varje rapport-test s� man bara f�r en fil...
+%clean out rd() before each report test in order to get only one file...
 clean_rd() ->
     {ok,L} = file:list_dir(rd()),
     lists:foreach(fun(F) ->
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 9c507fd437..914f0d6127 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -84,6 +84,8 @@
 
 -export([advise/1]).
 
+-export([allocate/1]).
+
 -export([standard_io/1,mini_server/1]).
 
 %% Debug exports
@@ -116,7 +118,7 @@ groups() ->
      {files, [],
       [{group, open}, {group, pos}, {group, file_info},
        {group, consult}, {group, eval}, {group, script},
-       truncate, sync, datasync, advise]},
+       truncate, sync, datasync, advise, allocate]},
      {open, [],
       [open1, old_modes, new_modes, path_open, close, access,
        read_write, pread_write, append, open_errors,
@@ -1617,6 +1619,74 @@ advise(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
+allocate(suite) -> [];
+allocate(doc) -> "Tests that ?FILE_MODULE:allocate/3 at least doesn't crash.";
+allocate(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line Allocate = filename:join(PrivDir,
+			       atom_to_list(?MODULE)
+			       ++"_allocate.fil"),
+
+    Line1 = "Hello\n",
+    Line2 = "World!\n",
+
+    ?line {ok, Fd} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd, 1, iolist_size([Line1, Line2])),
+    ?line ok = io:format(Fd, "~s", [Line1]),
+    ?line ok = io:format(Fd, "~s", [Line2]),
+    ?line ok = ?FILE_MODULE:close(Fd),
+
+    ?line {ok, Fd2} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd2, 1, iolist_size(Line1)),
+    ?line ok = io:format(Fd2, "~s", [Line1]),
+    ?line ok = io:format(Fd2, "~s", [Line2]),
+    ?line ok = ?FILE_MODULE:close(Fd2),
+
+    ?line {ok, Fd3} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd3, 1, iolist_size(Line1) + 1),
+    ?line ok = io:format(Fd3, "~s", [Line1]),
+    ?line ok = io:format(Fd3, "~s", [Line2]),
+    ?line ok = ?FILE_MODULE:close(Fd3),
+
+    ?line {ok, Fd4} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd4, 1, 4 * iolist_size([Line1, Line2])),
+    ?line ok = io:format(Fd4, "~s", [Line1]),
+    ?line ok = io:format(Fd4, "~s", [Line2]),
+    ?line ok = ?FILE_MODULE:close(Fd4),
+
+    ?line [] = flush(),
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+allocate_and_assert(Fd, Offset, Length) ->
+    % Just verify that calls to ?PRIM_FILE:allocate/3 don't crash or have
+    % any other negative side effect. We can't really asssert against a
+    % specific return value, because support for file space pre-allocation
+    % depends on the OS, OS version and underlying filesystem.
+    %
+    % The Linux kernel added support for fallocate() in version 2.6.23,
+    % which currently works only for the ext4, ocfs2, xfs and btrfs file
+    % systems. posix_fallocate() is available in glibc as of version
+    % 2.1.94, but it was buggy until glibc version 2.7.
+    %
+    % Mac OS X, as of version 10.3, supports the fcntl operation F_PREALLOCATE.
+    %
+    % Solaris supports posix_fallocate() but only for the UFS file system
+    % apparently (not supported for ZFS).
+    %
+    % FreeBSD 9.0 is the first FreeBSD release supporting posix_fallocate().
+    %
+    % For Windows there's apparently no way to pre-allocate file space, at
+    % least with same semantics as posix_fallocate(), fallocate() and
+    % fcntl F_PREALLOCATE.
+    Result = ?FILE_MODULE:allocate(Fd, Offset, Length),
+    case os:type() of
+        {win32, _} ->
+            ?line {error, enotsup} = Result;
+        _ ->
+            ?line _ = Result
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 3aa010a708..40bde8a736 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -1,4 +1,5 @@
 -module(file_name_SUITE).
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -336,7 +337,7 @@ check_normal(Mod) ->
 check_icky(Mod) -> 
     {ok,Dir} = Mod:get_cwd(),
     try
-	?line true=(length("���") =:= 3),
+	?line true=(length("åäö") =:= 3),
 	?line UniMode = file:native_name_encoding() =/= latin1,
 	?line make_icky_dir(Mod),
  	?line {ok, L0} = Mod:list_dir("."),
@@ -357,42 +358,42 @@ check_icky(Mod) ->
  		 || {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 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 {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"),
+        ?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 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:delete(<<"ååå">>),
 		?line {ok,[]} = Mod:list_dir("."),
 		?line ok = Mod:set_cwd(".."),
-		?line rm_r2(Mod,"���_dir");
+		?line rm_r2(Mod,"åäö_dir");
 	    false ->
 		ok
 	end,
 
- 	?line chk_cre_dir(Mod,[{directory,treat_icky(<<"���_dir">>),icky_dir()}]),
+        ?line chk_cre_dir(Mod,[{directory,treat_icky(<<"åäö_dir">>),icky_dir()}]),
 	if 
 	    UniMode and (OS =/= win32) ->
-		?line {error,enoent} = Mod:set_cwd("���_dir");
+		?line {error,enoent} = Mod:set_cwd("åäö_dir");
 	    true ->
 		ok
 	end,
-	?line ok = Mod:set_cwd(treat_icky(<<"���_dir">>)),
+	?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
@@ -400,22 +401,22 @@ check_icky(Mod) ->
  	?line true = BeginAt =/= NowAt2,
  	?line ok = Mod:set_cwd(".."),
  	?line {ok,BeginAt} = Mod:get_cwd(),
- 	?line rm_r2(Mod,conv(treat_icky(<<"���_dir">>))),
+        ?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 = 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�">>));
+		?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,
@@ -430,42 +431,42 @@ check_icky(Mod) ->
  	      ?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","åäö_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">>)),
+        ?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");
+		{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 {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 {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 = 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 {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">>)),
+        ?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),
@@ -475,7 +476,7 @@ check_icky(Mod) ->
 check_very_icky(Mod) -> 
     {ok,Dir} = Mod:get_cwd(),
     try
-	?line true=(length("���") =:= 3),
+	?line true=(length("åäö") =:= 3),
 	?line UniMode = file:native_name_encoding() =/= latin1,
 	if
 	    not UniMode ->
@@ -497,7 +498,7 @@ check_very_icky(Mod) ->
  	?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 {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),
@@ -514,16 +515,16 @@ check_very_icky(Mod) ->
 		?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 = 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�">>),
+		    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�">>);
+		?line {error,enoent} = Mod:read_file(<<"nisseö">>),
+		?line {error,enoent} = Mod:read_link_info(<<"nisseö">>);
 	    false ->
 		ok
 	end,
@@ -540,10 +541,10 @@ check_very_icky(Mod) ->
  	  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 {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 {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]),
@@ -574,9 +575,9 @@ check_very_icky(Mod) ->
 			       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",
+	?line SF3 = unicode:characters_to_binary("åäösubfil3",
                                                  file:native_name_encoding()),
-	?line SF2 = case treat_icky(<<"���subfil2">>) of
+	?line SF2 = case treat_icky(<<"åäösubfil2">>) of
 	                LF2 when is_list(LF2) ->
 			    unicode:characters_to_binary(LF2,
 			                      file:native_name_encoding());
@@ -584,7 +585,7 @@ check_very_icky(Mod) ->
 			    BF2
 	            end,		      
 	?line Sorted = lists:sort([SF3,SF2]),
-	?line Sorted = lists:sort(filelib:wildcard("*",<<"���subdir2">>)),
+	?line Sorted = lists:sort(filelib:wildcard("*",<<"åäösubdir2">>)),
 	ok
     catch
 	throw:need_unicode_mode ->
@@ -744,26 +745,26 @@ hopeless_darwin() ->
 
 icky_dir() ->
     [{regular,"fil1","fil1"},
-     {regular,"���2","���2"}] ++
+     {regular,"åäö2","åäö2"}] ++
 	case has_links() of
 	    true ->
-		[{regular,"���3","���2"},
-		 {symlink,"���4","���2"}];
+		[{regular,"åäö3","åäö2"},
+		 {symlink,"åäö4","åäö2"}];
 	    false ->
 		[]
 	end ++
-	[{regular,treat_icky(<<"���5">>),"���5"}] ++
+	[{regular,treat_icky(<<"åäö5">>),"åäö5"}] ++
 	 case has_links() of
 	     true -> 
-		 [{symlink,treat_icky(<<"���6">>),treat_icky(<<"���5">>)}];
+		 [{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"}]}].
+	[{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"),
@@ -774,26 +775,26 @@ make_very_icky_dir(Mod) ->
 
 very_icky_dir() ->
     [{regular,"fil1","fil1"},
-     {regular,[956,965,963,954,959,49],"���2"}] ++
+     {regular,[956,965,963,954,959,49],"åäö2"}] ++
 	case has_links() of
 	    true ->
-		[{regular,[956,965,963,954,959,50],"���2"},
+		[{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"}] ++
+     [{regular,treat_icky(<<"åäö5">>),"åäö5"}] ++
 	case has_links() of
 	    true ->
-		[{symlink,treat_icky(<<"���6">>),treat_icky(<<"���5">>)}];
+		[{symlink,treat_icky(<<"åäö6">>),treat_icky(<<"åäö5">>)}];
 	    false -> 
 		[]
 	end ++
-      [{directory,treat_icky(<<"���subdir2">>),
-      [{regular,treat_icky(<<"���subfil2">>),"���subfil12"},
-       {regular,"���subfil3","���subfil13"}]},
+      [{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"}]}].
+       [{regular,[956,965,963,954,959]++"subfil1","åäösubfil1"}]}].
 
 %% Some OS'es simply do not allow non UTF8 filenames
 treat_icky(Bin) ->
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 5d45b91ee5..93dc2a69d1 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -47,7 +47,7 @@
 
 %% Internal exports.
 -export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, 
-	 otp_7731_server/1, zombie_server/2]).
+	 otp_7731_server/1, zombie_server/2, do_iter_max_socks/2]).
 
 init_per_testcase(_Func, Config) when is_list(Config) ->
     Dog = test_server:timetrap(test_server:seconds(240)),
@@ -589,7 +589,13 @@ iter_max_socks(doc) ->
      "that we get the same number of sockets every time."];
 iter_max_socks(Config) when is_list(Config) ->
     N = 20,
-    L = do_iter_max_socks(N, initalize),
+    %% Run on a different node in order to limit the effect if this test fails.
+    Dir = filename:dirname(code:which(?MODULE)),
+    {ok,Node} = test_server:start_node(test_iter_max_socks,slave,
+				       [{args,"-pa " ++ Dir}]),
+    L = rpc:call(Node,?MODULE,do_iter_max_socks,[N, initalize]),
+    test_server:stop_node(Node),
+
     io:format("Result: ~p",[L]),
     all_equal(L),
     {comment, "Max sockets: " ++ integer_to_list(hd(L))}.
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index 2354f8accd..cd768813cf 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -442,7 +443,7 @@ open_fd(suite) ->
 open_fd(doc) ->
     ["Test that the 'fd' option works"];
 open_fd(Config) when is_list(Config) ->
-    Msg = "Det g�r ont n�r knoppar brista. Varf�r skulle annars v�ren tveka?",
+    Msg = "Det gör ont när knoppar brista. Varför skulle annars våren tveka?",
     Addr = {127,0,0,1},
     {ok,S1}   = gen_udp:open(0),
     {ok,P2} = inet:port(S1),
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index b40c50f79f..9428a38660 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -91,27 +91,9 @@ 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.
 
 
@@ -135,8 +117,7 @@ end_per_testcase(_Case, Config) ->
     ?line write_high_level_trace(Config),
     ?line _ = 
         gen_server:call(global_name_server, high_level_trace_stop, infinity),
-    ?line[global:unregister_name(N) || N <- global:registered_names(), 
-                                       N =/= test_server],
+    [global:unregister_name(N) || N <- global:registered_names()],
     ?line InitRegistered = ?registered,
     ?line Registered = registered(),
     ?line [io:format("~s local names: ~p~n", [What, N]) ||
@@ -1840,16 +1821,16 @@ do_otp_3162(StartFun, Config) ->
     ?line ?UNTIL
        ([Cp3] =:= lists:sort(rpc:call(Cp1, erlang, nodes, [])) -- [node()]),
 
-    ?line ?UNTIL([kalle, test_server, vera] =:=
+    ?UNTIL([kalle, vera] =:=
 	   lists:sort(rpc:call(Cp1, global, registered_names, []))),
     ?line ?UNTIL
        ([Cp3] =:= lists:sort(rpc:call(Cp2, erlang, nodes, [])) -- [node()]),
-    ?line ?UNTIL([stina, test_server, vera] =:=
+    ?UNTIL([stina, vera] =:=
            lists:sort(rpc:call(Cp2, global, registered_names, []))),
     ?line ?UNTIL
        ([Cp1, Cp2] =:= 
         lists:sort(rpc:call(Cp3, erlang, nodes, [])) -- [node()]),
-    ?line ?UNTIL([kalle, stina, test_server, vera] =:=
+    ?UNTIL([kalle, stina, vera] =:=
   	   lists:sort(rpc:call(Cp3, global, registered_names, []))),
 
     ?line pong = rpc:call(Cp2, net_adm, ping, [Cp1]),
@@ -1860,17 +1841,17 @@ do_otp_3162(StartFun, Config) ->
     ?line 
     ?UNTIL(begin
 	       NN = lists:sort(rpc:call(Cp1, global, registered_names, [])),
-	       [kalle, stina, test_server, vera] =:= NN
+	       [kalle, stina, vera] =:= NN
 	   end),
     ?line ?UNTIL
        ([Cp1, Cp3] =:=
         lists:sort(rpc:call(Cp2, erlang, nodes, [])) -- [node()]),
-    ?line ?UNTIL([kalle, stina, test_server, vera] =:=
+    ?UNTIL([kalle, stina, vera] =:=
 	lists:sort(rpc:call(Cp2, global, registered_names, []))),
     ?line ?UNTIL
        ([Cp1, Cp2] =:=
         lists:sort(rpc:call(Cp3, erlang, nodes, [])) -- [node()]),
-    ?line ?UNTIL([kalle, stina, test_server, vera] =:=
+    ?UNTIL([kalle, stina, vera] =:=
  	lists:sort(rpc:call(Cp3, global, registered_names, []))),
 
     write_high_level_trace(Config),
@@ -4154,7 +4135,7 @@ init_condition(Config) ->
                         {"Global Locks     (ETS)", global_locks},
                         {"Global Pid Names (ETS)", global_pid_names},
                         {"Global Pid Ids   (ETS)", global_pid_ids}]],
-    ?UNTIL([test_server] =:= global:registered_names()),
+    ?UNTIL([] =:= global:registered_names()),
     ?UNTIL([] =:= nodes()),
     ?UNTIL([node()] =:= get_known(node())),
     ok.
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 2ec3b7c297..320b23bea1 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -83,10 +83,10 @@ init_per_suite(Config) when is_list(Config) ->
 	{win32, windows} ->
 	    {skipped, "No use to run on Windows 95/98"};
 	_ ->
-	    Config
+	    ignore_cores:init(Config)
     end.
 end_per_suite(Config) when is_list(Config) ->
-    Config.
+    ignore_cores:fini(Config).
 
 
 start_check(Type, Name) ->
@@ -188,8 +188,20 @@ reboot(Config) when is_list(Config) ->
 %%   Check that a node is up and running after a crash.
 %%   This test exhausts the atom table on the remote node.
 %%   ERL_CRASH_DUMP_SECONDS=0 will force beam not to dump an erl_crash.dump.
+%% May currently dump core in beam debug build due to lock-order violation
+%% This should be removed when a non-lockad information retriever is implemented
+%% for crash dumps
 node_start_immediately_after_crash(suite) -> {req, [{time, 10}]};
 node_start_immediately_after_crash(Config) when is_list(Config) ->
+    Config2 = ignore_cores:setup(?MODULE, node_start_immediately_after_crash, Config, true),
+    try
+	node_start_immediately_after_crash_test(Config2)
+    after
+	ignore_cores:restore(Config2)
+    end.
+ 
+
+node_start_immediately_after_crash_test(Config) when is_list(Config) ->
     {ok, Node} = start_check(loose, heart_test_imm, [{"ERL_CRASH_DUMP_SECONDS", "0"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
@@ -228,8 +240,19 @@ node_start_immediately_after_crash(Config) when is_list(Config) ->
 %%   This test exhausts the atom table on the remote node.
 %%   ERL_CRASH_DUMP_SECONDS=10 will force beam
 %%   to only dump an erl_crash.dump for 10 seconds.
+%% May currently dump core in beam debug build due to lock-order violation
+%% This should be removed when a non-lockad information retriever is implemented
+%% for crash dumps
 node_start_soon_after_crash(suite) -> {req, [{time, 10}]};
 node_start_soon_after_crash(Config) when is_list(Config) ->
+    Config2 = ignore_cores:setup(?MODULE, node_start_soon_after_crash, Config, true),
+    try
+	node_start_soon_after_crash_test(Config2)
+    after
+	ignore_cores:restore(Config2)
+    end.
+ 
+node_start_soon_after_crash_test(Config) when is_list(Config) ->
     {ok, Node} = start_check(loose, heart_test_soon, [{"ERL_CRASH_DUMP_SECONDS", "10"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
diff --git a/lib/kernel/test/ignore_cores.erl b/lib/kernel/test/ignore_cores.erl
new file mode 100644
index 0000000000..8b1ac0fe6c
--- /dev/null
+++ b/lib/kernel/test/ignore_cores.erl
@@ -0,0 +1,158 @@
+%%
+%% %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/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index a56746bbc4..4e93a593b3 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -57,6 +57,8 @@
 %% System probe functions that might be handy to check from the shell
 -export([unix_free/1]).
 
+-export([allocate/1]).
+
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
@@ -87,7 +89,7 @@ groups() ->
        cur_dir_1a, cur_dir_1b]},
      {files, [],
       [{group, open}, {group, pos}, {group, file_info},
-       truncate, sync, datasync, advise, large_write]},
+       truncate, sync, datasync, advise, large_write, allocate]},
      {open, [],
       [open1, modes, close, access, read_write, pread_write,
        append, exclusive]},
@@ -1359,6 +1361,76 @@ check_large_write(Dog, Fd, _, _, []) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+allocate(suite) -> [];
+allocate(doc) -> "Tests that ?PRIM_FILE:allocate/3 at least doesn't crash.";
+allocate(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line Allocate = filename:join(PrivDir,
+			       atom_to_list(?MODULE)
+			       ++"_allocate.fil"),
+
+    Line1 = "Hello\n",
+    Line2 = "World!\n",
+
+    ?line {ok, Fd} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd, 1, iolist_size([Line1, Line2])),
+    ?line ok = ?PRIM_FILE:write(Fd, Line1),
+    ?line ok = ?PRIM_FILE:write(Fd, Line2),
+    ?line ok = ?PRIM_FILE:close(Fd),
+
+    ?line {ok, Fd2} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd2, 1, iolist_size(Line1)),
+    ?line ok = ?PRIM_FILE:write(Fd2, Line1),
+    ?line ok = ?PRIM_FILE:write(Fd2, Line2),
+    ?line ok = ?PRIM_FILE:close(Fd2),
+
+    ?line {ok, Fd3} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd3, 1, iolist_size(Line1) + 1),
+    ?line ok = ?PRIM_FILE:write(Fd3, Line1),
+    ?line ok = ?PRIM_FILE:write(Fd3, Line2),
+    ?line ok = ?PRIM_FILE:close(Fd3),
+
+    ?line {ok, Fd4} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    allocate_and_assert(Fd4, 1, 4 * iolist_size([Line1, Line2])),
+    ?line ok = ?PRIM_FILE:write(Fd4, Line1),
+    ?line ok = ?PRIM_FILE:write(Fd4, Line2),
+    ?line ok = ?PRIM_FILE:close(Fd4),
+
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+allocate_and_assert(Fd, Offset, Length) ->
+    % Just verify that calls to ?PRIM_FILE:allocate/3 don't crash or have
+    % any other negative side effect. We can't really asssert against a
+    % specific return value, because support for file space pre-allocation
+    % depends on the OS, OS version and underlying filesystem.
+    %
+    % The Linux kernel added support for fallocate() in version 2.6.23,
+    % which currently works only for the ext4, ocfs2, xfs and btrfs file
+    % systems. posix_fallocate() is available in glibc as of version
+    % 2.1.94, but it was buggy until glibc version 2.7.
+    %
+    % Mac OS X, as of version 10.3, supports the fcntl operation F_PREALLOCATE.
+    %
+    % Solaris supports posix_fallocate() but only for the UFS file system
+    % apparently (not supported for ZFS).
+    %
+    % FreeBSD 9.0 is the first FreeBSD release supporting posix_fallocate().
+    %
+    % For Windows there's apparently no way to pre-allocate file space, at
+    % least with similar API/semantics as posix_fallocate(), fallocate() or
+    % fcntl F_PREALLOCATE.
+    Result = ?PRIM_FILE:allocate(Fd, Offset, Length),
+    case os:type() of
+        {win32, _} ->
+            ?line {error, enotsup} = Result;
+        _ ->
+            ?line _ = Result
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 delete_a(suite) -> [];
 delete_a(doc) -> [];
 delete_a(Config) when is_list(Config) ->
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index ab95a3ff5f..5c4437d4d3 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -167,7 +168,7 @@ pread_pwrite(suite) ->
 pread_pwrite(doc) ->
     ["Test that pread/2,3 and pwrite/2,3 works."];
 pread_pwrite(Config) when is_list(Config) ->
-    ?line Str = "Flygande b�ckaziner s�ka hwila p� mjuqa tuvor x",
+    ?line Str = "Flygande bäckaziner söka hwila på mjuqa tuvor x",
     ?line Bin = list_to_binary(Str),
     %%
     pread_pwrite_test(?FILE_MODULE, Str, [ram, read, write]),
@@ -206,7 +207,7 @@ position(suite) ->
 position(doc) ->
     ["Test that position/2 works."];
 position(Config) when is_list(Config) ->
-    ?line Str = "Att vara eller icke vara, det �r fr�gan. ",
+    ?line Str = "Att vara eller icke vara, det är frågan. ",
     ?line Bin = list_to_binary(Str),
     %%
     position_test(?FILE_MODULE, Str, [ram, read]),
@@ -287,8 +288,8 @@ truncate(suite) ->
 truncate(doc) ->
     ["Test that truncate/1 works."];
 truncate(Config) when is_list(Config) ->
-    ?line Str = "M�n �dlare att lida och f�rdraga " 
-	++ "ett bittert �des stygn av pilar, ",
+    ?line Str = "Mån ädlare att lida och fördraga "
+	++ "ett bittert ödes stygn av pilar, ",
     ?line Bin = list_to_binary(Str),
     %%
     ok = truncate_test(?FILE_MODULE, Str, [ram, read, write]),
@@ -331,7 +332,7 @@ sync(suite) ->
 sync(doc) ->
     ["Test that sync/1 at least does not crash."];
 sync(Config) when is_list(Config) ->
-    ?line Str = "�n att ta till vapen mot ett hav av kval. ",
+    ?line Str = "än att ta till vapen mot ett hav av kval. ",
     ?line Bin = list_to_binary(Str),
     %%
     sync_test(?FILE_MODULE, Str, [ram, read, write]),
@@ -365,8 +366,8 @@ get_set_file(doc) ->
     ["Tests get_file/1, set_file/2, get_file_close/1 and get_size/1."];
 get_set_file(Config) when is_list(Config) ->
     %% These two strings should not be of equal length.
-    ?line Str  = "N�r h�gan nord blir sn�bet�ckt, ",
-    ?line Str2 = "f�r alla harar byta dr�kt. ",
+    ?line Str  = "När högan nord blir snöbetäckt, ",
+    ?line Str2 = "får alla harar byta dräkt. ",
     ?line Bin  = list_to_binary(Str),
     ?line Bin2 = list_to_binary(Str2),
     %%
diff --git a/lib/megaco/aclocal.m4 b/lib/megaco/aclocal.m4
new file mode 100644
index 0000000000..918e30a886
--- /dev/null
+++ b/lib/megaco/aclocal.m4
@@ -0,0 +1,1905 @@
+dnl
+dnl %CopyrightBegin%
+dnl
+dnl Copyright Ericsson AB 1998-2012. All Rights Reserved.
+dnl
+dnl The contents of this file are subject to the Erlang Public License,
+dnl Version 1.1, (the "License"); you may not use this file except in
+dnl compliance with the License. You should have received a copy of the
+dnl Erlang Public License along with this software. If not, it can be
+dnl retrieved online at http://www.erlang.org/.
+dnl
+dnl Software distributed under the License is distributed on an "AS IS"
+dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+dnl the License for the specific language governing rights and limitations
+dnl under the License.
+dnl
+dnl %CopyrightEnd%
+dnl
+
+dnl
+dnl aclocal.m4
+dnl
+dnl Local macros used in configure.in. The Local Macros which
+dnl could/should be part of autoconf are prefixed LM_, macros specific
+dnl to the Erlang system are prefixed ERL_.
+dnl
+
+AC_DEFUN(LM_PRECIOUS_VARS,
+[
+
+dnl ERL_TOP
+AC_ARG_VAR(ERL_TOP, [Erlang/OTP top source directory])
+
+dnl Tools
+AC_ARG_VAR(CC, [C compiler])
+AC_ARG_VAR(CFLAGS, [C compiler flags])
+AC_ARG_VAR(STATIC_CFLAGS, [C compiler static flags])
+AC_ARG_VAR(CFLAG_RUNTIME_LIBRARY_PATH, [runtime library path linker flag passed via C compiler])
+AC_ARG_VAR(CPP, [C/C++ preprocessor])
+AC_ARG_VAR(CPPFLAGS, [C/C++ preprocessor flags])
+AC_ARG_VAR(CXX, [C++ compiler])
+AC_ARG_VAR(CXXFLAGS, [C++ compiler flags])
+AC_ARG_VAR(LD, [linker (is often overridden by configure)])
+AC_ARG_VAR(LDFLAGS, [linker flags (can be risky to set since LD may be overriden by configure)])
+AC_ARG_VAR(LIBS, [libraries])
+AC_ARG_VAR(DED_LD, [linker for Dynamic Erlang Drivers (set all DED_LD* variables or none)])
+AC_ARG_VAR(DED_LDFLAGS, [linker flags for Dynamic Erlang Drivers (set all DED_LD* variables or none)])
+AC_ARG_VAR(DED_LD_FLAG_RUNTIME_LIBRARY_PATH, [runtime library path linker flag for Dynamic Erlang Drivers (set all DED_LD* variables or none)])
+AC_ARG_VAR(LFS_CFLAGS, [large file support C compiler flags (set all LFS_* variables or none)])
+AC_ARG_VAR(LFS_LDFLAGS, [large file support linker flags (set all LFS_* variables or none)])
+AC_ARG_VAR(LFS_LIBS, [large file support libraries (set all LFS_* variables or none)])
+AC_ARG_VAR(RANLIB, [ranlib])
+AC_ARG_VAR(AR, [ar])
+AC_ARG_VAR(GETCONF, [getconf])
+
+dnl Cross system root
+AC_ARG_VAR(erl_xcomp_sysroot, [Absolute cross system root path (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_isysroot, [Absolute cross system root include path (only used when cross compiling)])
+
+dnl Cross compilation variables
+AC_ARG_VAR(erl_xcomp_bigendian, [big endian system: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_double_middle_endian, [double-middle-endian system: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_linux_clock_gettime_correction, [clock_gettime() can be used for time correction: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_linux_nptl, [have Native POSIX Thread Library: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_linux_usable_sigusrx, [SIGUSR1 and SIGUSR2 can be used: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_linux_usable_sigaltstack, [have working sigaltstack(): yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_poll, [have working poll(): yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_kqueue, [have working kqueue(): yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_putenv_copy, [putenv() stores key-value copy: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_reliable_fpe, [have reliable floating point exceptions: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_getaddrinfo, [have working getaddrinfo() for both IPv4 and IPv6: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_gethrvtime_procfs_ioctl, [have working gethrvtime() which can be used with procfs ioctl(): yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_clock_gettime_cpu_time, [clock_gettime() can be used for retrieving process CPU time: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_after_morecore_hook, [__after_morecore_hook can track malloc()s core memory usage: yes|no (only used when cross compiling)])
+AC_ARG_VAR(erl_xcomp_dlsym_brk_wrappers, [dlsym(RTLD_NEXT, _) brk wrappers can track malloc()s core memory usage: yes|no (only used when cross compiling)])
+
+])
+
+AC_DEFUN(ERL_XCOMP_SYSROOT_INIT,
+[
+erl_xcomp_without_sysroot=no
+if test "$cross_compiling" = "yes"; then
+    test "$erl_xcomp_sysroot" != "" || erl_xcomp_without_sysroot=yes
+    test "$erl_xcomp_isysroot" != "" || erl_xcomp_isysroot="$erl_xcomp_sysroot"
+else
+    erl_xcomp_sysroot=
+    erl_xcomp_isysroot=
+fi
+])
+
+AC_DEFUN(LM_CHECK_GETCONF,
+[
+if test "$cross_compiling" != "yes"; then
+    AC_CHECK_PROG([GETCONF], [getconf], [getconf], [false])
+else
+    dnl First check if we got a `<HOST>-getconf' in $PATH
+    host_getconf="$host_alias-getconf"
+    AC_CHECK_PROG([GETCONF], [$host_getconf], [$host_getconf], [false])
+    if test "$GETCONF" = "false" && test "$erl_xcomp_sysroot" != ""; then
+	dnl We should perhaps give up if we have'nt found it by now, but at
+	dnl least in one Tilera MDE `getconf' under sysroot is a bourne
+	dnl shell script which we can use. We try to find `<HOST>-getconf'
+    	dnl or `getconf' under sysconf, but only under sysconf since
+	dnl `getconf' in $PATH is almost guaranteed to be for the build
+	dnl machine.
+	GETCONF=
+	prfx="$erl_xcomp_sysroot"
+        AC_PATH_TOOL([GETCONF], [getconf], [false],
+	             ["$prfx/usr/bin:$prfx/bin:$prfx/usr/local/bin"])
+    fi
+fi
+])
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_WINDOWS_ENVIRONMENT
+dnl
+dnl
+dnl Tries to determine thw windows build environment, i.e. 
+dnl MIXED_CYGWIN_VC or MIXED_MSYS_VC 
+dnl
+
+AC_DEFUN(LM_WINDOWS_ENVIRONMENT,
+[
+MIXED_CYGWIN=no
+MIXED_MSYS=no
+
+AC_MSG_CHECKING(for mixed cygwin or msys and native VC++ environment)
+if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then
+	if test -x /usr/bin/cygpath; then
+		CFLAGS="-O2"
+		MIXED_CYGWIN=yes
+		AC_MSG_RESULT([Cygwin and VC])
+		MIXED_CYGWIN_VC=yes
+		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC"
+	elif test -x /usr/bin/msysinfo; then
+	        CFLAGS="-O2"
+		MIXED_MSYS=yes
+		AC_MSG_RESULT([MSYS and VC])
+		MIXED_MSYS_VC=yes
+		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC"
+	else		    
+		AC_MSG_RESULT([undeterminable])
+		AC_MSG_ERROR(Seems to be mixed windows but not with cygwin, cannot handle this!)
+	fi
+else
+	AC_MSG_RESULT([no])
+	MIXED_CYGWIN_VC=no
+	MIXED_MSYS_VC=no
+fi
+AC_SUBST(MIXED_CYGWIN_VC)
+AC_SUBST(MIXED_MSYS_VC)
+
+MIXED_VC=no
+if test "x$MIXED_MSYS_VC" = "xyes" -o  "x$MIXED_CYGWIN_VC" = "xyes" ; then
+   MIXED_VC=yes
+fi
+
+AC_SUBST(MIXED_VC)
+
+if test "x$MIXED_MSYS" != "xyes"; then
+   AC_MSG_CHECKING(for mixed cygwin and native MinGW environment)
+   if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then
+	if test -x /usr/bin/cygpath; then
+		CFLAGS="-O2"
+		MIXED_CYGWIN=yes
+		AC_MSG_RESULT([yes])
+		MIXED_CYGWIN_MINGW=yes
+		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_MINGW"
+	else
+		AC_MSG_RESULT([undeterminable])
+		AC_MSG_ERROR(Seems to be mixed windows but not with cygwin, cannot handle this!)
+	fi
+    else
+	AC_MSG_RESULT([no])
+	MIXED_CYGWIN_MINGW=no
+    fi
+else
+	MIXED_CYGWIN_MINGW=no
+fi	
+AC_SUBST(MIXED_CYGWIN_MINGW)
+
+AC_MSG_CHECKING(if we mix cygwin with any native compiler)
+if test "X$MIXED_CYGWIN" = "Xyes"; then
+	AC_MSG_RESULT([yes])	
+else
+	AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(MIXED_CYGWIN)
+	
+AC_MSG_CHECKING(if we mix msys with another native compiler)
+if test "X$MIXED_MSYS" = "Xyes" ; then
+	AC_MSG_RESULT([yes])	
+else
+	AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(MIXED_MSYS)
+])		
+	
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_FIND_EMU_CC
+dnl
+dnl
+dnl Tries fairly hard to find a C compiler that can handle jump tables.
+dnl Defines the @EMU_CC@ variable for the makefiles and 
+dnl inserts NO_JUMP_TABLE in the header if one cannot be found...
+dnl
+
+AC_DEFUN(LM_FIND_EMU_CC,
+	[AC_CACHE_CHECK(for a compiler that handles jumptables,
+			ac_cv_prog_emu_cc,
+			[
+AC_TRY_COMPILE([],[
+#if defined(__clang_major__) && __clang_major__ >= 3
+    /* clang 3.x or later is fine */
+#elif defined(__llvm__)
+#error "this version of llvm is unable to correctly compile beam_emu.c"
+#endif
+    __label__ lbl1;
+    __label__ lbl2;
+    int x = magic();
+    static void *jtab[2];
+
+    jtab[0] = &&lbl1;
+    jtab[1] = &&lbl2;
+    goto *jtab[x];
+lbl1:
+    return 1;
+lbl2:
+    return 2;
+],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no)
+
+if test $ac_cv_prog_emu_cc = no; then
+	for ac_progname in emu_cc.sh gcc-4.2 gcc; do
+  		IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  		ac_dummy="$PATH"
+  		for ac_dir in $ac_dummy; do
+    			test -z "$ac_dir" && ac_dir=.
+    			if test -f $ac_dir/$ac_progname; then
+      				ac_cv_prog_emu_cc=$ac_dir/$ac_progname
+      				break
+    			fi
+  		done
+  		IFS="$ac_save_ifs"
+		if test $ac_cv_prog_emu_cc != no; then
+			break
+		fi
+	done
+fi
+
+if test $ac_cv_prog_emu_cc != no; then
+	save_CC=$CC
+	save_CFLAGS=$CFLAGS
+	save_CPPFLAGS=$CPPFLAGS
+	CC=$ac_cv_prog_emu_cc
+	CFLAGS=""
+	CPPFLAGS=""
+	AC_TRY_COMPILE([],[
+#if defined(__clang_major__) && __clang_major__ >= 3
+    /* clang 3.x or later is fine */
+#elif defined(__llvm__)
+#error "this version of llvm is unable to correctly compile beam_emu.c"
+#endif
+    	__label__ lbl1;
+    	__label__ lbl2;
+    	int x = magic();
+    	static void *jtab[2];
+
+    	jtab[0] = &&lbl1;
+    	jtab[1] = &&lbl2;
+    	goto *jtab[x];
+	lbl1:
+    	return 1;
+	lbl2:
+    	return 2;
+	],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no)
+	CC=$save_CC
+	CFLAGS=$save_CFLAGS
+	CPPFLAGS=$save_CPPFLAGS
+fi
+])
+if test $ac_cv_prog_emu_cc = no; then
+	AC_DEFINE(NO_JUMP_TABLE,[],[Defined if no found C compiler can handle jump tables])
+	EMU_CC=$CC
+else
+	EMU_CC=$ac_cv_prog_emu_cc
+fi
+AC_SUBST(EMU_CC)
+])		
+			
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_PROG_INSTALL_DIR
+dnl
+dnl This macro may be used by any OTP application.
+dnl
+dnl Figure out how to create directories with parents.
+dnl (In my opinion INSTALL_DIR is a bad name, MKSUBDIRS or something is better)
+dnl
+dnl We prefer 'install -d', but use 'mkdir -p' if it exists.
+dnl If none of these methods works, we give up.
+dnl
+
+
+AC_DEFUN(LM_PROG_INSTALL_DIR,
+[AC_CACHE_CHECK(how to create a directory including parents,
+ac_cv_prog_mkdir_p,
+[
+temp_name_base=config.$$
+temp_name=$temp_name_base/x/y/z
+$INSTALL -d $temp_name >/dev/null 2>&1
+ac_cv_prog_mkdir_p=none
+if test -d $temp_name; then
+        ac_cv_prog_mkdir_p="$INSTALL -d"
+else
+        mkdir -p $temp_name >/dev/null 2>&1
+        if test -d $temp_name; then
+                ac_cv_prog_mkdir_p="mkdir -p"
+        fi
+fi
+rm -fr $temp_name_base           
+])
+
+case "${ac_cv_prog_mkdir_p}" in
+  none) AC_MSG_ERROR(don't know how create directories with parents) ;;
+  *)    INSTALL_DIR="$ac_cv_prog_mkdir_p" AC_SUBST(INSTALL_DIR)     ;;
+esac
+])
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_PROG_PERL5
+dnl
+dnl Try to find perl version 5. If found set PERL to the absolute path
+dnl of the program, if not found set PERL to false.
+dnl
+dnl On some systems /usr/bin/perl is perl 4 and e.g.
+dnl /usr/local/bin/perl is perl 5. We try to handle this case by
+dnl putting a couple of 
+dnl Tries to handle the case that there are two programs called perl
+dnl in the path and one of them is perl 5 and the other isn't. 
+dnl
+AC_DEFUN(LM_PROG_PERL5,
+[AC_PATH_PROGS(PERL, perl5 perl, false,
+   /usr/local/bin:/opt/local/bin:/usr/local/gnu/bin:${PATH})
+changequote(, )dnl
+dnl[ That bracket is needed to balance the right bracket below
+if test "$PERL" = "false" || $PERL -e 'exit ($] >= 5)'; then
+changequote([, ])dnl
+  ac_cv_path_PERL=false
+  PERL=false
+dnl  AC_MSG_WARN(perl version 5 not found)
+fi
+])dnl
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_DECL_SO_BSDCOMPAT
+dnl
+dnl Check if the system has the SO_BSDCOMPAT flag on sockets (linux) 
+dnl
+AC_DEFUN(LM_DECL_SO_BSDCOMPAT,
+[AC_CACHE_CHECK([for SO_BSDCOMPAT declaration], ac_cv_decl_so_bsdcompat,
+AC_TRY_COMPILE([#include <sys/socket.h>], [int i = SO_BSDCOMPAT;],
+               ac_cv_decl_so_bsdcompat=yes,
+               ac_cv_decl_so_bsdcompat=no))
+
+case "${ac_cv_decl_so_bsdcompat}" in
+  "yes" ) AC_DEFINE(HAVE_SO_BSDCOMPAT,[],
+		[Define if you have SO_BSDCOMPAT flag on sockets]) ;;
+  * ) ;;
+esac
+])
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_DECL_INADDR_LOOPBACK
+dnl
+dnl Try to find declaration of INADDR_LOOPBACK, if nowhere provide a default
+dnl
+
+AC_DEFUN(LM_DECL_INADDR_LOOPBACK,
+[AC_CACHE_CHECK([for INADDR_LOOPBACK in netinet/in.h],
+ ac_cv_decl_inaddr_loopback,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <netinet/in.h>], [int i = INADDR_LOOPBACK;],
+ac_cv_decl_inaddr_loopback=yes, ac_cv_decl_inaddr_loopback=no)
+])
+
+if test ${ac_cv_decl_inaddr_loopback} = no; then
+  AC_CACHE_CHECK([for INADDR_LOOPBACK in rpc/types.h],
+                   ac_cv_decl_inaddr_loopback_rpc,
+                   AC_TRY_COMPILE([#include <rpc/types.h>],
+                                   [int i = INADDR_LOOPBACK;],
+                                   ac_cv_decl_inaddr_loopback_rpc=yes,
+                                   ac_cv_decl_inaddr_loopback_rpc=no))
+
+   case "${ac_cv_decl_inaddr_loopback_rpc}" in
+     "yes" )
+        AC_DEFINE(DEF_INADDR_LOOPBACK_IN_RPC_TYPES_H,[],
+		[Define if you need to include rpc/types.h to get INADDR_LOOPBACK defined]) ;;
+      * )
+  	AC_CACHE_CHECK([for INADDR_LOOPBACK in winsock2.h],
+                   ac_cv_decl_inaddr_loopback_winsock2,
+                   AC_TRY_COMPILE([#define WIN32_LEAN_AND_MEAN
+				   #include <winsock2.h>],
+                                   [int i = INADDR_LOOPBACK;],
+                                   ac_cv_decl_inaddr_loopback_winsock2=yes,
+                                   ac_cv_decl_inaddr_loopback_winsock2=no))
+	case "${ac_cv_decl_inaddr_loopback_winsock2}" in
+     		"yes" )
+			AC_DEFINE(DEF_INADDR_LOOPBACK_IN_WINSOCK2_H,[],
+				[Define if you need to include winsock2.h to get INADDR_LOOPBACK defined]) ;;
+		* )
+			# couldn't find it anywhere
+        		AC_DEFINE(HAVE_NO_INADDR_LOOPBACK,[],
+				[Define if you don't have a definition of INADDR_LOOPBACK]) ;;
+	esac;;
+   esac
+fi
+])
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_STRUCT_SOCKADDR_SA_LEN
+dnl
+dnl Check if the sockaddr structure has the field sa_len
+dnl
+
+AC_DEFUN(LM_STRUCT_SOCKADDR_SA_LEN,
+[AC_CACHE_CHECK([whether struct sockaddr has sa_len field],
+                ac_cv_struct_sockaddr_sa_len,
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>], [struct sockaddr s; s.sa_len = 10;],
+  ac_cv_struct_sockaddr_sa_len=yes, ac_cv_struct_sockaddr_sa_len=no))
+
+dnl FIXME convbreak
+case ${ac_cv_struct_sockaddr_sa_len} in
+  "no" ) AC_DEFINE(NO_SA_LEN,[1],[Define if you dont have salen]) ;;
+  *) ;;
+esac
+])
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_STRUCT_EXCEPTION
+dnl
+dnl Check to see whether the system supports the matherr function
+dnl and its associated type "struct exception".
+dnl
+
+AC_DEFUN(LM_STRUCT_EXCEPTION,
+[AC_CACHE_CHECK([for struct exception (and matherr function)],
+ ac_cv_struct_exception,
+AC_TRY_COMPILE([#include <math.h>],
+  [struct exception x; x.type = DOMAIN; x.type = SING;],
+  ac_cv_struct_exception=yes, ac_cv_struct_exception=no))
+
+case "${ac_cv_struct_exception}" in
+  "yes" ) AC_DEFINE(USE_MATHERR,[1],[Define if you have matherr() function and struct exception type]) ;;
+  *  ) ;;
+esac
+])
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_SYS_IPV6
+dnl
+dnl Check for ipv6 support and what the in6_addr structure is called.
+dnl (early linux used in_addr6 insted of in6_addr)
+dnl
+
+AC_DEFUN(LM_SYS_IPV6,
+[AC_MSG_CHECKING(for IP version 6 support)
+AC_CACHE_VAL(ac_cv_sys_ipv6_support,
+[ok_so_far=yes
+ AC_TRY_COMPILE([#include <sys/types.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>
+#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
+])dnl
+
+dnl
+dnl Have to use old style AC_DEFINE due to BC with old autoconf.
+dnl
+
+case ${ac_cv_sys_ipv6_support} in
+  yes)
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_IN6,[1],[Define if ipv6 is present])
+    ;;
+  in_addr6)
+    AC_MSG_RESULT([yes (but I am redefining in_addr6 to in6_addr)])
+    AC_DEFINE(HAVE_IN6,[1],[Define if ipv6 is present])
+    AC_DEFINE(HAVE_IN_ADDR6_STRUCT,[],[Early linux used in_addr6 instead of in6_addr, define if you have this])
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+esac
+])
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_SYS_MULTICAST
+dnl
+dnl Check for multicast support. Only checks for multicast options in
+dnl setsockopt(), no check is performed that multicasting actually works.
+dnl If options are found defines HAVE_MULTICAST_SUPPORT
+dnl
+
+AC_DEFUN(LM_SYS_MULTICAST,
+[AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support,
+[AC_EGREP_CPP(yes,
+[#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#if defined(IP_MULTICAST_TTL) && defined(IP_MULTICAST_LOOP) && defined(IP_MULTICAST_IF) && defined(IP_ADD_MEMBERSHIP) && defined(IP_DROP_MEMBERSHIP)
+yes
+#endif
+], ac_cv_sys_multicast_support=yes, ac_cv_sys_multicast_support=no)])
+if test $ac_cv_sys_multicast_support = yes; then
+  AC_DEFINE(HAVE_MULTICAST_SUPPORT,[1],
+	[Define if setsockopt() accepts multicast options])
+fi
+])dnl
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_DECL_SYS_ERRLIST
+dnl
+dnl Define SYS_ERRLIST_DECLARED if the variable sys_errlist is declared
+dnl in a system header file, stdio.h or errno.h.
+dnl
+
+AC_DEFUN(LM_DECL_SYS_ERRLIST,
+[AC_CACHE_CHECK([for sys_errlist declaration in stdio.h or errno.h],
+  ac_cv_decl_sys_errlist,
+[AC_TRY_COMPILE([#include <stdio.h>
+#include <errno.h>], [char *msg = *(sys_errlist + 1);],
+  ac_cv_decl_sys_errlist=yes, ac_cv_decl_sys_errlist=no)])
+if test $ac_cv_decl_sys_errlist = yes; then
+  AC_DEFINE(SYS_ERRLIST_DECLARED,[],
+	[define if the variable sys_errlist is declared in a system header file])
+fi
+])
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_CHECK_FUNC_DECL( funname, declaration [, extra includes 
+dnl                     [, action-if-found [, action-if-not-found]]] )
+dnl
+dnl Checks if the declaration "declaration" of "funname" conflicts
+dnl with the header files idea of how the function should be
+dnl declared. It is useful on systems which lack prototypes and you
+dnl need to provide your own (e.g. when you want to take the address
+dnl of a function). The 4'th argument is expanded if conflicting, 
+dnl the 5'th argument otherwise
+dnl
+dnl
+
+AC_DEFUN(LM_CHECK_FUNC_DECL,
+[AC_MSG_CHECKING([for conflicting declaration of $1])
+AC_CACHE_VAL(ac_cv_func_decl_$1,
+[AC_TRY_COMPILE([#include <stdio.h>
+$3],[$2
+char *c = (char *)$1;
+], eval "ac_cv_func_decl_$1=no", eval "ac_cv_func_decl_$1=yes")])
+if eval "test \"`echo '$ac_cv_func_decl_'$1`\" = yes"; then
+  AC_MSG_RESULT(yes)
+  ifelse([$4], , :, [$4])
+else
+  AC_MSG_RESULT(no)
+ifelse([$5], , , [$5
+])dnl
+fi
+])
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl AC_DOUBLE_MIDDLE_ENDIAN
+dnl
+dnl Checks whether doubles are represented in "middle-endian" format.
+dnl Sets ac_cv_double_middle_endian={no,yes,unknown} accordingly,
+dnl as well as DOUBLE_MIDDLE_ENDIAN.
+dnl
+dnl
+
+AC_DEFUN([AC_C_DOUBLE_MIDDLE_ENDIAN],
+[AC_CACHE_CHECK(whether double word ordering is middle-endian, ac_cv_c_double_middle_endian,
+[# It does not; compile a test program.
+AC_RUN_IFELSE(
+[AC_LANG_SOURCE([[#include <stdlib.h>
+
+int
+main(void)
+{
+  int i = 0;
+  int zero = 0;
+  int bigendian;
+  int zero_index = 0;
+
+  union
+  {
+    long int l;
+    char c[sizeof (long int)];
+  } u;
+
+  /* we'll use the one with 32-bit words */
+  union
+  {
+    double d;
+    unsigned int c[2];
+  } vint;
+
+  union
+  {
+    double d;
+    unsigned long c[2];
+  } vlong;
+
+  union
+  {
+    double d;
+    unsigned short c[2];
+  } vshort;
+
+
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  u.l = 1;
+  bigendian = (u.c[sizeof (long int) - 1] == 1);
+
+  zero_index = bigendian ? 1 : 0;
+
+  vint.d = 1.0;
+  vlong.d = 1.0;
+  vshort.d = 1.0;
+
+  if (sizeof(unsigned int) == 4)
+    {
+      if (vint.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned long) == 4)
+    {
+      if (vlong.c[zero_index] != 0)
+	zero = 1;
+    }
+  else if (sizeof(unsigned short) == 4)
+    {
+      if (vshort.c[zero_index] != 0)
+	zero = 1;
+    }
+
+  exit (zero);
+}
+]])],
+	      [ac_cv_c_double_middle_endian=no],
+	      [ac_cv_c_double_middle_endian=yes],
+	      [ac_cv_c_double_middle=unknown])])
+case $ac_cv_c_double_middle_endian in
+  yes)
+    m4_default([$1],
+      [AC_DEFINE([DOUBLE_MIDDLE_ENDIAN], 1,
+	[Define to 1 if your processor stores the words in a double in
+	 middle-endian format (like some ARMs).])]) ;;
+  no)
+    $2 ;;
+  *)
+    m4_default([$3],
+      [AC_MSG_WARN([unknown double endianness
+presetting ac_cv_c_double_middle_endian=no (or yes) will help])]) ;;
+esac
+])# AC_C_DOUBLE_MIDDLE_ENDIAN
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_CHECK_THR_LIB
+dnl
+dnl This macro may be used by any OTP application.
+dnl
+dnl LM_CHECK_THR_LIB sets THR_LIBS, THR_DEFS, and THR_LIB_NAME. It also
+dnl checks for some pthread headers which will appear in DEFS or config.h.
+dnl
+
+AC_DEFUN(LM_CHECK_THR_LIB,
+[
+
+NEED_NPTL_PTHREAD_H=no
+
+dnl win32?
+AC_MSG_CHECKING([for native win32 threads])
+if test "X$host_os" = "Xwin32"; then
+    AC_MSG_RESULT(yes)
+    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
+
+dnl The usual pthread lib...
+    AC_CHECK_LIB(pthread, pthread_create, THR_LIBS="-lpthread")
+
+dnl Very old versions of FreeBSD have pthreads in special c library, c_r...
+    if test "x$THR_LIBS" = "x"; then
+	AC_CHECK_LIB(c_r, pthread_create, THR_LIBS="-lc_r")
+    fi
+
+dnl QNX has pthreads in standard C library
+    if test "x$THR_LIBS" = "x"; then
+	AC_CHECK_FUNC(pthread_create, THR_LIBS="none_needed")
+    fi
+
+dnl On ofs1 the '-pthread' switch should be used
+    if test "x$THR_LIBS" = "x"; then
+	AC_MSG_CHECKING([if the '-pthread' switch can be used])
+	saved_cflags=$CFLAGS
+	CFLAGS="$CFLAGS -pthread"
+	AC_TRY_LINK([#include <pthread.h>],
+		    pthread_create((void*)0,(void*)0,(void*)0,(void*)0);,
+		    [THR_DEFS="-pthread"
+		     THR_LIBS="-pthread"])
+	CFLAGS=$saved_cflags
+	if test "x$THR_LIBS" != "x"; then
+	    AC_MSG_RESULT(yes)
+	else
+	    AC_MSG_RESULT(no)
+	fi
+    fi
+
+    if test "x$THR_LIBS" != "x"; then
+	THR_DEFS="$THR_DEFS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS"
+	THR_LIB_NAME=pthread
+	if test "x$THR_LIBS" = "xnone_needed"; then
+	    THR_LIBS=
+	fi
+	case $host_os in
+	    solaris*)
+		THR_DEFS="$THR_DEFS -D_POSIX_PTHREAD_SEMANTICS" ;;
+	    linux*)
+		THR_DEFS="$THR_DEFS -D_POSIX_THREAD_SAFE_FUNCTIONS"
+
+		LM_CHECK_GETCONF
+		AC_MSG_CHECKING(for Native POSIX Thread Library)
+		libpthr_vsn=`$GETCONF GNU_LIBPTHREAD_VERSION 2>/dev/null`
+		if test $? -eq 0; then
+		    case "$libpthr_vsn" in
+			*nptl*|*NPTL*) nptl=yes;;
+			*) nptl=no;;
+		    esac
+		elif test "$cross_compiling" = "yes"; then
+		    case "$erl_xcomp_linux_nptl" in
+			"") nptl=cross;;
+			yes|no) nptl=$erl_xcomp_linux_nptl;;
+			*) AC_MSG_ERROR([Bad erl_xcomp_linux_nptl value: $erl_xcomp_linux_nptl]);;
+		    esac
+		else
+		    nptl=no
+		fi
+		AC_MSG_RESULT($nptl)
+		if test $nptl = cross; then
+		    nptl=yes
+		    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
+				     NEED_NPTL_PTHREAD_H=yes])
+		    if test $need_nptl_incldir = yes; then
+			# Ahh...
+			nptl_path="$C_INCLUDE_PATH:$CPATH"
+			if test X$cross_compiling != Xyes; then
+			    nptl_path="$nptl_path:/usr/local/include:/usr/include"
+			else
+			    IROOT="$erl_xcomp_isysroot"
+			    test "$IROOT" != "" || IROOT="$erl_xcomp_sysroot"
+			    test "$IROOT" != "" || AC_MSG_ERROR([Don't know where to search for includes! Please set erl_xcomp_isysroot])
+			    nptl_path="$nptl_path:$IROOT/usr/local/include:$IROOT/usr/include"
+			fi
+			nptl_ws_path=
+			save_ifs="$IFS"; IFS=":"
+			for dir in $nptl_path; do
+			    if test "x$dir" != "x"; then
+				nptl_ws_path="$nptl_ws_path $dir"
+			    fi
+			done
+			IFS=$save_ifs
+			nptl_incldir=
+			for dir in $nptl_ws_path; do
+		            AC_CHECK_HEADER($dir/nptl/pthread.h,
+					    nptl_incldir=$dir/nptl)
+			    if test "x$nptl_incldir" != "x"; then
+				THR_DEFS="$THR_DEFS -isystem $nptl_incldir"
+				break
+			    fi
+			done
+			if test "x$nptl_incldir" = "x"; then
+			    AC_MSG_ERROR(Failed to locate nptl system include directory)
+			fi
+		    fi
+		fi
+		;;
+	    *) ;;
+	esac
+
+	dnl We sometimes need THR_DEFS in order to find certain headers
+	dnl (at least for pthread.h on osf1).
+	saved_cppflags=$CPPFLAGS
+	CPPFLAGS="$CPPFLAGS $THR_DEFS"
+
+	dnl
+	dnl Check for headers
+	dnl
+
+	AC_CHECK_HEADER(pthread.h,
+			AC_DEFINE(HAVE_PTHREAD_H, 1, \
+[Define if you have the <pthread.h> header file.]))
+
+	dnl Some Linuxes have <pthread/mit/pthread.h> instead of <pthread.h>
+	AC_CHECK_HEADER(pthread/mit/pthread.h, \
+			AC_DEFINE(HAVE_MIT_PTHREAD_H, 1, \
+[Define if the pthread.h header file is in pthread/mit directory.]))
+
+	dnl restore CPPFLAGS
+	CPPFLAGS=$saved_cppflags
+
+    fi
+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)
+
+])
+
+AC_DEFUN(ETHR_CHK_SYNC_OP,
+[
+    AC_MSG_CHECKING([for $3-bit $1()])
+    case "$2" in
+	"1") sync_call="$1(&var);";;
+	"2") sync_call="$1(&var, ($4) 0);";;
+	"3") sync_call="$1(&var, ($4) 0, ($4) 0);";;
+    esac
+    have_sync_op=no
+    AC_TRY_LINK([],
+	[
+	    $4 res;
+	    volatile $4 var;
+	    res = $sync_call
+	],
+	[have_sync_op=yes])
+    test $have_sync_op = yes && $5
+    AC_MSG_RESULT([$have_sync_op])
+])
+
+AC_DEFUN(ETHR_CHK_INTERLOCKED,
+[
+    ilckd="$1"
+    AC_MSG_CHECKING([for ${ilckd}()])
+    case "$2" in
+	"1") ilckd_call="${ilckd}(var);";;
+	"2") ilckd_call="${ilckd}(var, ($3) 0);";;
+	"3") ilckd_call="${ilckd}(var, ($3) 0, ($3) 0);";;
+	"4") ilckd_call="${ilckd}(var, ($3) 0, ($3) 0, arr);";;
+    esac
+    have_interlocked_op=no
+    AC_TRY_LINK(
+	[
+	#define WIN32_LEAN_AND_MEAN
+	#include <windows.h>
+	#include <intrin.h>
+	],
+	[
+	    volatile $3 *var;
+	    volatile $3 arr[2];
+
+	    $ilckd_call
+	    return 0;
+	],
+	[have_interlocked_op=yes])
+    test $have_interlocked_op = yes && $4
+    AC_MSG_RESULT([$have_interlocked_op])
+])
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl ERL_FIND_ETHR_LIB
+dnl
+dnl NOTE! This macro may be changed at any time! Should *only* be used by
+dnl       ERTS!
+dnl
+dnl Find a thread library to use. Sets ETHR_LIBS to libraries to link
+dnl with, ETHR_X_LIBS to extra libraries to link with (same as ETHR_LIBS
+dnl except that the ethread lib itself is not included), ETHR_DEFS to
+dnl defines to compile with, ETHR_THR_LIB_BASE to the name of the
+dnl thread library which the ethread library is based on, and ETHR_LIB_NAME
+dnl to the name of the library where the ethread implementation is located.
+dnl  ERL_FIND_ETHR_LIB currently searches for 'pthreads', and
+dnl 'win32_threads'. If no thread library was found ETHR_LIBS, ETHR_X_LIBS,
+dnl ETHR_DEFS, ETHR_THR_LIB_BASE, and ETHR_LIB_NAME are all set to the
+dnl empty string.
+dnl
+
+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 $ERTS_INTERNAL_X_LIBS"
+ETHR_LIBS=
+ETHR_LIB_NAME=
+
+ethr_modified_default_stack_size=
+
+dnl Name of lib where ethread implementation is located
+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
+	#   InitializeCriticalSectionAndSpinCount
+	# The ethread lib will refuse to build if _WIN32_WINNT < 0x0403.
+	#
+	# -D_WIN32_WINNT should have been defined in $CPPFLAGS; fetch it
+	# and save it in ETHR_DEFS.
+	found_win32_winnt=no
+	for cppflag in $CPPFLAGS; do
+	    case $cppflag in
+		-DWINVER*)
+		    ETHR_DEFS="$ETHR_DEFS $cppflag"
+		    ;;
+		-D_WIN32_WINNT*)
+		    ETHR_DEFS="$ETHR_DEFS $cppflag"
+		    found_win32_winnt=yes
+		    ;;
+		*)
+		    ;;
+	    esac
+        done
+        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])
+
+	ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
+	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
+	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
+	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
+	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
+	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
+	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
+
+	test "$ethr_have_native_atomics" = "yes" && ethr_have_native_spinlock=yes
+	;;
+
+    pthread)
+	ETHR_THR_LIB_BASE_DIR=pthread
+    	AC_DEFINE(ETHR_PTHREADS, 1, [Define if you have pthreads])
+	case $host_os in
+	    openbsd*)
+		# The default stack size is insufficient for our needs
+		# on OpenBSD. We increase it to 256 kilo words.
+		ethr_modified_default_stack_size=256;;
+	    linux*)
+		ETHR_DEFS="$ETHR_DEFS -D_GNU_SOURCE"
+
+		if test	X$cross_compiling = Xyes; then
+		    case X$erl_xcomp_linux_usable_sigusrx in
+			X) usable_sigusrx=cross;;
+			Xyes|Xno) usable_sigusrx=$erl_xcomp_linux_usable_sigusrx;;
+			*) AC_MSG_ERROR([Bad erl_xcomp_linux_usable_sigusrx value: $erl_xcomp_linux_usable_sigusrx]);;
+		    esac
+		    case X$erl_xcomp_linux_usable_sigaltstack in
+			X) usable_sigaltstack=cross;;
+			Xyes|Xno) usable_sigaltstack=$erl_xcomp_linux_usable_sigaltstack;;
+			*) AC_MSG_ERROR([Bad erl_xcomp_linux_usable_sigaltstack value: $erl_xcomp_linux_usable_sigaltstack]);;
+		    esac
+		else
+		    # FIXME: Test for actual problems instead of kernel versions
+		    linux_kernel_vsn_=`uname -r`
+		    case $linux_kernel_vsn_ in
+			[[0-1]].*|2.[[0-1]]|2.[[0-1]].*)
+			    usable_sigusrx=no
+			    usable_sigaltstack=no;;
+			2.[[2-3]]|2.[[2-3]].*)
+			    usable_sigusrx=yes
+			    usable_sigaltstack=no;;
+		    	*)
+			    usable_sigusrx=yes
+			    usable_sigaltstack=yes;;
+		    esac
+		fi
+
+		AC_MSG_CHECKING(if SIGUSR1 and SIGUSR2 can be used)
+		AC_MSG_RESULT($usable_sigusrx)
+		if test $usable_sigusrx = cross; then
+		    usable_sigusrx=yes
+		    AC_MSG_WARN([result yes guessed because of cross compilation])
+		fi
+		if test $usable_sigusrx = no; then
+		    ETHR_DEFS="$ETHR_DEFS -DETHR_UNUSABLE_SIGUSRX"
+		fi
+
+		AC_MSG_CHECKING(if sigaltstack can be used)
+		AC_MSG_RESULT($usable_sigaltstack)
+		if test $usable_sigaltstack = cross; then
+		    usable_sigaltstack=yes
+		    AC_MSG_WARN([result yes guessed because of cross compilation])
+		fi
+		if test $usable_sigaltstack = no; then
+		    ETHR_DEFS="$ETHR_DEFS -DETHR_UNUSABLE_SIGALTSTACK"
+		fi
+		;;
+	    *) ;;
+	esac
+
+	dnl We sometimes need ETHR_DEFS in order to find certain headers
+	dnl (at least for pthread.h on osf1).
+	saved_cppflags="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $ETHR_DEFS"
+
+	dnl We need the thread library in order to find some functions
+	saved_libs="$LIBS"
+	LIBS="$LIBS $ETHR_X_LIBS"
+
+	dnl
+	dnl Check for headers
+	dnl
+
+	AC_CHECK_HEADER(pthread.h, \
+			AC_DEFINE(ETHR_HAVE_PTHREAD_H, 1, \
+[Define if you have the <pthread.h> header file.]))
+
+	dnl Some Linuxes have <pthread/mit/pthread.h> instead of <pthread.h>
+	AC_CHECK_HEADER(pthread/mit/pthread.h, \
+			AC_DEFINE(ETHR_HAVE_MIT_PTHREAD_H, 1, \
+[Define if the pthread.h header file is in pthread/mit directory.]))
+
+	if test $NEED_NPTL_PTHREAD_H = yes; then
+	    AC_DEFINE(ETHR_NEED_NPTL_PTHREAD_H, 1, \
+[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.]))
+
+	AC_TRY_COMPILE([#include <time.h>
+			#include <sys/time.h>], 
+			[struct timeval *tv; return 0;],
+			AC_DEFINE(ETHR_TIME_WITH_SYS_TIME, 1, \
+[Define if you can safely include both <sys/time.h> and <time.h>.]))
+
+
+	dnl
+	dnl Check for functions
+	dnl
+
+	AC_CHECK_FUNC(pthread_spin_lock, \
+			[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
+
+	    ethr_have_pthread_rwlockattr_setkind_np=no
+	    AC_CHECK_FUNC(pthread_rwlockattr_setkind_np,
+			  [ethr_have_pthread_rwlockattr_setkind_np=yes])
+
+	    if test $ethr_have_pthread_rwlockattr_setkind_np = yes; then
+		AC_DEFINE(ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP, 1, \
+[Define if you have the pthread_rwlockattr_setkind_np() function.])
+
+		AC_MSG_CHECKING([for PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP])
+		ethr_pthread_rwlock_writer_nonrecursive_initializer_np=no
+		AC_TRY_LINK([
+				#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
+			    ],
+			    [
+				pthread_rwlockattr_t *attr;
+				return pthread_rwlockattr_setkind_np(attr,
+				    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+			    ],
+			    [ethr_pthread_rwlock_writer_nonrecursive_initializer_np=yes])
+		AC_MSG_RESULT([$ethr_pthread_rwlock_writer_nonrecursive_initializer_np])
+		if test $ethr_pthread_rwlock_writer_nonrecursive_initializer_np = yes; then
+		    AC_DEFINE(ETHR_HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, 1, \
+[Define if you have the PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP rwlock attribute.])
+		fi
+	    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_CHECK_SIZEOF(int)
+	AC_CHECK_SIZEOF(long)
+	AC_CHECK_SIZEOF(long long)
+	AC_CHECK_SIZEOF(__int128_t)
+
+	if test "$ac_cv_sizeof_int" = "4"; then
+	    int32="int"
+	elif test "$ac_cv_sizeof_long" = "4"; then
+	    int32="long"
+	elif test "$ac_cv_sizeof_long_long" = "4"; then
+	    int32="long long"
+	else
+	    AC_MSG_ERROR([No 32-bit type found])
+	fi
+
+	if test "$ac_cv_sizeof_int" = "8"; then
+	    int64="int"
+	elif test "$ac_cv_sizeof_long" = "8"; then
+	    int64="long"
+	elif test "$ac_cv_sizeof_long_long" = "8"; then
+	    int64="long long"
+	else
+	    AC_MSG_ERROR([No 64-bit type found])
+	fi
+
+	int128=no
+	if test "$ac_cv_sizeof___int128_t" = "16"; then
+	    int128="__int128_t"
+	fi
+
+	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
+	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
+	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
+	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+
+	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
+	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
+	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
+	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+
+	if test $int128 != no; then
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
+	fi
+
+	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_full(&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
+
+	case "$host_cpu" in
+	  sparc | sun4u | sparc64 | sun4v)
+		case "$with_sparc_memory_order" in
+		    "TSO")
+			AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
+		    "PSO")
+			AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
+		    "RMO"|"")
+			AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
+		    *)
+			AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
+		esac
+		ethr_have_native_atomics=yes;; 
+	  i86pc | i*86 | x86_64 | amd64)
+		if test "$enable_x86_out_of_order" = "yes"; then
+			AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
+		fi
+		ethr_have_native_atomics=yes;;
+	  macppc | ppc | "Power Macintosh")
+		ethr_have_native_atomics=yes;;
+	  tile)
+		ethr_have_native_atomics=yes;;
+	  *)
+		;;
+	esac
+
+	test ethr_have_native_atomics = "yes" && ethr_have_native_spinlock=yes
+
+	dnl Restore LIBS
+	LIBS=$saved_libs
+	dnl restore CPPFLAGS
+	CPPFLAGS=$saved_cppflags
+
+	;;
+    *)
+	;;
+esac
+
+AC_MSG_CHECKING([whether default stack size should be modified])
+if test "x$ethr_modified_default_stack_size" != "x"; then
+	AC_DEFINE_UNQUOTED(ETHR_MODIFIED_DEFAULT_STACK_SIZE, $ethr_modified_default_stack_size, [Define if you want to modify the default stack size])
+	AC_MSG_RESULT([yes; to $ethr_modified_default_stack_size kilo words])
+else
+	AC_MSG_RESULT([no])
+fi
+
+if test "x$ETHR_THR_LIB_BASE" != "x"; then
+	ETHR_DEFS="-DUSE_THREADS $ETHR_DEFS"
+	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])
+
+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])
+AC_CHECK_SIZEOF(__int128_t)
+AC_DEFINE_UNQUOTED(ETHR_SIZEOF___INT128_T, $ac_cv_sizeof___int128_t, [Define to the size of __int128_t])
+
+
+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
+
+case X$erl_xcomp_double_middle_endian in
+    X) ;;
+    Xyes|Xno|Xunknown) ac_cv_c_double_middle_endian=$erl_xcomp_double_middle_endian;;
+    *) AC_MSG_ERROR([Bad erl_xcomp_double_middle_endian value: $erl_xcomp_double_middle_endian]);;
+esac
+
+AC_C_DOUBLE_MIDDLE_ENDIAN
+
+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)
+
+AC_ARG_ENABLE(x86-out-of-order,
+	      AS_HELP_STRING([--enable-x86-out-of-order],
+                             [enable x86/x84_64 out of order support (default disabled)]))
+
+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],
+			     [prefer gcc native ethread implementations]),
+[ case "$enableval" in
+    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
+    *)  enable_prefer_gcc_native_ethr_impls=no ;;
+  esac ], enable_prefer_gcc_native_ethr_impls=no)
+
+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_WITH(with_sparc_memory_order,
+	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
+			   [specify sparc memory order (defaults to RMO)]))
+
+ETHR_X86_SSE2_ASM=no
+case "$GCC-$ac_cv_sizeof_void_p-$host_cpu" in
+  yes-4-i86pc | yes-4-i*86 | yes-4-x86_64 | yes-4-amd64)
+    AC_MSG_CHECKING([for gcc sse2 asm support])
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS -msse2"
+    gcc_sse2_asm=no
+    AC_TRY_COMPILE([],
+	[
+		long long x, *y;
+		__asm__ __volatile__("movq %1, %0\n\t" : "=x"(x) : "m"(*y) : "memory");
+	],
+	[gcc_sse2_asm=yes])
+    CFLAGS="$save_CFLAGS"
+    AC_MSG_RESULT([$gcc_sse2_asm])
+    if test "$gcc_sse2_asm" = "yes"; then
+      AC_DEFINE(ETHR_GCC_HAVE_SSE2_ASM_SUPPORT, 1, [Define if you use a gcc that supports -msse2 and understand sse2 specific asm statements])
+      ETHR_X86_SSE2_ASM=yes
+    fi
+    ;;
+  *)
+    ;;
+esac
+
+case "$GCC-$host_cpu" in
+  yes-i86pc | yes-i*86 | yes-x86_64 | yes-amd64)
+    gcc_dw_cmpxchg_asm=no
+    AC_MSG_CHECKING([for gcc double word cmpxchg asm support])    
+    AC_TRY_COMPILE([],
+	[
+    char xchgd;
+    long new[2], xchg[2], *p;		  
+    __asm__ __volatile__(
+#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
+	"pushl %%ebx\n\t"
+	"movl %8, %%ebx\n\t"
+#endif
+#if ETHR_SIZEOF_PTR == 4
+	"lock; cmpxchg8b %0\n\t"
+#else
+	"lock; cmpxchg16b %0\n\t"
+#endif
+	"setz %3\n\t"
+#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
+	"popl %%ebx\n\t"
+#endif
+	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new[1]),
+#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
+	  "r"(new[0])
+#else
+	  "b"(new[0])
+#endif
+	: "cc", "memory");
+
+	],
+	[gcc_dw_cmpxchg_asm=yes])
+    if test $gcc_dw_cmpxchg_asm = no && test $ac_cv_sizeof_void_p = 4; then
+      AC_TRY_COMPILE([],
+	  [
+      char xchgd;
+      long new[2], xchg[2], *p;
+#if !defined(__PIC__) || !__PIC__
+#  error nope
+#endif
+      __asm__ __volatile__(
+    	  "pushl %%ebx\n\t"
+	  "movl (%7), %%ebx\n\t"
+	  "movl 4(%7), %%ecx\n\t"
+	  "lock; cmpxchg8b %0\n\t"
+  	  "setz %3\n\t"
+	  "popl %%ebx\n\t"
+	  : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
+	  : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new)
+	: "cc", "memory");
+
+	],
+	[gcc_dw_cmpxchg_asm=yes])
+      if test "$gcc_dw_cmpxchg_asm" = "yes"; then
+        AC_DEFINE(ETHR_CMPXCHG8B_REGISTER_SHORTAGE, 1, [Define if you get a register shortage with cmpxchg8b and position independent code])
+      fi
+    fi
+    AC_MSG_RESULT([$gcc_dw_cmpxchg_asm])
+    if test "$gcc_dw_cmpxchg_asm" = "yes"; then
+      AC_DEFINE(ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT, 1, [Define if you use a gcc that supports the double word cmpxchg instruction])
+    fi;;
+  *)
+    ;;
+esac
+
+AC_DEFINE(ETHR_HAVE_ETHREAD_DEFINES, 1, \
+[Define if you have all ethread defines])
+
+AC_SUBST(ETHR_X_LIBS)
+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)
+AC_SUBST(ETHR_X86_SSE2_ASM)
+
+])
+
+
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl ERL_TIME_CORRECTION
+dnl
+dnl In the presence of a high resolution realtime timer Erlang can adapt
+dnl its view of time relative to this timer. On solaris such a timer is
+dnl available with the syscall gethrtime(). On other OS's a fallback
+dnl solution using times() is implemented. (However on e.g. FreeBSD times()
+dnl is implemented using gettimeofday so it doesn't make much sense to
+dnl use it there...) On second thought, it seems to be safer to do it the
+dnl other way around. I.e. only use times() on OS's where we know it will
+dnl work...
+dnl
+
+AC_DEFUN(ERL_TIME_CORRECTION,
+[if test x$ac_cv_func_gethrtime = x; then
+  AC_CHECK_FUNC(gethrtime)
+fi
+if test x$clock_gettime_correction = xunknown; then
+	AC_TRY_COMPILE([#include <time.h>],
+			[struct timespec ts;
+     			 long long result;
+			 clock_gettime(CLOCK_MONOTONIC,&ts);
+                         result = ((long long) ts.tv_sec) * 1000000000LL + 
+			 ((long long) ts.tv_nsec);],
+			clock_gettime_compiles=yes,
+			clock_gettime_compiles=no)
+else
+	clock_gettime_compiles=no
+fi
+			
+
+AC_CACHE_CHECK([how to correct for time adjustments], erl_cv_time_correction,
+[
+case $clock_gettime_correction in
+    yes)
+	erl_cv_time_correction=clock_gettime;;	
+    no|unknown)
+	case $ac_cv_func_gethrtime in
+  	    yes)
+    		erl_cv_time_correction=hrtime ;;
+  	    no)
+    		case $host_os in
+        	    linux*)
+			case $clock_gettime_correction in
+			    unknown)
+				if test x$clock_gettime_compiles = xyes; then
+				    if test X$cross_compiling != Xyes; then
+				    	linux_kernel_vsn_=`uname -r`
+				    	case $linux_kernel_vsn_ in
+					    [[0-1]].*|2.[[0-5]]|2.[[0-5]].*)
+					    	erl_cv_time_correction=times ;;
+					    *)
+					    	erl_cv_time_correction=clock_gettime;;
+				    	esac
+				    else
+					case X$erl_xcomp_linux_clock_gettime_correction in
+					    X)
+						erl_cv_time_correction=cross;;
+					    Xyes|Xno)
+						if test $erl_xcomp_linux_clock_gettime_correction = yes; then
+						    erl_cv_time_correction=clock_gettime
+						else
+					    	    erl_cv_time_correction=times
+						fi;;
+					    *)
+						AC_MSG_ERROR([Bad erl_xcomp_linux_clock_gettime_correction value: $erl_xcomp_linux_clock_gettime_correction]);;
+					esac
+				    fi
+				else
+				    erl_cv_time_correction=times
+				fi
+				;;
+			     *)				
+        			erl_cv_time_correction=times ;;
+			esac
+			;;
+            	    *)
+        		erl_cv_time_correction=none ;;
+    		esac
+    		;;
+	esac
+	;;
+esac
+])
+
+xrtlib=""
+case $erl_cv_time_correction in
+  times)
+    AC_DEFINE(CORRECT_USING_TIMES,[],
+	[Define if you do not have a high-res. timer & want to use times() instead])
+    ;;
+  clock_gettime|cross)
+    if test $erl_cv_time_correction = cross; then
+	erl_cv_time_correction=clock_gettime
+	AC_MSG_WARN([result clock_gettime guessed because of cross compilation])
+    fi
+    xrtlib="-lrt"
+    AC_DEFINE(GETHRTIME_WITH_CLOCK_GETTIME,[1],
+	[Define if you want to use clock_gettime to simulate gethrtime])
+    ;;
+esac
+dnl
+dnl Check if gethrvtime is working, and if to use procfs ioctl
+dnl or (yet to be written) write to the procfs ctl file.
+dnl
+
+AC_MSG_CHECKING([if gethrvtime works and how to use it])
+AC_TRY_RUN([
+/* gethrvtime procfs ioctl test */
+/* These need to be undef:ed to not break activation of
+ * micro level process accounting on /proc/self 
+ */
+#ifdef _LARGEFILE_SOURCE
+#  undef _LARGEFILE_SOURCE
+#endif
+#ifdef _FILE_OFFSET_BITS
+#  undef _FILE_OFFSET_BITS
+#endif
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/signal.h>
+#include <sys/fault.h>
+#include <sys/syscall.h>
+#include <sys/procfs.h>
+#include <fcntl.h>
+
+int main() {
+    long msacct = PR_MSACCT;
+    int fd;
+    long long start, stop;
+    int i;
+    pid_t pid = getpid();
+    char proc_self[30] = "/proc/";
+
+    sprintf(proc_self+strlen(proc_self), "%lu", (unsigned long) pid);
+    if ( (fd = open(proc_self, O_WRONLY)) == -1)
+	exit(1);
+    if (ioctl(fd, PIOCSET, &msacct) < 0)
+	exit(2);
+    if (close(fd) < 0)
+	exit(3);
+    start = gethrvtime();
+    for (i = 0; i < 100; i++)
+	stop = gethrvtime();
+    if (start == 0)
+	exit(4);
+    if (start == stop)
+	exit(5);
+    exit(0); return 0;
+}
+],
+erl_gethrvtime=procfs_ioctl,
+erl_gethrvtime=false,
+[
+case X$erl_xcomp_gethrvtime_procfs_ioctl in
+    X)
+	erl_gethrvtime=cross;;
+    Xyes|Xno)
+	if test $erl_xcomp_gethrvtime_procfs_ioctl = yes; then
+	    erl_gethrvtime=procfs_ioctl
+	else
+	    erl_gethrvtime=false
+	fi;;
+    *)
+	AC_MSG_ERROR([Bad erl_xcomp_gethrvtime_procfs_ioctl value: $erl_xcomp_gethrvtime_procfs_ioctl]);;
+esac
+])
+
+case $erl_gethrvtime in
+  procfs_ioctl)
+	AC_DEFINE(HAVE_GETHRVTIME_PROCFS_IOCTL,[1],
+		[define if gethrvtime() works and uses ioctl() to /proc/self])
+	AC_MSG_RESULT(uses ioctl to procfs)
+	;;
+  *)
+	if test $erl_gethrvtime = cross; then
+	    erl_gethrvtime=false
+	    AC_MSG_RESULT(cross)
+	    AC_MSG_WARN([result 'not working' guessed because of cross compilation])
+	else
+	    AC_MSG_RESULT(not working)
+	fi
+
+	dnl
+	dnl Check if clock_gettime (linux) is working
+	dnl
+
+	AC_MSG_CHECKING([if clock_gettime can be used to get process CPU time])
+	save_libs=$LIBS
+	LIBS="-lrt"
+	AC_TRY_RUN([
+	#include <stdlib.h>
+	#include <unistd.h>
+	#include <string.h>
+	#include <stdio.h>
+	#include <time.h>
+	int main() {
+	    long long start, stop;
+	    int i;
+	    struct timespec tp;
+
+	    if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &tp) < 0)
+	      exit(1);
+	    start = ((long long)tp.tv_sec * 1000000000LL) + (long long)tp.tv_nsec;
+	    for (i = 0; i < 100; i++)
+	      clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &tp);
+	    stop = ((long long)tp.tv_sec * 1000000000LL) + (long long)tp.tv_nsec;
+	    if (start == 0)
+	      exit(4);
+	    if (start == stop)
+	      exit(5);
+	    exit(0); return 0;
+	  }
+	],
+	erl_clock_gettime=yes,
+	erl_clock_gettime=no,
+	[
+	case X$erl_xcomp_clock_gettime_cpu_time in
+	    X) erl_clock_gettime=cross;;
+	    Xyes|Xno) erl_clock_gettime=$erl_xcomp_clock_gettime_cpu_time;;
+	    *) AC_MSG_ERROR([Bad erl_xcomp_clock_gettime_cpu_time value: $erl_xcomp_clock_gettime_cpu_time]);;
+	esac
+	])
+	LIBS=$save_libs
+	case $host_os in
+		linux*)
+			AC_MSG_RESULT([no; not stable])
+			LIBRT=$xrtlib
+			;;
+		*)
+			AC_MSG_RESULT($erl_clock_gettime)
+			case $erl_clock_gettime in
+	  			yes)
+					AC_DEFINE(HAVE_CLOCK_GETTIME,[],
+						  [define if clock_gettime() works for getting process time])
+					LIBRT=-lrt
+					;;
+	  			cross)
+					erl_clock_gettime=no
+					AC_MSG_WARN([result no guessed because of cross compilation])
+					LIBRT=$xrtlib
+					;;
+	  			*)
+					LIBRT=$xrtlib
+					;;
+			esac
+			;;
+	esac
+	AC_SUBST(LIBRT)
+	;;
+esac
+])dnl
+
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $$2";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $$2")
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
+dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
+dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
+dnl AC_LANG_JAVA instead...)
+AC_DEFUN(ERL_TRY_LINK_JAVA,
+[java_link='$JAVAC conftest.java 1>&AC_FD_CC'
+changequote(, )dnl
+cat > conftest.java <<EOF
+$1
+class conftest { public static void main(String[] args) {
+   $2
+   ; return; }}
+EOF
+changequote([, ])dnl
+if AC_TRY_EVAL(java_link) && test -s conftest.class; then
+   ifelse([$3], , :, [rm -rf conftest*
+   $3])
+else
+   echo "configure: failed program was:" 1>&AC_FD_CC
+   cat conftest.java 1>&AC_FD_CC
+   echo "configure: PATH was $PATH" 1>&AC_FD_CC
+ifelse([$4], , , [  rm -rf conftest*
+  $4
+])dnl
+fi
+rm -f conftest*])
+#define UNSAFE_MASK  0xc0000000 /* Mask for bits that must be constant */
+
+
diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in
index 722ccc3fb4..643267a154 100644
--- a/lib/megaco/configure.in
+++ b/lib/megaco/configure.in
@@ -162,6 +162,11 @@ else
 fi
 AC_SUBST(OTP_EXTRA_FLAGS)
 
+if test "x$GCC" = xyes; then
+  # Treat certain GCC warnings as errors
+  LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+fi
+
 dnl
 dnl If ${ERL_TOP}/make/otp_ded.mk.in exists and contains DED_MK_VSN > 0,
 dnl every thing releted to compiling Dynamic Erlang Drivers can be found
diff --git a/lib/megaco/doc/src/definitions/term.defs b/lib/megaco/doc/src/definitions/term.defs
index f3d6f865d2..57379eaa5d 100644
--- a/lib/megaco/doc/src/definitions/term.defs
+++ b/lib/megaco/doc/src/definitions/term.defs
@@ -110,7 +110,6 @@ the module Erlang in the application kernel","kenneth"},
 {"Master Agent","Master Agent","The SNMP agent system consists of one Master Agent which terminates the SNMP protocol","mbj"}, {"MIB","Management Information Base (MIB)","An abstract definition of the management information available through a management interface in a system.","mbj"},
 {"matching","matching","See pattern matching.","kenneth"},
 {"message queue","message queue","The queue of not yet received messages that are in the mailbox of a process.","olin"},
-{"Mnemosyne","Mnemosyne","Mnemosyne was the query language of Mnesia up to the R11B release. Supersed by QLC.","hakan"},
 {"Mnesia","Mnesia","Mnesia is a distributed Database Management System, appropriate for telecommunications applications and other applications with need of continuous operation and soft real-time properties.","hakan"},
 {"MIBshort","MIB","See Management Information Base.","mbj"},
 {"MIME","MIME","Multi-purpose Internet Mail Extensions.","jocke"},
diff --git a/lib/megaco/doc/src/definitions/term.defs.xml b/lib/megaco/doc/src/definitions/term.defs.xml
index 28ac0d6eaf..1c80ee8d80 100644
--- a/lib/megaco/doc/src/definitions/term.defs.xml
+++ b/lib/megaco/doc/src/definitions/term.defs.xml
@@ -794,13 +794,6 @@ The queue of not yet received messages that are in the mailbox of a process.
     <resp>olin</resp>
   </term>
   <term>
-    <id>Mnemosyne</id>
-    <shortdef>Mnemosyne</shortdef>
-    <def>
-Mnemosyne was the query language of Mnesia up to the R11B release. Supersed by QLC.</def>
-    <resp>hakan</resp>
-  </term>
-  <term>
     <id>Mnesia</id>
     <shortdef>Mnesia</shortdef>
     <def>
diff --git a/lib/megaco/examples/meas/Makefile.in b/lib/megaco/examples/meas/Makefile.in
index c517fd21cf..91e342cd9a 100644
--- a/lib/megaco/examples/meas/Makefile.in
+++ b/lib/megaco/examples/meas/Makefile.in
@@ -147,12 +147,12 @@ release_docs_spec:
 # ----------------------------------------------------
 
 meas.sh.skel: meas.sh.skel.src
-	@echo "transforming $< to $@"
-	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+	$(V_colon)@echo "transforming $< to $@"
+	$(vsn_verbose)$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
 
 mstone1.sh.skel: mstone1.sh.skel.src
-	@echo "transforming $< to $@"
-	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+	$(V_colon)@echo "transforming $< to $@"
+	$(vsn_verbose)$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
 
 megaco_codec_transform.$(EMULATOR): megaco_codec_transform.erl
 
diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
index 42030c5b1c..d18da5326a 100644
--- a/lib/megaco/src/app/Makefile
+++ b/lib/megaco/src/app/Makefile
@@ -94,10 +94,10 @@ info:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
 
diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
index 660713605e..c1fd66b848 100644
--- a/lib/megaco/src/binary/Makefile
+++ b/lib/megaco/src/binary/Makefile
@@ -129,12 +129,13 @@ opt: prebuild $(TARGET_FILES)
 prebuild: prebuild.skip
 
 prebuild.skip: 
-	@echo "Building prebuild.skip\c"
+	$(gen_verbose)
+	$(V_colon)@echo "Building prebuild.skip\c"
 	@touch prebuild.skip
 	@for a in $(SPEC_ASN1DB); do \
 		echo $$a >> prebuild.skip; \
 	done
-	@echo ""
+	$(V_colon)@echo ""
 
 v1: $(V2_SPEC_BINS)
 
diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk
index a1318079be..2dce45981f 100644
--- a/lib/megaco/src/binary/depend.mk
+++ b/lib/megaco/src/binary/depend.mk
@@ -53,8 +53,8 @@ PER_V3_FLAGS             = $(ASN1_CT_OPTS)
 $(BER_ASN1_V1_SPEC).erl: \
 	$(BER_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
-	@echo "$(BER_ASN1_V1_SPEC):"
-	$(ERLC) -bber $(BER_V1_FLAGS) $(BER_ASN1_V1_SPEC).set.asn
+	$(V_colon)@echo "$(BER_ASN1_V1_SPEC):"
+	$(asn_verbose)$(ERLC) -bber $(BER_V1_FLAGS) $(BER_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_V1_SPEC).$(EMULATOR): \
 	$(BER_ASN1_V1_SPEC).erl
@@ -62,8 +62,8 @@ $(EBIN)/$(BER_ASN1_V1_SPEC).$(EMULATOR): \
 $(PER_ASN1_V1_SPEC).erl: \
 	$(PER_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
-	@echo "$(PER_ASN1_V1_SPEC):"
-	$(ERLC) -bper $(PER_V1_FLAGS) $(PER_ASN1_V1_SPEC).set.asn
+	$(V_colon)@echo "$(PER_ASN1_V1_SPEC):"
+	$(asn_verbose)$(ERLC) -bper $(PER_V1_FLAGS) $(PER_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_V1_SPEC).$(EMULATOR): \
 	$(PER_ASN1_V1_SPEC).erl
@@ -74,8 +74,8 @@ $(EBIN)/$(PER_ASN1_V1_SPEC).$(EMULATOR): \
 $(BER_ASN1_V2_SPEC).erl: \
 	$(BER_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
-	@echo "$(BER_ASN1_V2_SPEC):"
-	$(ERLC) -bber $(BER_V2_FLAGS) $(BER_ASN1_V2_SPEC).set.asn
+	$(V_colon)@echo "$(BER_ASN1_V2_SPEC):"
+	$(asn_verbose)$(ERLC) -bber $(BER_V2_FLAGS) $(BER_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_V2_SPEC).$(EMULATOR): \
 	$(BER_ASN1_V2_SPEC).erl
@@ -83,8 +83,8 @@ $(EBIN)/$(BER_ASN1_V2_SPEC).$(EMULATOR): \
 $(PER_ASN1_V2_SPEC).erl: \
 	$(PER_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
-	@echo "$(PER_ASN1_V2_SPEC):"
-	$(ERLC) -bper $(PER_V2_FLAGS) $(PER_ASN1_V2_SPEC).set.asn
+	$(V_colon)@echo "$(PER_ASN1_V2_SPEC):"
+	$(asn_verbose)$(ERLC) -bper $(PER_V2_FLAGS) $(PER_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_V2_SPEC).$(EMULATOR): \
 	$(PER_ASN1_V2_SPEC).erl
@@ -96,8 +96,8 @@ $(EBIN)/$(PER_ASN1_V2_SPEC).$(EMULATOR): \
 $(BER_ASN1_PREV3A_SPEC).erl: \
 	$(BER_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
-	@echo "$(BER_ASN1_PREV3A_SPEC):"
-	$(ERLC) -bber $(BER_PREV3A_FLAGS) $(BER_ASN1_PREV3A_SPEC).set.asn
+	$(V_colon)@echo "$(BER_ASN1_PREV3A_SPEC):"
+	$(asn_verbose)$(ERLC) -bber $(BER_PREV3A_FLAGS) $(BER_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_PREV3A_SPEC).$(EMULATOR): \
 	$(BER_ASN1_PREV3A_SPEC).erl
@@ -105,8 +105,8 @@ $(EBIN)/$(BER_ASN1_PREV3A_SPEC).$(EMULATOR): \
 $(PER_ASN1_PREV3A_SPEC).erl: \
 	$(PER_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
-	@echo "$(PER_ASN1_PREV3A_SPEC):"
-	$(ERLC) -bper $(PER_PREV3A_FLAGS) $(PER_ASN1_PREV3A_SPEC).set.asn
+	$(V_colon)@echo "$(PER_ASN1_PREV3A_SPEC):"
+	$(asn_verbose)$(ERLC) -bper $(PER_PREV3A_FLAGS) $(PER_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_PREV3A_SPEC).$(EMULATOR): \
 	$(PER_ASN1_PREV3A_SPEC).erl
@@ -117,8 +117,8 @@ $(EBIN)/$(PER_ASN1_PREV3A_SPEC).$(EMULATOR): \
 $(BER_ASN1_PREV3B_SPEC).erl: \
 	$(BER_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
-	@echo "$(BER_ASN1_PREV3B_SPEC):"
-	$(ERLC) -bber $(BER_PREV3B_FLAGS) $(BER_ASN1_PREV3B_SPEC).set.asn
+	$(V_colon)@echo "$(BER_ASN1_PREV3B_SPEC):"
+	$(asn_verbose)$(ERLC) -bber $(BER_PREV3B_FLAGS) $(BER_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_PREV3B_SPEC).$(EMULATOR): \
 	$(BER_ASN1_PREV3B_SPEC).erl
@@ -126,8 +126,8 @@ $(EBIN)/$(BER_ASN1_PREV3B_SPEC).$(EMULATOR): \
 $(PER_ASN1_PREV3B_SPEC).erl: \
 	$(PER_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
-	@echo "$(PER_ASN1_PREV3B_SPEC):"
-	$(ERLC) -bper $(PER_PREV3B_FLAGS) $(PER_ASN1_PREV3B_SPEC).set.asn
+	$(V_colon)@echo "$(PER_ASN1_PREV3B_SPEC):"
+	$(asn_verbose)$(ERLC) -bper $(PER_PREV3B_FLAGS) $(PER_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_PREV3B_SPEC).$(EMULATOR): \
 	$(PER_ASN1_PREV3B_SPEC).erl
@@ -138,8 +138,8 @@ $(EBIN)/$(PER_ASN1_PREV3B_SPEC).$(EMULATOR): \
 $(BER_ASN1_PREV3C_SPEC).erl: \
 	$(BER_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
-	@echo "$(BER_ASN1_PREV3C_SPEC):"
-	$(ERLC) -bber $(BER_PREV3C_FLAGS) $(BER_ASN1_PREV3C_SPEC).set.asn
+	$(V_colon)@echo "$(BER_ASN1_PREV3C_SPEC):"
+	$(asn_verbose)$(ERLC) -bber $(BER_PREV3C_FLAGS) $(BER_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_PREV3C_SPEC).$(EMULATOR): \
 	$(BER_ASN1_PREV3C_SPEC).erl
@@ -147,8 +147,8 @@ $(EBIN)/$(BER_ASN1_PREV3C_SPEC).$(EMULATOR): \
 $(PER_ASN1_PREV3C_SPEC).erl: \
 	$(PER_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
-	@echo "$(PER_ASN1_PREV3C_SPEC):"
-	$(ERLC) -bper $(PER_PREV3C_FLAGS) $(PER_ASN1_PREV3C_SPEC).set.asn
+	$(V_colon)@echo "$(PER_ASN1_PREV3C_SPEC):"
+	$(asn_verbose)$(ERLC) -bper $(PER_PREV3C_FLAGS) $(PER_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_PREV3C_SPEC).$(EMULATOR): \
 	$(PER_ASN1_PREV3C_SPEC).erl
@@ -159,8 +159,8 @@ $(EBIN)/$(PER_ASN1_PREV3C_SPEC).$(EMULATOR): \
 $(BER_ASN1_V3_SPEC).erl: \
 	$(BER_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
-	@echo "$(BER_ASN1_V3_SPEC):"
-	$(ERLC) -bber $(BER_V3_FLAGS) $(BER_ASN1_V3_SPEC).set.asn
+	$(V_colon)@echo "$(BER_ASN1_V3_SPEC):"
+	$(asn_verbose)$(ERLC) -bber $(BER_V3_FLAGS) $(BER_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_V3_SPEC).$(EMULATOR): \
 	$(BER_ASN1_V3_SPEC).erl
@@ -168,8 +168,8 @@ $(EBIN)/$(BER_ASN1_V3_SPEC).$(EMULATOR): \
 $(PER_ASN1_V3_SPEC).erl: \
 	$(PER_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
-	@echo "$(PER_ASN1_V3_SPEC):"
-	$(ERLC) -bper $(PER_V3_FLAGS) $(PER_ASN1_V3_SPEC).set.asn
+	$(V_colon)@echo "$(PER_ASN1_V3_SPEC):"
+	$(asn_verbose)$(ERLC) -bper $(PER_V3_FLAGS) $(PER_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_V3_SPEC).$(EMULATOR): \
 	$(PER_ASN1_V3_SPEC).erl
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
index 72b3112053..24dc410dbe 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -204,7 +204,7 @@ decode_name(_Config, Scope, Item) ->
 %%            to command requests from the MGC that audit 
 %%            ObservedEventsDescriptor, and found in the 
 %%            ObservedEventsDescriptor. See 12.2. If there are no parameters 
-%%            for the ObservedEvents Descriptor, then �none� shall be specified.
+%%            for the ObservedEvents Descriptor, then 'none' shall be specified.
 %% 
 %% 
 %% 12.1.4	Signals
@@ -225,7 +225,7 @@ decode_name(_Config, Scope, Item) ->
 %% 
 %%            BR (Brief)
 %% 
-%% 	   NOTE -�SignalType may be defined such that it is dependent on 
+%% 	   NOTE - SignalType may be defined such that it is dependent on
 %%            the value of one or more parameters. The package MUST specify a 
 %%            default signal type. If the default type is TO, the package MUST 
 %%            specify a default duration which may be provisioned. A default 
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
index 12e673ac81..d89717c00a 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -204,7 +204,7 @@ decode_name(_Config, Scope, Item) ->
 %%            to command requests from the MGC that audit 
 %%            ObservedEventsDescriptor, and found in the 
 %%            ObservedEventsDescriptor. See 12.2. If there are no parameters 
-%%            for the ObservedEvents Descriptor, then �none� shall be specified.
+%%            for the ObservedEvents Descriptor, then 'none' shall be specified.
 %% 
 %% 
 %% 12.1.4	Signals
@@ -225,7 +225,7 @@ decode_name(_Config, Scope, Item) ->
 %% 
 %%            BR (Brief)
 %% 
-%% 	   NOTE -�SignalType may be defined such that it is dependent on 
+%% 	   NOTE - SignalType may be defined such that it is dependent on
 %%            the value of one or more parameters. The package MUST specify a 
 %%            default signal type. If the default type is TO, the package MUST 
 %%            specify a default duration which may be provisioned. A default 
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
index d08231caac..8b4192ad44 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -204,7 +204,7 @@ decode_name(_Config, Scope, Item) ->
 %%            to command requests from the MGC that audit 
 %%            ObservedEventsDescriptor, and found in the 
 %%            ObservedEventsDescriptor. See 12.2. If there are no parameters 
-%%            for the ObservedEvents Descriptor, then �none� shall be specified.
+%%            for the ObservedEvents Descriptor, then 'none' shall be specified.
 %% 
 %% 
 %% 12.1.4	Signals
@@ -225,7 +225,7 @@ decode_name(_Config, Scope, Item) ->
 %% 
 %%            BR (Brief)
 %% 
-%% 	   NOTE -�SignalType may be defined such that it is dependent on 
+%% 	   NOTE - SignalType may be defined such that it is dependent on
 %%            the value of one or more parameters. The package MUST specify a 
 %%            default signal type. If the default type is TO, the package MUST 
 %%            specify a default duration which may be provisioned. A default 
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
index c101aa15bc..20954d4c9d 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -204,7 +204,7 @@ decode_name(_Config, Scope, Item) ->
 %%            to command requests from the MGC that audit 
 %%            ObservedEventsDescriptor, and found in the 
 %%            ObservedEventsDescriptor. See 12.2. If there are no parameters 
-%%            for the ObservedEvents Descriptor, then �none� shall be specified.
+%%            for the ObservedEvents Descriptor, then 'none' shall be specified.
 %% 
 %% 
 %% 12.1.4	Signals
@@ -225,7 +225,7 @@ decode_name(_Config, Scope, Item) ->
 %% 
 %%            BR (Brief)
 %% 
-%% 	   NOTE -�SignalType may be defined such that it is dependent on 
+%% 	   NOTE - SignalType may be defined such that it is dependent on
 %%            the value of one or more parameters. The package MUST specify a 
 %%            default signal type. If the default type is TO, the package MUST 
 %%            specify a default duration which may be provisioned. A default 
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
index cb5f5412f4..6111cf2304 100644
--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
@@ -319,16 +319,16 @@ release_docs_spec:
 
 $(STD_DRV).flex: megaco_flex_scanner_drv.flex.src
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER_LINENO),true)
-	@printf "std [flex] scanner - lineno enabled\n"
-	$(PERL) -p -e \
+	$(V_colon)@printf "std [flex] scanner - lineno enabled\n"
+	$(gen_verbose)$(PERL) -p -e \
           's/%FLEX_VERSION%/$(FLEX_VSN)/ ;  \
            s/%MEGACO_YY_LINENO_OPTION%/%option yylineno/ ;  \
            s/%MEGACO_YY_REENTRANT_OPTION%/\/\* %option reentrant \*\// ; \
            s/%MEGACO_DUMMY_DECL_YY_LINENO%/\/* static int yylineno = 1; *\//' \
            < $< > $@
 else
-	@printf "std [flex] scanner - lineno disabled\n"
-	$(PERL) -p -e \
+	$(V_colon)@printf "std [flex] scanner - lineno disabled\n"
+	$(gen_verbose)$(PERL) -p -e \
           's/%FLEX_VERSION%/$(FLEX_VSN)/ ;  \
            s/%MEGACO_YY_LINENO_OPTION%/\/\* %option yylineno \*\// ; \
            s/%MEGACO_YY_REENTRANT_OPTION%/\/\* %option reentrant \*\// ; \
@@ -339,16 +339,16 @@ endif
 $(MT_DRV).flex: megaco_flex_scanner_drv.flex.src
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER_LINENO),true)
 ifeq ($(ENABLE_REENTRANT_MEGACO_FLEX_SCANNER),true)
-	@printf "multi-threaded reentrant [flex] scanner - lineno enabled\n"
-	$(PERL) -p -e \
+	$(V_colon)@printf "multi-threaded reentrant [flex] scanner - lineno enabled\n"
+	$(gen_verbose)$(PERL) -p -e \
           's/%FLEX_VERSION%/$(FLEX_VSN)/ ;  \
            s/%MEGACO_YY_LINENO_OPTION%/%option yylineno/ ;  \
            s/%MEGACO_YY_REENTRANT_OPTION%/%option reentrant/ ;  \
            s/%MEGACO_DUMMY_DECL_YY_LINENO%/\/* static int yylineno = 1; *\//' \
            < $< > $@
 else
-	@printf "multi-threaded non-reentrant [flex] scanner - lineno enabled\n"
-	$(PERL) -p -e \
+	$(V_colon)@printf "multi-threaded non-reentrant [flex] scanner - lineno enabled\n"
+	$(gen_verbose)$(PERL) -p -e \
           's/%FLEX_VERSION%/$(FLEX_VSN)/ ;  \
            s/%MEGACO_YY_LINENO_OPTION%/%option yylineno/ ;  \
            s/%MEGACO_YY_REENTRANT_OPTION%/\/\* %option reentrant \*\// ; \
@@ -357,16 +357,16 @@ else
 endif
 else
 ifeq ($(ENABLE_REENTRANT_MEGACO_FLEX_SCANNER),true)
-	@printf "multi-threaded reentrant [flex] scanner - lineno disabled\n"
-	$(PERL) -p -e \
+	$(V_colon)@printf "multi-threaded reentrant [flex] scanner - lineno disabled\n"
+	$(gen_verbose)$(PERL) -p -e \
           's/%FLEX_VERSION%/$(FLEX_VSN)/ ;  \
            s/%MEGACO_YY_LINENO_OPTION%/\/\* %option yylineno \*\// ; \
            s/%MEGACO_YY_REENTRANT_OPTION%/%option reentrant/ ;  \
            s/%MEGACO_DUMMY_DECL_YY_LINENO%/\/* static int yylineno = 1; - REENTRANT SCANNER*\//' \
            < $< > $@
 else
-	@printf "multi-threaded non-reentrant [flex] scanner - lineno disabled\n"
-	$(PERL) -p -e \
+	$(V_colon)@printf "multi-threaded non-reentrant [flex] scanner - lineno disabled\n"
+	$(gen_verbose)$(PERL) -p -e \
           's/%FLEX_VERSION%/$(FLEX_VSN)/ ;  \
            s/%MEGACO_YY_LINENO_OPTION%/\/\* %option yylineno \*\// ; \
            s/%MEGACO_YY_REENTRANT_OPTION%/\/\* %option reentrant \*\// ; \
@@ -376,31 +376,31 @@ endif
 endif
 
 # megaco_flex_scanner_drv.c: megaco_flex_scanner_drv.flex
-# 	$(LEX) $(LEX_FLAGS) -P$* -o$@ $< 
+# 	$(V_LEX) $(LEX_FLAGS) -P$* -o$@ $<
 $(STD_DRV).c: $(STD_DRV).flex
-	$(LEX) $(STD_LEX_FLAGS) -P$* -o$@ $< 
+	$(V_LEX) $(STD_LEX_FLAGS) -P$* -o$@ $<
 $(MT_DRV).c: $(MT_DRV).flex
-	$(LEX) $(MT_LEX_FLAGS) -P$* -o$@ $< 
+	$(V_LEX) $(MT_LEX_FLAGS) -P$* -o$@ $<
 
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
 solibs: $(SOLIBS) 
 
 $(OBJDIR)/$(STD_DRV).o: $(STD_DRV).c 
-	@echo "compiling std driver:"
-	$(CC) -c $(STD_DRV_NAME) $(CFLAGS) -o $@ $< 
+	$(V_colon)@echo "compiling std driver:"
+	$(V_CC) -c $(STD_DRV_NAME) $(CFLAGS) -o $@ $<
 
 $(OBJDIR)/$(MT_DRV).o: $(MT_DRV).c 
-	@echo "compiling multi-threaded driver:"
-	$(CC) -c $(MT_DRV_NAME) $(CFLAGS_MT) -o $@ $<
+	$(V_colon)@echo "compiling multi-threaded driver:"
+	$(V_CC) -c $(MT_DRV_NAME) $(CFLAGS_MT) -o $@ $<
 
 
 # No need to link with -lfl as we have also defined %option noyywrap - 
 # and having -lfl doesn't work under Darwin for some reason. - Sean
 $(LIBDIR)/$(STD_DRV).$(DED_EXT): $(OBJDIR)/$(STD_DRV).o
-	@echo "linking std driver:"
-	$(LD) $(LDFLAGS) -o $@ $< 
+	$(V_colon)@echo "linking std driver:"
+	$(V_LD) $(LDFLAGS) -o $@ $<
 
 $(LIBDIR)/$(MT_DRV).$(DED_EXT): $(OBJDIR)/$(MT_DRV).o
-	@echo "linking multi-threaded driver:"
-	$(LD) $(LDFLAGS) -o $@ $< 
+	$(V_colon)@echo "linking multi-threaded driver:"
+	$(V_LD) $(LDFLAGS) -o $@ $<
diff --git a/lib/megaco/test/megaco_codec_prev3a_test.erl b/lib/megaco/test/megaco_codec_prev3a_test.erl
index 4f1160b93f..b2316eb509 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -3104,7 +3104,7 @@ pretty_otp5068_msg1() ->
       190,
       asn1_NOVALUE,
       {actionReplies,
-       [{'ActionReply',  %% Comments: Detta upprepas m�nga g�nger
+       [{'ActionReply',  %% Comments: This is repeated many times.
 	 0,
 	 asn1_NOVALUE,
 	 asn1_NOVALUE,
diff --git a/lib/megaco/test/megaco_codec_prev3b_test.erl b/lib/megaco/test/megaco_codec_prev3b_test.erl
index 4bd49365e7..fa24f49372 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -3223,7 +3223,7 @@ pretty_otp5068_msg1() ->
       190,
       asn1_NOVALUE,
       {actionReplies,
-       [{'ActionReply',  %% Comments: Detta upprepas m�nga g�nger
+       [{'ActionReply',  %% Comments: This is repeated many times.
 	 0,
 	 asn1_NOVALUE,
 	 asn1_NOVALUE,
diff --git a/lib/megaco/test/megaco_codec_prev3c_test.erl b/lib/megaco/test/megaco_codec_prev3c_test.erl
index baa1c7f547..7f6d098ed8 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -2679,7 +2679,7 @@ pretty_otp5068_msg1() ->
       190,
       asn1_NOVALUE,
       {actionReplies,
-       [{'ActionReply',  %% Comments: Detta upprepas m�nga g�nger
+       [{'ActionReply',  %% Comments: This is repeated many times.
 	 0,
 	 asn1_NOVALUE,
 	 asn1_NOVALUE,
diff --git a/lib/megaco/test/megaco_codec_v1_test.erl b/lib/megaco/test/megaco_codec_v1_test.erl
index 86f332fde0..3be0da3ae4 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -3298,7 +3298,7 @@ pretty_otp5068_msg1() ->
       190,
       asn1_NOVALUE,
       {actionReplies,
-       [{'ActionReply',  %% Comments: Detta upprepas m�nga g�nger
+       [{'ActionReply',  %% Comments: This is repeated many times.
 	 0,
 	 asn1_NOVALUE,
 	 asn1_NOVALUE,
diff --git a/lib/megaco/test/megaco_codec_v2_test.erl b/lib/megaco/test/megaco_codec_v2_test.erl
index e8db9e1cb1..1f522504d6 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -3722,7 +3722,7 @@ pretty_otp5068_msg1() ->
       190,
       asn1_NOVALUE,
       {actionReplies,
-       [{'ActionReply',  %% Comments: Detta upprepas m�nga g�nger
+       [{'ActionReply',  %% Comments: This is repeated many times.
 	 0,
 	 asn1_NOVALUE,
 	 asn1_NOVALUE,
diff --git a/lib/megaco/test/megaco_codec_v3_test.erl b/lib/megaco/test/megaco_codec_v3_test.erl
index 67805479f9..9d564a0ae3 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -2701,7 +2701,7 @@ pretty_otp5068_msg1() ->
       190,
       asn1_NOVALUE,
       {actionReplies,
-       [{'ActionReply',  %% Comments: Detta upprepas m�nga g�nger
+       [{'ActionReply',  %% Comments: This is repeated many times.
 	 0,
 	 asn1_NOVALUE,
 	 asn1_NOVALUE,
diff --git a/lib/mnesia/include/mnemosyne.hrl b/lib/mnesia/include/mnemosyne.hrl
deleted file mode 100644
index eb6ec53ae1..0000000000
--- a/lib/mnesia/include/mnemosyne.hrl
+++ /dev/null
@@ -1,18 +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$
-%%
--compile({parse_transform,mnemosyne}).
diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
index 6f289433ff..53d327c11b 100644
--- a/lib/mnesia/src/Makefile
+++ b/lib/mnesia/src/Makefile
@@ -120,10 +120,10 @@ $(TARGET_FILES): $(HRL_FILES)
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
 # ----------------------------------------------------
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 3d30debc53..3488d5c99b 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -2186,7 +2186,6 @@ system_info2(dump_log_time_threshold) -> mnesia_monitor:get_env(dump_log_time_th
 system_info2(dump_log_update_in_place) ->
     mnesia_monitor:get_env(dump_log_update_in_place);
 system_info2(max_wait_for_decision) -> mnesia_monitor:get_env(max_wait_for_decision);
-system_info2(embedded_mnemosyne) -> mnesia_monitor:get_env(embedded_mnemosyne);
 system_info2(ignore_fallback_at_startup) -> mnesia_monitor:get_env(ignore_fallback_at_startup);
 system_info2(fallback_error_function) ->  mnesia_monitor:get_env(fallback_error_function);
 system_info2(log_version) -> mnesia_log:version();
@@ -2224,7 +2223,6 @@ system_info_items(yes) ->
      dump_log_time_threshold,
      dump_log_update_in_place,
      dump_log_write_threshold,
-     embedded_mnemosyne,
      event_module,
      extra_db_nodes,
      fallback_activated,
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index d488a33d67..ec67d9ec12 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -593,6 +593,12 @@ multicall(Nodes, Msg) ->
     {PatchedGood, Bad}.  %% Make the replies look like rpc:multicalls..
 %%    rpc:multicall(Nodes, ?MODULE, call, [Msg]).
 
+next_async_dump_log() ->
+    Interval = mnesia_monitor:get_env(dump_log_time_threshold),
+    Msg = {next_async_dump_log, time_threshold},
+    Ref = erlang:send_after(Interval, self(), Msg),
+    Ref.
+
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_server
 %%%----------------------------------------------------------------------
@@ -614,9 +620,7 @@ init([Parent]) ->
     mnesia_lib:unset(original_nodes),
     mnesia_recover:connect_nodes(Diff),
 
-    Interval = mnesia_monitor:get_env(dump_log_time_threshold),
-    Msg = {async_dump_log, time_threshold},
-    {ok, Ref} = timer:send_interval(Interval, Msg),
+    Ref = next_async_dump_log(),
     mnesia_dumper:start_regulator(),
 
     Empty = gb_trees:empty(),
@@ -1121,6 +1125,11 @@ handle_sync_tabs([], _From) ->
 %%          {stop, Reason, State}            (terminate/2 is called)
 %%----------------------------------------------------------------------
 
+handle_info({next_async_dump_log, InitBy}, State) ->
+    async_dump_log(InitBy),
+    Ref = next_async_dump_log(),
+    noreply(State#state{dump_log_timer_ref=Ref});
+
 handle_info({async_dump_log, InitBy}, State) ->
     Worker = #dump_log{initiated_by = InitBy},
     State2 = add_worker(Worker, State),
diff --git a/lib/mnesia/src/mnesia_event.erl b/lib/mnesia/src/mnesia_event.erl
index 8085155fd5..9fd0342d31 100644
--- a/lib/mnesia/src/mnesia_event.erl
+++ b/lib/mnesia/src/mnesia_event.erl
@@ -153,7 +153,7 @@ handle_system_event({mnesia_down, Node}, State) ->
     end;
 
 handle_system_event({mnesia_overload, Details}, State) ->
-    report_warning("Mnesia is overloaded: ~p~n", [Details]),
+    report_warning("Mnesia is overloaded: ~w~n", [Details]),
     {ok, State}; 
 
 handle_system_event({mnesia_info, Format, Args}, State) ->
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index a22c95d454..14011003d3 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -1177,9 +1177,9 @@ system_code_change(State, _Module, _OldVsn, _Extra) ->
 %% AXD301 patch sort pids according to R9B sort order
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Om R9B == true, g�rs j�mf�relsen som i R9B plain.
-%% Om R9B == false, g�rs j�mf�relsen som i alla andra releaser.
-%% cmp_tid(T1, T2) returnerar -1 om T1 < T2, 0 om T1 = T2 och 1 om T1 > T2.
+%% Om R9B == true, the comparison is done as in R9B plain.
+%% Om R9B == false, the comparison is done as in any other release.
+%% cmp_tid(T1, T2) returns -1 if T1 < T2, 0 if T1 = T2 and 1 if T1 > T2.
 
 -define(VERSION_MAGIC,       131).
 -define(ATOM_EXT,            100).
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index c08bbc879f..d940bd1cb7 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -673,7 +673,6 @@ env() ->
      dump_log_time_threshold,
      dump_log_update_in_place,
      dump_log_write_threshold,
-     embedded_mnemosyne,
      event_module,
      extra_db_nodes,
      ignore_fallback_at_startup,
@@ -706,8 +705,6 @@ default_env(dump_log_update_in_place) ->
     true;
 default_env(dump_log_write_threshold) ->
     1000;
-default_env(embedded_mnemosyne) ->
-    false;
 default_env(event_module) ->
     mnesia_event;
 default_env(extra_db_nodes) ->
@@ -757,7 +754,6 @@ do_check_type(event_module, A) when is_atom(A) -> A;
 do_check_type(ignore_fallback_at_startup, B) -> bool(B);
 do_check_type(fallback_error_function, {Mod, Func})
   when is_atom(Mod), is_atom(Func) -> {Mod, Func};
-do_check_type(embedded_mnemosyne, B) -> bool(B);
 do_check_type(extra_db_nodes, L) when is_list(L) ->
     Fun = fun(N) when N == node() -> false;
 	     (A) when is_atom(A) -> true
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index 4750291a10..b64f428f15 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -45,7 +45,8 @@
 	 note_log_decision/2,
 	 outcome/2,
 	 start/0,
-	 start_garb/0,
+	 next_garb/0,
+	 next_check_overload/0,
 	 still_pending/1,
 	 sync_trans_tid_serial/1,
 	 sync/0,
@@ -91,10 +92,38 @@ start() ->
 init() ->
     call(init).
 
-start_garb() ->
+next_garb() ->
     Pid = whereis(mnesia_recover),
-    {ok, _} = timer:send_interval(timer:minutes(2), Pid, garb_decisions),
-    {ok, _} = timer:send_interval(timer:seconds(10), Pid, check_overload).
+    erlang:send_after(timer:minutes(2), Pid, garb_decisions).
+
+next_check_overload() ->
+    Pid = whereis(mnesia_recover),
+    erlang:send_after(timer:seconds(10), Pid, check_overload).
+
+
+do_check_overload(S) ->
+    %% Time to check if mnesia_tm is overloaded
+    case whereis(mnesia_tm) of
+    Pid when is_pid(Pid) ->
+        Threshold = 100,
+        Prev = S#state.tm_queue_len,
+        {message_queue_len, Len} =
+        process_info(Pid, message_queue_len),
+        if
+        Len > Threshold, Prev > Threshold ->
+            What = {mnesia_tm, message_queue_len, [Prev, Len]},
+            mnesia_lib:report_system_event({mnesia_overload, What}),
+            mnesia_lib:overload_set(mnesia_tm, true),
+            S#state{tm_queue_len = 0};
+        Len > Threshold ->
+            S#state{tm_queue_len = Len};
+        true ->
+            mnesia_lib:overload_set(mnesia_tm, false),
+            S#state{tm_queue_len = 0}
+        end;
+    undefined ->
+        S
+    end.
 
 allow_garb() ->
     cast(allow_garb).
@@ -853,34 +882,13 @@ handle_info({connect_nodes, Ns, From}, State) ->
     handle_call({connect_nodes,Ns},From,State);
 
 handle_info(check_overload, S) ->
-    %% Time to check if mnesia_tm is overloaded
-    case whereis(mnesia_tm) of
-	Pid when is_pid(Pid) ->
-	    
-	    Threshold = 100,
-	    Prev = S#state.tm_queue_len,
-	    {message_queue_len, Len} =
-		process_info(Pid, message_queue_len),
-	    if
-		Len > Threshold, Prev > Threshold ->
-		    What = {mnesia_tm, message_queue_len, [Prev, Len]},
-		    mnesia_lib:report_system_event({mnesia_overload, What}),
-                    mnesia_lib:overload_set(mnesia_tm, true),
-		    {noreply, S#state{tm_queue_len = 0}};
-		
-		Len > Threshold ->
-		    {noreply, S#state{tm_queue_len = Len}};
-		
-		true ->
-                    mnesia_lib:overload_set(mnesia_tm, false),
-		    {noreply, S#state{tm_queue_len = 0}}
-	    end;
-	undefined ->
-	    {noreply, S}
-    end;
+    State2 = do_check_overload(S),
+    next_check_overload(),
+    {noreply, State2};
 
 handle_info(garb_decisions, State) ->
     do_garb_decisions(),
+    next_garb(),
     {noreply, State};
 
 handle_info({force_decision, Tid}, State) ->
diff --git a/lib/mnesia/src/mnesia_sup.erl b/lib/mnesia/src/mnesia_sup.erl
index 9ee4086f50..ef858d2364 100644
--- a/lib/mnesia/src/mnesia_sup.erl
+++ b/lib/mnesia/src/mnesia_sup.erl
@@ -60,9 +60,8 @@ init() ->
 
     Event = event_procs(),
     Kernel = kernel_procs(),
-    Mnemosyne = mnemosyne_procs(),
 
-    {ok, {Flags, Event ++ Kernel ++ Mnemosyne}}.
+    {ok, {Flags, Event ++ Kernel}}.
 
 event_procs() ->
     KillAfter = timer:seconds(30),
@@ -75,16 +74,6 @@ kernel_procs() ->
     KA = infinity,
     [{K, {K, start, []}, permanent, KA, supervisor, [K, supervisor]}].
 
-mnemosyne_procs() ->
-    case mnesia_monitor:get_env(embedded_mnemosyne) of
-	true ->
-	    Q = mnemosyne_sup,
-	    KA = infinity,
-	    [{Q, {Q, start, []}, permanent, KA, supervisor, [Q, supervisor]}];
-	false ->
-	    []
-    end.
-    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% event handler
 
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index 0af7f55c06..b5b14ac05b 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -103,7 +103,8 @@ init(Parent) ->
     end,
 
     mnesia_schema:purge_tmp_files(),
-    mnesia_recover:start_garb(),
+    mnesia_recover:next_garb(),
+    mnesia_recover:next_check_overload(),
 
     ?eval_debug_fun({?MODULE, init},  [{nodes, AllOthers}]),
 
diff --git a/lib/mnesia/test/mnesia.spec b/lib/mnesia/test/mnesia.spec
index 204d1519cb..653e515317 100644
--- a/lib/mnesia/test/mnesia.spec
+++ b/lib/mnesia/test/mnesia.spec
@@ -42,9 +42,6 @@
 {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"}.
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 2267a94164..5dbb80d4eb 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -105,7 +105,6 @@ groups() ->
      {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},
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl
index 93510d539c..fd294780da 100644
--- a/lib/mnesia/test/mnesia_config_test.erl
+++ b/lib/mnesia/test/mnesia_config_test.erl
@@ -36,7 +36,6 @@
 	 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,
@@ -104,7 +103,7 @@ 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,
+     dump_log_update_in_place,
      event_module, ignore_fallback_at_startup,
      inconsistent_database, max_wait_for_decision,
      send_compressed, app_test, {group, schema_config},
@@ -610,45 +609,6 @@ dump_log_load_regulation(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-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",
diff --git a/lib/mnesia/test/mnesia_measure_test.erl b/lib/mnesia/test/mnesia_measure_test.erl
index e63689d83a..dfed302814 100644
--- a/lib/mnesia/test/mnesia_measure_test.erl
+++ b/lib/mnesia/test/mnesia_measure_test.erl
@@ -72,8 +72,7 @@ groups() ->
        resource_consumption_at_full_load]},
      {benchmarks, [],
       [{group, meter}, cost, dbn_meters,
-       measure_all_api_functions, {group, tpcb},
-       mnemosyne_vs_mnesia_kernel]},
+       measure_all_api_functions, {group, tpcb}]},
      {tpcb, [], [ram_tpcb, disc_tpcb, disc_only_tpcb]},
      {meter, [], [ram_meter, disc_meter, disc_only_meter]}].
 
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 7135a6abd5..877286033e 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -114,10 +114,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(TARGET_FILES): $(INTERNAL_HRL_FILES)
 
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl
index 380532e90c..72bafcc5e0 100644
--- a/lib/observer/src/observer_app_wx.erl
+++ b/lib/observer/src/observer_app_wx.erl
@@ -28,7 +28,7 @@
 -include("observer_defs.hrl").
 
 %% Import drawing wrappers
--import(observer_perf_wx, [haveGC/1,
+-import(observer_perf_wx, [haveGC/0,
 			   setPen/2, setFont/3, setBrush/2,
 			   strokeLine/5, strokeLines/2, drawRoundedRectangle/6,
 			   drawText/4, getTextExtent/2]).
@@ -114,9 +114,10 @@ init([Notebook, Parent]) ->
 	_ -> ok
     end,
 
-    UseGC = haveGC(DrawingArea),
+    UseGC = haveGC(),
+    Version28 = ?wxMAJOR_VERSION =:= 2 andalso ?wxMINOR_VERSION =:= 8,
     Font = case os:type() of
-	       {unix,_} when UseGC -> 
+	       {unix,_} when UseGC, Version28 ->
 		   wxFont:new(12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_NORMAL);
 	       _ ->
 		   wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT)
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index abf90ac612..54c98f3ba3 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -24,7 +24,7 @@
 	 handle_event/2, handle_sync_event/3, handle_cast/2]).
 
 %% Drawing wrappers for DC and GC areas
--export([haveGC/1,
+-export([haveGC/0,
 	 setPen/2, setFont/3, setBrush/2,
 	 strokeLine/5, strokeLines/2, drawRoundedRectangle/6,
 	 drawText/4, getTextExtent/2]).
@@ -90,11 +90,12 @@ init([Notebook, Parent]) ->
 	_ -> ok
     end,
 
-    UseGC = haveGC(Panel),
+    UseGC = haveGC(),
+    Version28 = ?wxMAJOR_VERSION =:= 2 andalso ?wxMINOR_VERSION =:= 8,
     {Font, SmallFont}
 	= case os:type() of
-	      {unix, _} when UseGC ->
-		  %% Def font is really small when using Graphics contexts for some reason
+	      {unix, _} when UseGC, Version28 ->
+		  %% Def font is really small when using Graphics contexts in 2.8
 		  %% Hardcode it
 		  F = wxFont:new(12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_BOLD),
 		  SF = wxFont:new(10, ?wxFONTFAMILY_DECORATIVE, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
@@ -524,10 +525,9 @@ colors() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% wxDC and ?wxGC wrappers
 
-haveGC(Win) ->
+haveGC() ->
     try
-	GC = ?wxGC:create(Win),
-	?wxGC:destroy(GC),
+	wxGraphicsRenderer:getDefaultRenderer(),
 	true
     catch _:_  -> false
     end.
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index ee67664539..9aaf648ea2 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -225,7 +225,7 @@ handle_info({holder_updated, Count}, State0=#state{grid=Grid}) ->
     State = update_selection(State0),
 
     wxListCtrl:setItemCount(Grid, Count),
-    wxListCtrl:refreshItems(Grid, 0, Count-1),
+    Count > 0 andalso wxListCtrl:refreshItems(Grid, 0, Count-1),
 
     {noreply, State};
 
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index c41f0f006a..5d1ab2e946 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -403,7 +403,7 @@ handle_info({new_cols, New}, State = #state{grid=Grid, columns=Cols0}) ->
     {noreply, State#state{columns=Cols}};
 
 handle_info({refresh, Min, Max}, State = #state{grid=Grid}) ->
-    wxListCtrl:refreshItems(Grid, Min, Max),
+    Max > 0 andalso wxListCtrl:refreshItems(Grid, Min, Max),
     {noreply, State};
 
 handle_info(refresh_interval, State = #state{pid=Pid}) ->
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index e433bea8c2..47740581f0 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -465,41 +465,36 @@ create_connect_dialog(ping, #state{frame = Frame, prev_node=Prev}) ->
 	    cancel
     end;
 create_connect_dialog(connect, #state{frame = Frame}) ->
-    Dialog = wxDialog:new(Frame, ?wxID_ANY, "Distribute node "),
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, "Distribute node",
+			  [{style, ?wxDEFAULT_FRAME_STYLE bor ?wxRESIZE_BORDER}]),
 
     VSizer = wxBoxSizer:new(?wxVERTICAL),
-    RadioBoxSizer = wxBoxSizer:new(?wxHORIZONTAL),
 
     Choices = ["Short name", "Long name"],
-    RadioBox = wxRadioBox:new(Dialog, 1, "",
-			      ?wxDefaultPosition,
-			      ?wxDefaultSize,
-			      Choices,
-			      [{majorDim, 2},
-			       {style, ?wxHORIZONTAL}]),
+    RadioBox = wxRadioBox:new(Dialog, 1, "", ?wxDefaultPosition, ?wxDefaultSize,
+			      Choices, [{majorDim, 2}, {style, ?wxHORIZONTAL}]),
 
     NameText = wxStaticText:new(Dialog, ?wxID_ANY, "Node name: "),
-    NameCtrl = wxTextCtrl:new(Dialog, ?wxID_ANY, [{size, {200, 25}}]),
+    NameCtrl = wxTextCtrl:new(Dialog, ?wxID_ANY, [{size, {300,-1}}]),
     wxTextCtrl:setValue(NameCtrl, "observer"),
     CookieText = wxStaticText:new(Dialog, ?wxID_ANY, "Secret cookie: "),
-    CookieCtrl = wxTextCtrl:new(Dialog, ?wxID_ANY,
-				[{size, {200, 25}}, {style, ?wxTE_PASSWORD}]),
+    CookieCtrl = wxTextCtrl:new(Dialog, ?wxID_ANY,[{style, ?wxTE_PASSWORD}]),
 
-    BtnSizer = wxDialog:createStdDialogButtonSizer(Dialog, ?wxID_DEFAULT),
-    Flags = [{flag, ?wxEXPAND bor ?wxALL}, {border, 5}],
-    wxSizer:add(RadioBoxSizer, RadioBox, Flags),
-
-    wxSizer:add(VSizer, RadioBoxSizer, Flags),
+    BtnSizer = wxDialog:createButtonSizer(Dialog, ?wxOK bor ?wxCANCEL),
+    Dir = ?wxLEFT bor ?wxRIGHT bor ?wxDOWN,
+    Flags = [{flag, ?wxEXPAND bor Dir bor ?wxALIGN_CENTER_VERTICAL}, {border, 5}],
+    wxSizer:add(VSizer, RadioBox, Flags),
     wxSizer:addSpacer(VSizer, 10),
-    wxSizer:add(VSizer, NameText),
+    wxSizer:add(VSizer, NameText, [{flag, ?wxLEFT}, {border, 5}]),
     wxSizer:add(VSizer, NameCtrl, Flags),
     wxSizer:addSpacer(VSizer, 10),
-    wxSizer:add(VSizer, CookieText),
+    wxSizer:add(VSizer, CookieText, [{flag, ?wxLEFT}, {border, 5}]),
     wxSizer:add(VSizer, CookieCtrl, Flags),
     wxSizer:addSpacer(VSizer, 10),
-    wxSizer:add(VSizer, BtnSizer, [{flag, ?wxALIGN_LEFT}]),
+    wxSizer:add(VSizer, BtnSizer, [{proportion, 1}, {flag, ?wxEXPAND bor ?wxALL},{border, 5}]),
 
-    wxWindow:setSizer(Dialog, VSizer),
+    wxWindow:setSizerAndFit(Dialog, VSizer),
+    wxSizer:setSizeHints(VSizer, Dialog),
     CookiePath = filename:join(os:getenv("HOME"), ".erlang.cookie"),
     DefaultCookie = case filelib:is_file(CookiePath) of
 			true ->
@@ -548,28 +543,36 @@ clean_menus(Menus, MenuBar) ->
     remove_menu_items(Menus, MenuBar).
 
 remove_menu_items([{MenuStr = "File", Menus}|Rest], MenuBar) ->
-    MenuId = wxMenuBar:findMenu(MenuBar, MenuStr),
-    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
-    Items = [wxMenu:findItem(Menu, Tag) || #create_menu{text=Tag} <- Menus],
-    [wxMenu:delete(Menu, MItem) || MItem <- Items],
-    case os:type() =:= {unix, darwin} of
-	true ->
-	    wxMenuBar:remove(MenuBar, MenuId),
-	    wxMenu:destroy(Menu);
-	false ->
-	    ignore
-    end,
-    remove_menu_items(Rest, MenuBar);
+    case wxMenuBar:findMenu(MenuBar, MenuStr) of
+	?wxNOT_FOUND ->
+	    remove_menu_items(Rest, MenuBar);
+	MenuId ->
+	    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
+	    Items = [wxMenu:findItem(Menu, Tag) || #create_menu{text=Tag} <- Menus],
+	    [wxMenu:delete(Menu, MItem) || MItem <- Items],
+	    case os:type() =:= {unix, darwin} of
+	    	true ->
+	    	    wxMenuBar:remove(MenuBar, MenuId),
+	    	    wxMenu:destroy(Menu);
+	    	false ->
+	    	    ignore
+	    end,
+	    remove_menu_items(Rest, MenuBar)
+    end;
 remove_menu_items([{"Nodes", _}|_], _MB) ->
     ok;
 remove_menu_items([{Tag, _Menus}|Rest], MenuBar) ->
-    MenuId = wxMenuBar:findMenu(MenuBar, Tag),
-    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
-    wxMenuBar:remove(MenuBar, MenuId),
-    Items = wxMenu:getMenuItems(Menu),
-    [wxMenu:'Destroy'(Menu, Item) || Item <- Items],
-    wxMenu:destroy(Menu),
-    remove_menu_items(Rest, MenuBar);
+    case wxMenuBar:findMenu(MenuBar, Tag) of
+	?wxNOT_FOUND ->
+	    remove_menu_items(Rest, MenuBar);
+	MenuId ->    
+	    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
+	    wxMenuBar:remove(MenuBar, MenuId),
+	    Items = wxMenu:getMenuItems(Menu),
+	    [wxMenu:'Destroy'(Menu, Item) || Item <- Items],
+	    wxMenu:destroy(Menu),
+	    remove_menu_items(Rest, MenuBar)
+    end;
 remove_menu_items([], _MB) ->
     ok.
 
@@ -597,15 +600,22 @@ epmd_nodes(Names) ->
 
 update_node_list(State = #state{menubar=MenuBar}) ->
     {Nodes, NodesMenuItems} = get_nodes(),
-    NodeMenuId = wxMenuBar:findMenu(MenuBar, "Nodes"),
-    NodeMenu = wxMenuBar:getMenu(MenuBar, NodeMenuId),
-    wx:foreach(fun(Item) -> wxMenu:'Destroy'(NodeMenu, Item) end,
-	       wxMenu:getMenuItems(NodeMenu)),
-
+    NodeMenu = case wxMenuBar:findMenu(MenuBar, "Nodes") of
+		   ?wxNOT_FOUND -> 
+		       Menu = wxMenu:new(),
+		       wxMenuBar:append(MenuBar, Menu, "Nodes"),
+		       Menu;
+		   NodeMenuId ->
+		       Menu = wxMenuBar:getMenu(MenuBar, NodeMenuId),
+		       wx:foreach(fun(Item) -> wxMenu:'Destroy'(Menu, Item) end,
+				  wxMenu:getMenuItems(Menu)),
+		       Menu
+	       end,
+	
     Index = wx:foldl(fun(Record, Index) ->
 			     observer_lib:create_menu_item(Record, NodeMenu, Index)
 		     end, 0, NodesMenuItems),
-
+    
     Dist = case erlang:is_alive() of
 	       true  -> #create_menu{id = ?ID_PING, text = "Connect node"};
 	       false -> #create_menu{id = ?ID_CONNECT, text = "Enable distribution"}
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 6f882d0be9..4c04126d4f 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -34,6 +34,7 @@
 
 -define(default_timeout, ?t:minutes(30)).
 -define(sl_alloc_vsns,[r9b]).
+-define(failed_file,"failed-cases.txt").
 
 init_per_testcase(_Case, Config) ->
     DataDir = ?config(data_dir,Config),
@@ -42,9 +43,18 @@ init_per_testcase(_Case, Config) ->
     catch crashdump_viewer:stop(),
     Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
+end_per_testcase(Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
+    case ?config(tc_status,Config) of
+	ok ->
+	    ok;
+	_Fail ->
+	    File = filename:join(?config(data_dir,Config),?failed_file),
+	    {ok,Fd}=file:open(File,[append]),
+	    file:write(Fd,io_lib:format("~w.~n",[Case])),
+	    file:close(Fd)
+    end,
     ok.
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -67,15 +77,26 @@ 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),
+    delete_saved(Config),
     application:start(inets), % will be using the http client later
     httpc:set_options([{ipfamily,inet6fb4}]),
     DataDir = ?config(data_dir,Config),
-    Rels = [R || R <- [r13b,r14b], ?t:is_release_available(R)] ++ [current],
+    Rels = [R || R <- [r14b,r15b], ?t:is_release_available(R)] ++ [current],
     io:format("Creating crash dumps for the following releases: ~p", [Rels]),
     AllDumps = create_dumps(DataDir,Rels),
     ?t:timetrap_cancel(Dog),
     [{dumps,AllDumps}|Config].
 
+delete_saved(Config) ->
+    DataDir = ?config(data_dir,Config),
+    file:delete(filename:join(DataDir,?failed_file)),
+    SaveDir = filename:join(DataDir,"save"),
+    Dumps = filelib:wildcard(filename:join(SaveDir,"*")),
+    lists:foreach(fun(F) -> file:delete(F) end, Dumps),
+    file:del_dir(SaveDir),
+    ok.
+
+
 translate(suite) ->
     [];
 translate(doc) ->
@@ -196,6 +217,23 @@ end_per_suite(doc) ->
     ["Remove generated crashdumps"];
 end_per_suite(Config) when is_list(Config) ->
     Dumps = ?config(dumps,Config),
+    DataDir = ?config(data_dir,Config),
+    FailedFile = filename:join(DataDir,?failed_file),
+    case filelib:is_file(FailedFile) of
+	true ->
+	    SaveDir = filename:join(DataDir,"save"),
+	    file:make_dir(SaveDir),
+	    file:copy(FailedFile,filename:join(SaveDir,?failed_file)),
+	    lists:foreach(
+	      fun(CD) ->
+		      File = filename:basename(CD),
+		      New = filename:join(SaveDir,File),
+		      file:copy(CD,New)
+	      end, Dumps);
+	false ->
+	    ok
+    end,
+    file:delete(FailedFile),
     lists:foreach(fun(CD) -> ok = file:delete(CD) end,Dumps),
     lists:keydelete(dumps,1,Config).
 
@@ -388,7 +426,7 @@ special(Port,File) ->
 
 	    %% I registered a process as aaaaaaaa in the full_dist dumps 
 	    %% to make sure it will be the first in the list when sorted
-	    %% on names. There are some special data here, s� I'll thoroughly
+	    %% on names. There are some special data here, so I'll thoroughly
 	    %% read the process details for this process. Other processes
 	    %% are just briefly traversed.
 	    {Pid,Rest1} = get_first_process(AllProcs),
@@ -568,11 +606,14 @@ expand_link(Html) ->
 
 
 port_details(Port) ->
-    Port1 = contents(Port,"port?port=Port<0.1>"),
-    "#Port<0.1>" = title(Port1),
-    
     Port0 = contents(Port,"port?port=Port<0.0>"),
-    "Could not find port: #Port<0.0>" = title(Port0).
+    Port1 = contents(Port,"port?port=Port<0.1>"),
+    case title(Port0) of
+	"#Port<0.0>" -> % R16 or later
+	    "Could not find port: #Port<0.1>" = title(Port1);
+	"Could not find port: #Port<0.0>" -> % R15 or earlier
+	    "#Port<0.1>" = title(Port1)
+    end.
 
 is_truncated(File) ->
     case filename:extension(filename:rootname(File)) of
@@ -691,6 +732,12 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) ->
     CD.
 
 dump(Node,DataDir,Rel,DumpName) ->
+    case Rel of
+	_ when Rel<r15b, Rel=/=current ->
+	    rpc:call(Node,os,putenv,["ERL_CRASH_DUMP_SECONDS","600"]);
+	_ ->
+	    ok
+    end,
     rpc:call(Node,erlang,halt,[DumpName]),
     Crashdump0 = filename:join(filename:dirname(code:which(?t)),
 			       "erl_crash_dump.n1"),
@@ -752,6 +799,7 @@ rel_opt(Rel) ->
 	r12b -> [{erl,[{release,"r12b_patched"}]}];
 	r13b -> [{erl,[{release,"r13b_patched"}]}];
 	r14b -> [{erl,[{release,"r14b_latest"}]}]; %naming convention changed
+	r15b -> [{erl,[{release,"r15b_latest"}]}];
 	current -> []
     end.
 
@@ -764,7 +812,8 @@ dump_prefix(Rel) ->
 	r12b -> "r12b_dump.";
 	r13b -> "r13b_dump.";
 	r14b -> "r14b_dump.";
-	current -> "r15b_dump."
+	r15b -> "r15b_dump.";
+	current -> "r16b_dump."
     end.
 
 compat_rel(Rel) ->
@@ -776,5 +825,6 @@ compat_rel(Rel) ->
 	r12b -> "+R12 ";
 	r13b -> "+R13 ";
 	r14b -> "+R14 ";
+	r15b -> "+R15 ";
 	current -> ""
     end.
diff --git a/lib/odbc/aclocal.m4 b/lib/odbc/aclocal.m4
index 9578cd35c4..918e30a886 100644
--- a/lib/odbc/aclocal.m4
+++ b/lib/odbc/aclocal.m4
@@ -1849,6 +1849,31 @@ case $erl_gethrvtime in
 esac
 ])dnl
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $$2";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $$2")
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
 dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
 dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
index 026da39e6f..6572d28ee8 100644
--- a/lib/odbc/c_src/Makefile.in
+++ b/lib/odbc/c_src/Makefile.in
@@ -108,17 +108,17 @@ docs:
 
 ifdef UNIX_TARGET
 $(UNIX_TARGET): $(OBJ_DIR)/odbcserver.o
-	$(CC) $(CFLAGS) -o $@ $(OBJ_DIR)/odbcserver.o $(LDFLAGS) $(LIBS)
+	$(V_CC) $(CFLAGS) -o $@ $(OBJ_DIR)/odbcserver.o $(LDFLAGS) $(LIBS)
 endif
 
 ifdef WIN32_TARGET
 $(WIN32_TARGET): $(OBJ_DIR)/odbcserver.o
-	$(LD) $(LDFLAGS) -o $@ $(OBJ_DIR)/odbcserver.o $(ENTRY_OBJ) \
+	$(V_LD) $(LDFLAGS) -o $@ $(OBJ_DIR)/odbcserver.o $(ENTRY_OBJ) \
 		$(LIBS) $(ENTRY_LDFLAGS)
 endif
 
 $(OBJ_DIR)/odbcserver.o: odbcserver.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(TARGET_FLAGS) -o $@ -c odbcserver.c
+	$(V_CC) $(CFLAGS) $(INCLUDES) $(TARGET_FLAGS) -o $@ -c odbcserver.c
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index bec65c71bf..e6ba9f57f5 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -212,4 +212,9 @@ AC_SUBST(ODBC_INCLUDE)
 
 fi dnl "$with_odbc" != "no"
 
+if test "x$GCC" = xyes; then
+    # Treat certain GCC warnings as errors
+    LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+fi
+
 AC_OUTPUT(c_src/$host/Makefile:c_src/Makefile.in)
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 0e3386b11f..a984bf4485 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -105,8 +105,14 @@
  odbc_data_type() = sql_integer | sql_smallint | sql_tinyint |
       {sql_decimal, precision(), scale()} |
       {sql_numeric, precision(), scale()} |
-      {sql_char, size()} | {sql_wchar, size()} | {sql_varchar, size()} | {sql_wvarchar, size()}| {sql_float, precision()} |
-      {sql_wlongvarchar, size()} | {sql_float, precision()} | sql_real | sql_double | sql_bit | atom()
+      {sql_char, size()} |
+      {sql_wchar, size()} |
+      {sql_varchar, size()} |
+      {sql_wvarchar, size()}|
+      {sql_float, precision()} |
+      {sql_wlongvarchar, size()} |
+      {sql_float, precision()} |
+      sql_real | sql_double | sql_bit | atom()
     </code>
     <code type="none">
  precision() = integer()    </code>
diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
index 2af65cc757..bfbda8aaf4 100644
--- a/lib/odbc/src/Makefile
+++ b/lib/odbc/src/Makefile
@@ -95,9 +95,9 @@ clean:
 
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index d61a91f973..2d33546622 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1469,7 +1470,7 @@ utf8(Config) when is_list(Config) ->
     
     odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ "(FIELD text)"),
 
-    Latin1Data = ["���������",
+    Latin1Data = ["ÖÄÅÄÖÅäöå",
                   "testasdf",
                   "Row 3",
                   "Row 4",
@@ -1564,7 +1565,7 @@ timestamp(Config) when is_list(Config) ->
 %%------------------------------------------------------------------------
 
 w_char_support(Ref, Table, CharType, Size) ->
-    Latin1Data = ["���������",
+    Latin1Data = ["ÖÄÅÄÖÅäöå",
                   "testasdf",
                   "Row 3",
                   "Row 4",
diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
index 769c08a9e9..814062034c 100644
--- a/lib/orber/COSS/CosNaming/Makefile
+++ b/lib/orber/COSS/CosNaming/Makefile
@@ -117,7 +117,7 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
 
 docs:
 
@@ -125,10 +125,10 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 IDL-GENERATED: cos_naming_ext.idl cos_naming.idl
-	erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' \
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' \
 	+'{this,"CosNaming::NamingContextExt"}' cos_naming_ext.idl
-	erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' cos_naming.idl
-	>IDL-GENERATED
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' cos_naming.idl
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/orber/c_src/Makefile.in b/lib/orber/c_src/Makefile.in
index 9970642a9f..126ed8af21 100644
--- a/lib/orber/c_src/Makefile.in
+++ b/lib/orber/c_src/Makefile.in
@@ -56,10 +56,10 @@ debug opt: $(OBJDIR) orber
 
 ifeq ($(findstring win32,$(TARGET)),win32)
 orber: 
-	echo "Nothing to build on NT"
+	$(V_colon)echo "Nothing to build on NT"
 else
 orber: 
-	echo "Nothing to build"	
+	$(V_colon)echo "Nothing to build"
 endif
 
 clean:
@@ -74,7 +74,7 @@ $(OBJDIR):
 	-mkdir -p $(OBJDIR)
 
 $(OBJDIR)/%.o: %.c
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
 # ----------------------------------------------------
 # Release Target
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 964ae3e92d..1fd2f644cb 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>2010</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -1142,7 +1142,8 @@ handle_info(_Info, State) ->
       module, and <c>lookup</c> in <c>DB_Administrator_impl.erl</c><em>and</em><c>DB_CommonUser_impl.erl</c>. But wait, is that really necessary? Actually,
       it is not. We simple use the IC compile option <em>impl</em>:</p>
     <pre>
-$ <input>erlc +'{{impl, "DB::CommonUser"}, "DBUser_impl"}'  +'{{impl, "DB::Administrator"}, "DBUser_impl"}' DB.idl</input>
+$ <input>erlc +'{{impl, "DB::CommonUser"}, "DBUser_impl"}'\
+ +'{{impl, "DB::Administrator"}, "DBUser_impl"}' DB.idl</input>
 $ <input>erlc *.erl</input>
     </pre>
     <p>Instead of creating, and not the least, maintaining two call-back modules,
diff --git a/lib/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile
index f1a5106a7b..1cbb983cd6 100644
--- a/lib/orber/examples/Stack/Makefile
+++ b/lib/orber/examples/Stack/Makefile
@@ -104,8 +104,8 @@ docs:
 test: $(TEST_TARGET_FILES)
 
 IDL-GENERATED: stack.idl
-	erlc $(ERL_IDL_FLAGS) stack.idl
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) stack.idl
+	$(V_at)>IDL-GENERATED
 
 $(GEN_FILES): IDL-GENERATED
 
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index 6eb659407d..1c6781e5fd 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -215,10 +215,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(ORBER_VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(ORBER_VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(ORBER_VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(ORBER_VSN);' $< > $@
 
 docs:
 
@@ -227,17 +227,17 @@ docs:
 # ----------------------------------------------------
 
 IDL-GENERATED:  $(ERL_TOP)/lib/ic/include/erlang.idl CORBA.idl OrberIFR.idl
-	erlc $(ERL_IDL_FLAGS) $(ERL_TOP)/lib/ic/include/erlang.idl
-	erlc $(ERL_IDL_FLAGS) CORBA.idl
-	erlc $(ERL_IDL_FLAGS) +'{this,"Orber::IFR"}' OrberIFR.idl
-	>IDL-GENERATED
+	$(gen_verbose)erlc $(ERL_IDL_FLAGS) $(ERL_TOP)/lib/ic/include/erlang.idl
+	$(V_at)erlc $(ERL_IDL_FLAGS) CORBA.idl
+	$(V_at)erlc $(ERL_IDL_FLAGS) +'{this,"Orber::IFR"}' OrberIFR.idl
+	$(V_at)>IDL-GENERATED
 
 $(GEN_ERL_FILES): IDL-GENERATED
 $(TARGET_FILES): IDL-GENERATED
 
 $(GEN_ASN_ERL) $(GEN_ASN_HRL): OrberCSIv2.asn1 OrberCSIv2.set.asn
-	erlc $(ERL_COMPILE_FLAGS) $(ASN_FLAGS) +'{inline,"OrberCSIv2"}' OrberCSIv2.set.asn
-	rm -f $(GEN_ASN_ERL:%.erl=%.beam)
+	$(asn_verbose)erlc $(ERL_COMPILE_FLAGS) $(ASN_FLAGS) +'{inline,"OrberCSIv2"}' OrberCSIv2.set.asn
+	$(V_at)rm -f $(GEN_ASN_ERL:%.erl=%.beam)
 
 #	erlc $(ERL_COMPILE_FLAGS) $(ASN_FLAGS) OrberCSIv2.asn1 ;\
 #	erlc $(GEN_ASN_ERL) 
diff --git a/lib/orber/src/orber_ifr_exceptiondef.erl b/lib/orber/src/orber_ifr_exceptiondef.erl
index 7665d3d1bc..94c25cc4a5 100644
--- a/lib/orber/src/orber_ifr_exceptiondef.erl
+++ b/lib/orber/src/orber_ifr_exceptiondef.erl
@@ -111,26 +111,6 @@ cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
 describe({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
     orber_ifr_contained:describe({ObjType,ObjID}).
 
-%%% *** This function should be removed. Use
-%%% orber_ifr_repository:lookup_id/2 instead.
-
-%%lookup_id(SearchId) ->
-%%    _F = fun() ->
-%%                 Q = query [X.ir_Internal_ID || X <- table(ir_ExceptionDef)]
-%%                     end,
-%%                 mnemosyne:eval(Q)
-%%         end,
-%%    case orber_ifr_utils:ifr_transaction_read(_F) of
-%%	?read_check_2() ->
-%%	    {ok, []};
-%%	?read_check_1(Rep_IDs) ->
-%%	    ExceptionDefs = lists:map(fun(X) -> {ir_ExceptionDef, X} end,
-%%				      Rep_IDs),
-%%	    {ok, lists:filter(fun(X) -> orber_ifr_exceptiondef:'_get_id'(X) ==
-%%					    SearchId end,
-%%			      ExceptionDefs)}
-%%    end.
-
 move({ObjType, ObjID}, New_container, New_name, New_version)
     ?tcheck(ir_ExceptionDef, ObjType) ->
     orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
diff --git a/lib/orber/src/orber_iiop_net.erl b/lib/orber/src/orber_iiop_net.erl
index 2eed0b538a..33e02e3c04 100644
--- a/lib/orber/src/orber_iiop_net.erl
+++ b/lib/orber/src/orber_iiop_net.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -415,11 +415,10 @@ handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
 		 ref = Ref, options = Options, proxy_options = POpts}] ->
 	    ets:delete(?CONNECTION_DB, Pid),
 	    unlink(Pid),
-	    NewListen = new_listen_socket(Type, Listen, Port, Options),
-	    {ok, NewPid} = orber_iiop_socketsup:start_accept(Type, NewListen, 
+	    {ok, NewPid} = orber_iiop_socketsup:start_accept(Type, Listen, 
 							     Ref, POpts),
 	    link(NewPid),
-	    ets:insert(?CONNECTION_DB, #listen{pid = NewPid, socket = NewListen, 
+	    ets:insert(?CONNECTION_DB, #listen{pid = NewPid, socket = Listen, 
 					       port = Port, type = Type, 
 					       ref = Ref, options = Options, 
 					       proxy_options = POpts}),
@@ -445,23 +444,6 @@ handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
 handle_info(_, State) ->
     {noreply,  State}.
 
-new_listen_socket(normal, ListenFd, _Port, _Options) ->
-    ListenFd;
-new_listen_socket(ssl, ListenFd, Port, Options) ->
-    Generation = orber_env:ssl_generation(),
-    if
-	Generation > 2 ->
-	    ListenFd;
-	true ->
-	    case is_process_alive(ssl:pid(ListenFd)) of
-		true ->
-		    ListenFd;
-		_ ->
-		    {ok, Listen, _NP} = orber_socket:listen(ssl, Port, Options, true),
-		    Listen
-	    end
-    end.
-
 from_list(List) ->
     from_list(List, queue:new()).
 
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index e728e43a09..51569f6ec9 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -93,28 +93,28 @@ docs:
 # ----------------------------------------------------
 
 $(BINDIR)/win32sysinfo.exe: $(OBJDIR)/win32sysinfo.o $(ENTRY_OBJ)
-	$(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/win32sysinfo.o $(ENTRY_OBJ)
+	$(V_LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/win32sysinfo.o $(ENTRY_OBJ)
 
 $(BINDIR)/nteventlog.exe: $(EVLOG_OBJECTS)
-	$(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(EVLOG_OBJECTS) $(ENTRY_OBJ)
+	$(V_LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(EVLOG_OBJECTS) $(ENTRY_OBJ)
 
 $(BINDIR)/ferrule: $(OBJDIR)/ferrule.o
-	$(LD) $(LDFLAGS) -o $@ $<
+	$(V_LD) $(LDFLAGS) -o $@ $<
 
 $(BINDIR)/mod_syslog: $(OBJDIR)/mod_syslog.o
-	$(LD) $(LDFLAGS) -o $@ $<
+	$(V_LD) $(LDFLAGS) -o $@ $<
 
 $(BINDIR)/memsup: $(OBJDIR)/memsup.o
-	$(LD) $(LDFLAGS) -o $@ $<
+	$(V_LD) $(LDFLAGS) -o $@ $<
 
 $(BINDIR)/cpu_sup: $(OBJDIR)/cpu_sup.o
-	$(LD) $(LDFLAGS) -o $@ $< $(CPU_SUP_LIBS) 
+	$(V_LD) $(LDFLAGS) -o $@ $< $(CPU_SUP_LIBS)
 
 $(OBJDIR)/%.o: %.c
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(OBJDIR)/%.o: nteventlog/%.c
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(OBJDIR)/memsup.o: memsup.h
 
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile
index 3e24c3d373..19f3dc8367 100644
--- a/lib/os_mon/mibs/Makefile
+++ b/lib/os_mon/mibs/Makefile
@@ -67,16 +67,16 @@ OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
 		      else echo sasl; fi)
 
 $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 $(SNMP_BIN_TARGET_DIR)/OTP-TC.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-TC.mib
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 $(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-MIB.mib
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 v1/%.mib.v1: %.mib
-	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
+	$(gen_verbose)$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
 $(SNMP_BIN_TARGET_DIR)/OTP-OS-MON-MIB.bin: \
 	$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin \
diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
index 864d7a09d4..9fc888e552 100644
--- a/lib/os_mon/src/Makefile
+++ b/lib/os_mon/src/Makefile
@@ -78,10 +78,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 #-------------------------------------------------------
 # Special dependencies
diff --git a/lib/os_mon/src/os_mon.erl b/lib/os_mon/src/os_mon.erl
index df1eccb064..19acae9f0e 100644
--- a/lib/os_mon/src/os_mon.erl
+++ b/lib/os_mon/src/os_mon.erl
@@ -176,9 +176,7 @@ services({unix, sunos}) ->
 services({unix, _}) -> % Other unix.
     [cpu_sup, disksup, memsup];
 services({win32, _}) ->
-    [disksup, memsup, os_sup, sysinfo];
-services(_) ->
-    [].
+    [disksup, memsup, os_sup, sysinfo].
 
 server_name(cpu_sup) -> cpu_sup;
 server_name(disksup) -> disksup;
diff --git a/lib/otp_mibs/mibs/Makefile b/lib/otp_mibs/mibs/Makefile
index 703c4b3ed4..7f43ef31a6 100644
--- a/lib/otp_mibs/mibs/Makefile
+++ b/lib/otp_mibs/mibs/Makefile
@@ -68,7 +68,7 @@ docs:
 # ----------------------------------------------------
 
 v1/%.mib.v1: %.mib
-	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
+	$(gen_verbose)$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
index 03298d39d5..4f03d0228a 100644
--- a/lib/otp_mibs/src/Makefile
+++ b/lib/otp_mibs/src/Makefile
@@ -84,10 +84,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/parsetools/include/yeccpre.hrl b/lib/parsetools/include/yeccpre.hrl
index 3672394fc5..e4c3ba52be 100644
--- a/lib/parsetools/include/yeccpre.hrl
+++ b/lib/parsetools/include/yeccpre.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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,7 +36,7 @@ parse_and_scan({M, F, A}) ->
 
 -spec format_error(any()) -> [char() | list()].
 format_error(Message) ->
-    case io_lib:deep_char_list(Message) of
+    case io_lib:deep_unicode_char_list(Message) of
         true ->
             Message;
         _ ->
@@ -164,7 +164,7 @@ yecctoken_location(Token) ->
 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({char,_,C}) -> io_lib:write_unicode_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);
diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
index 4f199da8ee..7b63475231 100644
--- a/lib/parsetools/src/Makefile
+++ b/lib/parsetools/src/Makefile
@@ -78,10 +78,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/parsetools/src/esyntax.yrl b/lib/parsetools/src/esyntax.yrl
deleted file mode 100644
index 1ecb54f0a7..0000000000
--- a/lib/parsetools/src/esyntax.yrl
+++ /dev/null
@@ -1,360 +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%
-%%
-Nonterminals
-add_op attribute basic_type bif_test
-case_expr clause_body
-clause_guard clause_head comp_op cr_clause cr_clauses expr expr_tail
-exprs farity farity_list form formal_parameter_list function
-function_call function_clause guard guard_call guard_expr
-guard_expr_list guard_exprs guard_expr_tail guard_expr_tuple
-guard_parameter_list
-guard_tests guard_test if_clause if_clauses if_expr list match_expr
-mult_op parameter_list pattern patterns pattern_list pattern_tail pattern_tuple
-prefix_op receive_expr send_expr tuple.
-
-Terminals
-'!' '(' ')' '*' '+' ',' '-' '->' '/' '/=' ':' ';' '<' '=' '=/=' '=:='
-'=<' '==' '>' '>=' '[' ']' 'after' 'band' 'begin' 'bnot'
-'bor' 'bsl' 'bsr' 'bxor' 'case' 'catch' 'div' 'end' 'if' 'of'
-'receive' 'rem' 'when' '{' '|' '}' atom float integer string var.
-% 'receive' 'rem' 'true' 'when' '{' '|' '}' atom float integer string var.
-
-Rootsymbol form.
-
-Endsymbol dot.
-
-Unary 0 'catch'.
-Right 200 '='.
-Right 200 '!'.
-Left 300 add_op.
-Left 400 mult_op.
-Unary 500 prefix_op.
-
-
-add_op -> '+' : '$1'.
-add_op -> '-' : '$1'.
-add_op -> 'bor' : '$1'.
-add_op -> 'bxor' : '$1'.
-add_op -> 'bsl' : '$1'.
-add_op -> 'bsr' : '$1'.
-
-comp_op -> '==' : '$1'.
-comp_op -> '/=' : '$1'.
-comp_op -> '=<' : '$1'.
-comp_op -> '<' : '$1'.
-comp_op -> '>=' : '$1'.
-comp_op -> '>' : '$1'.
-comp_op -> '=:=' : '$1'.
-comp_op -> '=/=' : '$1'.
-
-mult_op -> '*' : '$1'.
-mult_op -> '/' : '$1'.
-mult_op -> 'div' : '$1'.
-mult_op -> 'rem' : '$1'.
-mult_op -> 'band' : '$1'.
-
-prefix_op -> '+' : '$1'.
-prefix_op -> '-' : '$1'.
-prefix_op -> 'bnot' : '$1'.
-
-
-basic_type -> atom : '$1'.
-basic_type -> float : '$1'.
-basic_type -> integer : '$1'.
-basic_type -> string : '$1'.
-basic_type -> var : '$1'.
-% basic_type -> 'true' : {atom, element(2, '$1'), 'true'}.
-
-
-pattern -> basic_type : '$1'.
-pattern -> pattern_list : '$1'.
-pattern -> pattern_tuple : '$1'.
-
-pattern_list -> '[' ']' : {nil, element(2, '$1')}.
-pattern_list -> '[' pattern pattern_tail ']' :
-   {cons, element(2, '$1'), '$2', '$3'}.
-
-pattern_tail -> '|' pattern : '$2'.
-pattern_tail -> ',' pattern pattern_tail :
-   {cons, element(2, '$2'), '$2', '$3'}.
-pattern_tail -> '$empty' : {nil, 0}.
-
-pattern_tuple -> '{' '}' : {tuple, element(2, '$1'), []}.
-pattern_tuple -> '{' patterns '}' : {tuple, element(2, '$1'), '$2'}.
-
-patterns -> pattern : ['$1'].
-patterns -> pattern ',' patterns : ['$1' | '$3'].
-
-
-expr -> basic_type : '$1'.
-expr -> list : '$1'.
-expr -> tuple : '$1'.
-expr -> function_call : '$1'.
-
-expr -> expr add_op expr :
-   {Op, Pos} = '$2',
-   {arith, Pos, Op, '$1', '$3'}.
-expr -> expr mult_op expr :
-   {Op, Pos} = '$2',
-   {arith, Pos, Op, '$1', '$3'}.
-expr -> prefix_op expr:
-   case '$2' of
-       {float, Pos, N} ->
-	   case '$1' of
-	       {'-', _} ->
-		   {float, Pos, -N};
-	       {'+', _} ->
-		   {float, Pos, N};
-	       {Op, Pos1} ->
-		   {arith, Pos1, Op, {float, Pos, N}}
-	   end;
-       {integer, Pos, N} ->
-	   case '$1' of
-	       {'-', _} ->
-		   {integer, Pos, -N};
-	       {'+', _} ->
-		   {integer, Pos, N};
-	       {Op, Pos1} ->
-		   {arith, Pos1, Op, {integer, Pos, N}}
-	   end;
-       _ ->
-	   {Op, Pos} = '$1',
-	   {arith, Pos, Op, '$2'}
-   end.
-
-expr -> '(' expr ')' : '$2'.
-expr -> 'begin' exprs 'end' : {block, element(2, '$1'), '$2'}.
-expr -> 'catch' expr : {'catch', element(2, '$1'), '$2'}.
-
-expr -> case_expr : '$1'.
-expr -> if_expr : '$1'.
-expr -> receive_expr : '$1'.
-expr -> match_expr : '$1'.
-expr -> send_expr : '$1'.
-
-
-list -> '[' ']' : {nil, element(2, '$1')}.
-list -> '[' expr expr_tail ']' : {cons, element(2, '$1'), '$2', '$3'}.
-
-expr_tail -> '|' expr : '$2'.
-expr_tail -> ',' expr expr_tail : {cons, element(2, '$2'), '$2', '$3'}.
-expr_tail -> '$empty' : {nil, 0}.
-
-tuple -> '{' '}' : {tuple, element(2, '$1'), []}.
-tuple -> '{' exprs '}' : {tuple, element(2, '$1'), '$2'}.
-
-
-function_call -> atom '(' parameter_list ')' :
-   case erl_parse:erlang_bif(element(3, '$1'), length('$3')) of
-       true ->
-	   {bif, element(2, '$1'), element(3, '$1'), '$3'};
-       false ->
-	   {call, element(2, '$1'), [], element(3, '$1'), '$3'}
-   end.
-function_call -> atom ':' atom '(' parameter_list ')' :
-   {call, element(2, '$1'), element(3, '$1'), element(3, '$3'), '$5'}.
-
-parameter_list -> exprs : '$1'.
-parameter_list -> '$empty' : [].
-
-
-case_expr -> 'case' expr 'of' cr_clauses 'end' :
-   {'case', element(2, '$1'), '$2', '$4'}.
-
-cr_clause -> pattern clause_guard clause_body :
-   {clause, element(2, '$1'), ['$1'], '$2', '$3'}.
-
-cr_clauses -> cr_clause : ['$1'].
-cr_clauses -> cr_clause ';' cr_clauses : ['$1' | '$3'].
-
-if_expr -> 'if' if_clauses 'end' : {'if', element(2, '$1'), '$2'}.
-
-if_clause -> guard clause_body : {clause, element(2, hd('$2')), '$1', '$2'}.
-
-if_clauses -> if_clause : ['$1'].
-if_clauses -> if_clause ';' if_clauses : ['$1' | '$3'].
-
-receive_expr -> 'receive' 'after' expr clause_body 'end' :
-   {'receive', element(2, '$1'), [], '$3', '$4'}.
-receive_expr -> 'receive' cr_clauses 'end' :
-   {'receive', element(2, '$1'), '$2'}.
-receive_expr -> 'receive' cr_clauses 'after' expr clause_body 'end' :
-   {'receive', element(2, '$1'), '$2', '$4', '$5'}.
-
-
-match_expr -> expr '=' expr :
-   case erl_parse:is_term('$1') of
-       true ->
-	   {match, element(2, '$1'), '$1', '$3'};
-       false ->
-	   throw({error, {element(2, '$1'), yecc, "illegal lhs in match **"}})
-   end.
-
-send_expr -> expr '!' expr :
-   Pos = element(2, '$1'),
-   {send, Pos, '$1', '$3'}.
-
-
-exprs -> expr : ['$1'].
-exprs -> expr ',' exprs : ['$1' | '$3'].
-
-
-guard_expr -> basic_type : '$1'.
-guard_expr -> guard_expr_list : '$1'.
-guard_expr -> guard_expr_tuple : '$1'.
-guard_expr -> guard_call : '$1'.
-guard_expr -> '(' guard_expr ')' : '$2'.
-guard_expr -> guard_expr add_op guard_expr :
-   {Op, Pos} = '$2',
-   {arith, Pos, Op, '$1', '$3'}.
-guard_expr -> guard_expr mult_op guard_expr :
-   {Op, Pos} = '$2',
-   {arith, Pos, Op, '$1', '$3'}.
-guard_expr -> prefix_op guard_expr:
-   case '$2' of
-       {float, Pos, N} ->
-	   case '$1' of
-	       {'-', _} ->
-		   {float, Pos, -N};
-	       {'+', _} ->
-		   {float, Pos, N};
-	       {Op, Pos1} ->
-		   {arith, Pos1, Op, {float, Pos, N}}
-	   end;
-       {integer, Pos, N} ->
-	   case '$1' of
-	       {'-', _} ->
-		   {integer, Pos, -N};
-	       {'+', _} ->
-		   {integer, Pos, N};
-	       {Op, Pos1} ->
-		   {arith, Pos1, Op, {integer, Pos, N}}
-	   end;
-       _ ->
-	   {Op, Pos} = '$1',
-	   {arith, Pos, Op, '$2'}
-   end.
-
-guard_expr_list -> '[' ']' : {nil, element(2, '$1')}.
-guard_expr_list -> '[' guard_expr guard_expr_tail ']' :
-   {cons, element(2, '$1'), '$2', '$3'}.
-
-guard_expr_tail -> '|' guard_expr : '$2'.
-guard_expr_tail -> ',' guard_expr guard_expr_tail :
- {cons, element(2, '$2'), '$2', '$3'}.
-guard_expr_tail -> '$empty' : {nil, 0}.
-
-guard_expr_tuple -> '{' '}' : {tuple, element(2, '$1'), []}.
-guard_expr_tuple -> '{' guard_exprs '}' : {tuple, element(2, '$1'), '$2'}.
-
-guard_exprs -> guard_expr : ['$1'].
-guard_exprs -> guard_expr ',' guard_exprs : ['$1' | '$3'].
-
-
-guard_call -> atom '(' guard_parameter_list ')' :
-   case erl_parse:erlang_guard_bif(element(3, '$1'), length('$3')) of
-       true ->
-	   {bif, element(2, '$1'), element(3, '$1'), '$3'};
-       false ->
-	   throw({error, {element(2, '$1'), yecc, "illegal test in guard **"}})
-   end.
-
-guard_parameter_list -> guard_exprs : '$1'.
-guard_parameter_list -> '$empty' : [].
-
-
-bif_test -> atom '(' guard_parameter_list ')' :
-   case erl_parse:erlang_guard_test(element(3, '$1'), length('$3')) of
-       true ->
-	   {test, element(2, '$1'), element(3, '$1'), '$3'};
-       false ->
-	   throw({error, {element(2, '$1'), yecc, "illegal test in guard **"}})
-   end.
-
-
-guard_test -> bif_test : '$1'.
-guard_test -> guard_expr comp_op guard_expr :
-   {Op, Pos} = '$2',
-   {comp, Pos, Op, '$1', '$3'}.
-
-guard_tests -> guard_test : ['$1'].
-guard_tests -> guard_test ',' guard_tests : ['$1' | '$3'].
-
-% guard -> 'true' : [].
-guard -> atom :
-   case '$1' of
-       {atom, _, true} ->
-           [];
-       _ ->
-	   throw({error, {element(2, '$1'), yecc, "illegal test in guard **"}})
-   end.
-guard -> guard_tests : '$1'.
-
-
-function_clause -> clause_head clause_guard clause_body :
-   {Name, Line, Arity, Parameters} = '$1',
-   {function, Line, Name, Arity,
-    [{clause, element(2, hd('$3')), Parameters, '$2', '$3'}]}.
-
-clause_head -> atom '(' formal_parameter_list ')' :
-   {element(3, '$1'), element(2, '$1'), length('$3'), '$3'}.
-
-formal_parameter_list -> patterns : '$1'.
-formal_parameter_list -> '$empty' : [].
-
-clause_guard -> 'when' guard : '$2'.
-clause_guard -> '$empty' : [].
-
-clause_body -> '->' exprs: '$2'.
-
-
-function -> function_clause : '$1'.
-function -> function_clause ';' function :
-   case '$1' of
-       {function, Pos1, Name1, Arity1, [Clause]} ->
-	   case '$3' of
-	       {function, _, Name1, Arity2, Clauses} ->
-		   if
-		       Arity1 /= Arity2 ->
-			   throw({error, {Pos1, yecc,
-				  io_lib:format('arity conflict in definition of ~w',
-						[Name1])}});
-		       true ->
-			   {function, Pos1, Name1, Arity1, [Clause | Clauses]}
-		   end;
-	       _ ->
-		   throw({error, {Pos1, yecc,
-			  io_lib:format('missing final dot in def of ~w/~w',
-					[Name1, Arity1])}})
-	   end
-   end.
-
-
-attribute -> atom : element(3, '$1').
-attribute -> '[' farity_list ']' : '$2'.
-
-farity_list -> farity : ['$1'].
-farity_list -> farity ',' farity_list : ['$1' | '$3'].
-
-farity -> atom '/' integer : {element(3, '$1'), element(3, '$3')}.
-
-
-form -> '-' atom '(' attribute ')' :
-   {attribute, element(2, '$2'), element(3, '$2'), '$4'}.
-form -> function : '$1'.
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index cdf20461d9..bbef4053b4 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -58,6 +58,7 @@
                gfile=[],        % Graph file
                module,          % Module name
                opts=[],         % Options
+               encoding=none,   % Encoding of Xrl file
                % posix=false,   % POSIX regular expressions
                errors=[],
                warnings=[]
@@ -146,7 +147,9 @@ format_error({regexp,E})->
          end,
     ["bad regexp `",Es,"'"];
 format_error(ignored_characters) ->
-    "ignored characters".
+    "ignored characters";
+format_error(cannot_parse) ->
+    io_lib:fwrite("cannot parse; probably encoding mismatch", []).
 
 %%%
 %%% Local functions
@@ -298,10 +301,10 @@ pack_warnings([]) ->
 report_errors(St) ->
     when_opt(fun () -> 
                      foreach(fun({File,{none,Mod,E}}) -> 
-                                     io:fwrite("~s: ~s\n",
+                                     io:fwrite("~s: ~ts\n",
                                                [File,Mod:format_error(E)]);
                                 ({File,{Line,Mod,E}}) -> 
-                                     io:fwrite("~s:~w: ~s\n",
+                                     io:fwrite("~s:~w: ~ts\n",
                                                [File,Line,Mod:format_error(E)])
                              end, sort(St#leex.errors))
              end, report_errors, St#leex.opts).
@@ -316,11 +319,11 @@ report_warnings(St) ->
     ShouldReport = member(report_warnings, St#leex.opts) orelse ReportWerror,
     when_bool(fun () ->
 		      foreach(fun({File,{none,Mod,W}}) ->
-				      io:fwrite("~s: ~s~s\n",
+				      io:fwrite("~s: ~s~ts\n",
 						[File,Prefix,
 						 Mod:format_error(W)]);
 				 ({File,{Line,Mod,W}}) ->
-				      io:fwrite("~s:~w: ~s~s\n",
+				      io:fwrite("~s:~w: ~s~ts\n",
 						[File,Line,Prefix,
 						 Mod:format_error(W)])
 			      end, sort(St#leex.warnings))
@@ -396,17 +399,18 @@ verbose_print(St, Format, Args) ->
 parse_file(St0) ->
     case file:open(St0#leex.xfile, [read]) of
         {ok,Xfile} ->
+            St1 = St0#leex{encoding = epp:set_encoding(Xfile)},
             try
-                verbose_print(St0, "Parsing file ~s, ", [St0#leex.xfile]),
+                verbose_print(St1, "Parsing file ~s, ", [St1#leex.xfile]),
                 %% We KNOW that errors throw so we can ignore them here.
-                {ok,Line1,St1} = parse_head(Xfile, St0),
-                {ok,Line2,Macs,St2} = parse_defs(Xfile, Line1, St1),
-                {ok,Line3,REAs,Actions,St3} = 
-                    parse_rules(Xfile, Line2, Macs, St2),
-                {ok,Code,St4} = parse_code(Xfile, Line3, St3),
-                verbose_print(St1, "contained ~w rules.~n", [length(REAs)]),
-                {ok,REAs,Actions,Code,St4}
-            after file:close(Xfile)
+                {ok,Line1,St2} = parse_head(Xfile, St1),
+                {ok,Line2,Macs,St3} = parse_defs(Xfile, Line1, St2),
+                {ok,Line3,REAs,Actions,St4} =
+                    parse_rules(Xfile, Line2, Macs, St3),
+                {ok,Code,St5} = parse_code(Xfile, Line3, St4),
+                verbose_print(St5, "contained ~w rules.~n", [length(REAs)]),
+                {ok,REAs,Actions,Code,St5}
+            after ok = file:close(Xfile)
             end;
         {error,Error} ->
             add_error({none,leex,{file_error,Error}}, St0)
@@ -415,7 +419,7 @@ parse_file(St0) ->
 %% parse_head(File, State) -> {ok,NextLine,State}.
 %%  Parse the head of the file. Skip all comments and blank lines.
 
-parse_head(Ifile, St) -> {ok,nextline(Ifile, 0),St}.
+parse_head(Ifile, St) -> {ok,nextline(Ifile, 0, St),St}.
 
 %% parse_defs(File, Line, State) -> {ok,NextLine,Macros,State}.
 %%  Parse the macro definition section of a file. This must exist.
@@ -423,7 +427,7 @@ parse_head(Ifile, St) -> {ok,nextline(Ifile, 0),St}.
 
 parse_defs(Ifile, {ok,?DEFS_HEAD ++ Rest,L}, St) ->
     St1 = warn_ignored_chars(L, Rest, St),
-    parse_defs(Ifile, nextline(Ifile, L), [], St1);
+    parse_defs(Ifile, nextline(Ifile, L, St), [], St1);
 parse_defs(_, {ok,_,L}, St) ->
     add_error({L,leex,missing_defs}, St);
 parse_defs(_, {eof,L}, St) ->
@@ -435,7 +439,7 @@ parse_defs(Ifile, {ok,Chars,L}=Line, Ms, St) ->
     case re:run(Chars, MS, [{capture,all_but_first,list}]) of
         {match,[Name,Def]} ->
             %%io:fwrite("~p = ~p\n", [Name,Def]),
-            parse_defs(Ifile, nextline(Ifile, L), [{Name,Def}|Ms], St);
+            parse_defs(Ifile, nextline(Ifile, L, St), [{Name,Def}|Ms], St);
         _ -> {ok,Line,Ms,St}                    % Anything else
     end;
 parse_defs(_, Line, Ms, St) ->
@@ -446,7 +450,7 @@ parse_defs(_, Line, Ms, St) ->
 
 parse_rules(Ifile, {ok,?RULE_HEAD ++ Rest,L}, Ms, St) ->
     St1 = warn_ignored_chars(L, Rest, St),
-    parse_rules(Ifile, nextline(Ifile, L), Ms, [], [], 0, St1);
+    parse_rules(Ifile, nextline(Ifile, L, St), Ms, [], [], 0, St1);
 parse_rules(_, {ok,_,L}, _, St) ->
     add_error({L,leex,missing_rules}, St);
 parse_rules(_, {eof,L}, _, St) ->
@@ -464,7 +468,7 @@ parse_rules(Ifile, NextLine, Ms, REAs, As, N, St) ->
             case collect_rule(Ifile, Chars, L0) of
                 {ok,Re,Atoks,L1} ->
                     {ok,REA,A,St1} = parse_rule(Re, L0, Atoks, Ms, N, St),
-                    parse_rules(Ifile, nextline(Ifile, L1), Ms,
+                    parse_rules(Ifile, nextline(Ifile, L1, St), Ms,
                                 [REA|REAs], [A|As], N+1, St1);
                 {error,E} -> add_error(E, St)
             end;
@@ -497,8 +501,10 @@ collect_rule(Ifile, Chars, L0) ->
         {error,E,_} -> {error,E}
     end.
 
+collect_action(_Ifile, {error, _}, L, _Cont0) ->
+    {error, {L, leex, cannot_parse}, ignored_end_line};
 collect_action(Ifile, Chars, L0, Cont0) ->
-    case erl_scan:tokens(Cont0, Chars, L0) of
+    case erl_scan:tokens(Cont0, Chars, L0, [unicode]) of
         {done,{ok,Toks,_},_} -> {ok,Toks,L0};
         {done,{eof,_},_} -> {eof,L0};
         {done,{error,E,_},_} -> {error,E,L0};
@@ -560,29 +566,32 @@ parse_code(Ifile, {ok,?CODE_HEAD ++ Rest,CodeL}, St) ->
     St1 = warn_ignored_chars(CodeL, Rest, St),
     {ok, CodePos} = file:position(Ifile, cur),
     %% Just count the lines; copy the code from file to file later.
-    NCodeLines = count_lines(Ifile, 0),
+    EndCodeLine = count_lines(Ifile, CodeL, St),
+    NCodeLines = EndCodeLine - CodeL,
     {ok,{CodeL,CodePos,NCodeLines},St1};
 parse_code(_, {ok,_,L}, St) ->
     add_error({L,leex,missing_code}, St);
 parse_code(_, {eof,L}, St) ->
     add_error({L,leex,missing_code}, St).
 
-count_lines(File, N) ->
+count_lines(File, N, St) ->
     case io:get_line(File, leex) of
         eof -> N;
-        _Line -> count_lines(File, N+1)
+        {error, _} -> add_error({N+1, leex, cannot_parse}, St);
+        _Line -> count_lines(File, N+1, St)
     end.
 
-%% nextline(InputFile, PrevLineNo) -> {ok,Chars,LineNo} | {eof,LineNo}.
+%% nextline(InputFile, PrevLineNo, State) -> {ok,Chars,LineNo} | {eof,LineNo}.
 %%  Get the next line skipping comment lines and blank lines.
 
-nextline(Ifile, L) ->
+nextline(Ifile, L, St) ->
     case io:get_line(Ifile, leex) of
         eof -> {eof,L};
+        {error, _} -> add_error({L+1, leex, cannot_parse}, St);
         Chars ->
             case substr(Chars, span(Chars, " \t\n")+1) of
-                [$%|_Rest] -> nextline(Ifile, L+1);
-                [] -> nextline(Ifile, L+1);
+                [$%|_Rest] -> nextline(Ifile, L+1, St);
+                [] -> nextline(Ifile, L+1, St);
                 _Other -> {ok,Chars,L+1}
             end
     end.
@@ -1289,19 +1298,21 @@ out_file(St0, DFA, DF, Actions, Code) ->
             try
                 case file:open(St0#leex.efile, [write]) of
                     {ok,Ofile} ->
+                        set_encoding(St0, Ofile),
                         try 
+                            output_encoding_comment(Ofile, St0),
                             output_file_directive(Ofile, St0#leex.ifile, 0),
                             out_file(Ifile, Ofile, St0, DFA, DF, Actions,
                                      Code, 1),
                             verbose_print(St0, "ok~n", []),
                             St0
-                        after file:close(Ofile)
+                        after ok = file:close(Ofile)
                         end;
                     {error,Error} ->
                         verbose_print(St0, "error~n", []),
                         add_error({none,leex,{file_error,Error}}, St0)
                 end
-            after file:close(Ifile)
+            after ok = file:close(Ifile)
             end;
         {{error,Error},Ifile} ->
             add_error(Ifile, {none,leex,{file_error,Error}}, St0)
@@ -1310,7 +1321,9 @@ out_file(St0, DFA, DF, Actions, Code) ->
 open_inc_file(State) ->
     Ifile = State#leex.ifile,
     case file:open(Ifile, [read]) of
-        {ok,F} -> {ok,F};
+        {ok,F} ->
+            _ = epp:set_encoding(F),
+            {ok,F};
         Error -> {Error,Ifile}
     end.
 
@@ -1328,6 +1341,7 @@ inc_file_name(Filename) ->
 out_file(Ifile, Ofile, St, DFA, DF, Actions, Code, L) ->
     case io:get_line(Ifile, leex) of
         eof -> output_file_directive(Ofile, St#leex.ifile, L);
+        {error, _} -> add_error(St#leex.ifile, {L, leex, cannot_parse}, St);
         Line ->
             case substr(Line, 1, 5) of
                 "##mod" -> out_module(Ofile, St);
@@ -1347,14 +1361,23 @@ out_erlang_code(File, St, Code, L) ->
     output_file_directive(File, St#leex.xfile, CodeL),
     {ok,Xfile} = file:open(St#leex.xfile, [read]),
     try
+        set_encoding(St, Xfile),
         {ok,_} = file:position(Xfile, CodePos),
-        {ok,_} = file:copy(Xfile, File)
+        ok = file_copy(Xfile, File)
     after 
-        file:close(Xfile)
+        ok = file:close(Xfile)
     end,
     io:nl(File),
     output_file_directive(File, St#leex.ifile, L).
 
+file_copy(From, To) ->
+    case io:get_line(From, leex) of
+        eof -> ok;
+        Line when is_list(Line) ->
+            io:fwrite(To, "~ts", [Line]),
+            file_copy(From, To)
+    end.
+
 out_dfa(File, St, DFA, Code, DF, L) ->
     {_CodeL,_CodePos,NCodeLines} = Code,
     %% Three file attributes before this one...
@@ -1569,7 +1592,7 @@ out_dfa_graph(St, DFA, DF) ->
                 io:fwrite(Gfile, "}~n", []),
                 verbose_print(St, "ok~n", []),
                 St
-            after file:close(Gfile)
+            after ok = file:close(Gfile)
             end;
         {error,Error} ->
             verbose_print(St, "error~n", []),
@@ -1610,6 +1633,16 @@ dfa_edgelabel(Cranges) ->
                    (C)     -> [quote(C)]
                end, Cranges) ++ "]".
 
+set_encoding(#leex{encoding = none}, File) ->
+    ok = io:setopts(File, [{encoding, epp:default_encoding()}]);
+set_encoding(#leex{encoding = E}, File) ->
+    ok = io:setopts(File, [{encoding, E}]).
+
+output_encoding_comment(_File, #leex{encoding = none}) ->
+    ok;
+output_encoding_comment(File, #leex{encoding = Encoding}) ->
+    io:fwrite(File, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
+
 output_file_directive(File, Filename, Line) ->
     io:fwrite(File, <<"-file(~s, ~w).\n">>, 
               [format_filename(Filename), Line]).
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index b0792a6ed8..dbb7d025ae 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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,6 +42,7 @@
           includefile,
           includefile_version,
           module,
+          encoding = none,
           options = [],
           verbose = false,
           file_attrs = true,
@@ -224,7 +225,11 @@ format_error({unused_nonterminal, Nonterminal}) ->
                   [format_symbol(Nonterminal)]);
 format_error({unused_terminal, Terminal}) ->
     io_lib:fwrite("terminal symbol ~s not used", 
-                  [format_symbol(Terminal)]).
+                  [format_symbol(Terminal)]);
+format_error({bad_symbol, String}) ->
+    io_lib:fwrite("bad symbol ~ts", [String]);
+format_error(cannot_parse) ->
+    io_lib:fwrite("cannot parse; possibly encoding mismatch", []).
 
 file(File) ->
     file(File, [report_errors, report_warnings]).
@@ -257,7 +262,7 @@ yecc(Infile, Outfile, Verbose) ->
     yecc(Infile, Outfile, Verbose, []).
 
 yecc(Infilex, Outfilex, Verbose, Includefilex) ->
-    statistics(runtime),
+    _ = statistics(runtime),
     case file(Infilex, [{parserfile, Outfilex}, 
                         {verbose, Verbose}, 
                         {report, true},
@@ -407,7 +412,9 @@ infile(Parent, Infilex, Options) ->
     St = case file:open(St0#yecc.infile, [read, read_ahead]) of
              {ok, Inport} ->
                  try 
-                     outfile(St0#yecc{inport = Inport})
+                     Encoding = epp:set_encoding(Inport),
+                     St1 = St0#yecc{inport = Inport, encoding = Encoding},
+                     outfile(St1)
                  after
                      ok = file:close(Inport)
                  end;
@@ -428,6 +435,8 @@ outfile(St0) ->
     case file:open(St0#yecc.outfile, [write, delayed_write]) of
         {ok, Outport} ->
             try 
+                %% Set the same encoding as infile:
+                set_encoding(St0, Outport),
                 generate(St0#yecc{outport = Outport, line = 1})
             catch 
                 throw: St1  ->
@@ -466,13 +475,14 @@ timeit(Name, Fun, St0) ->
 -define(PASS(P), {P, fun P/1}).
 
 generate(St0) ->
+    St1 = output_encoding_comment(St0),
     Passes = [?PASS(parse_grammar), ?PASS(check_grammar),
               ?PASS(states_and_goto_table), ?PASS(parse_actions),
               ?PASS(action_conflicts), ?PASS(write_file)],
-    F = case member(time, St0#yecc.options) of
+    F = case member(time, St1#yecc.options) of
             true -> 
                 io:fwrite(<<"Generating parser from grammar in ~s\n">>, 
-                          [format_filename(St0#yecc.infile)]),
+                          [format_filename(St1#yecc.infile)]),
                 fun timeit/3;
             false ->
                 fun(_Name, Fn, St) -> Fn(St) end
@@ -484,13 +494,13 @@ generate(St0) ->
                       true -> throw(St2)
                   end
           end,
-    foldl(Fun, St0, Passes).
+    foldl(Fun, St1, Passes).
 
 parse_grammar(St) ->
     parse_grammar(St#yecc.inport, 1, St).
 
 parse_grammar(Inport, Line, St) ->
-    {NextLine, Grammar} = read_grammar(Inport, Line),
+    {NextLine, Grammar} = read_grammar(Inport, St, Line),
     parse_grammar(Grammar, Inport, NextLine, St).
 
 parse_grammar(eof, _Inport, _NextLine, St) ->
@@ -523,6 +533,8 @@ parse_grammar({rule, Rule, Tokens}, St0) ->
     St#yecc{rules_list = [RuleDef | St#yecc.rules_list]};
 parse_grammar({prec, Prec}, St) ->
     St#yecc{prec = Prec ++ St#yecc.prec};
+parse_grammar({#symbol{}, [{string,Line,String}]}, St) ->
+    add_error(Line, {bad_symbol, String}, St);
 parse_grammar({#symbol{line = Line, name = Name}, Symbols}, St) ->
     CF = fun(I) ->
                  case element(I, St) of
@@ -543,12 +555,17 @@ parse_grammar({#symbol{line = Line, name = Name}, Symbols}, St) ->
         _ -> add_warning(Line, bad_declaration, St)
     end.
 
-read_grammar(Inport, Line) ->
+read_grammar(Inport, St, Line) ->
     case yeccscan:scan(Inport, '', Line) of
         {eof, NextLine} ->
             {NextLine, eof};
         {error, {ErrorLine, Mod, What}, NextLine} ->
             {NextLine, {error, ErrorLine, {error, Mod, What}}};
+        {error, terminated} ->
+            throw(St);
+        {error, _} ->
+            File = St#yecc.infile,
+            throw(add_error(File, none, cannot_parse, St));
         {ok, Input, NextLine} ->
             {NextLine, case yeccparser:parse(Input) of
                            {error, {ErrorLine, Mod, Message}} ->
@@ -738,9 +755,9 @@ states_and_goto_table(St0) ->
     create_precedence_table(St).
 
 parse_actions(St) ->
-    erase(), % the pd is used when decoding lookahead sets
+    _ = erase(), % the pd is used when decoding lookahead sets
     ParseActions = compute_parse_actions(St#yecc.n_states, St, []),
-    erase(),
+    _ = erase(),
     St#yecc{parse_actions = ParseActions, state_tab = []}.
 
 action_conflicts(St0) ->
@@ -841,10 +858,10 @@ report_errors(St) ->
     case member(report_errors, St#yecc.options) of
         true ->
             foreach(fun({File,{none,Mod,E}}) -> 
-                            io:fwrite(<<"~s: ~s\n">>, 
+                            io:fwrite(<<"~s: ~ts\n">>,
                                       [File,Mod:format_error(E)]);
                        ({File,{Line,Mod,E}}) -> 
-                            io:fwrite(<<"~s:~w: ~s\n">>, 
+                            io:fwrite(<<"~s:~w: ~ts\n">>,
                                       [File,Line,Mod:format_error(E)])
                     end, sort(St#yecc.errors));
         false -> 
@@ -861,11 +878,11 @@ report_warnings(St) ->
     case member(report_warnings, St#yecc.options) orelse ReportWerror of
         true ->
             foreach(fun({File,{none,Mod,W}}) -> 
-                            io:fwrite(<<"~s: ~s~s\n">>,
+                            io:fwrite(<<"~s: ~s~ts\n">>,
                                       [File,Prefix,
 				       Mod:format_error(W)]);
                        ({File,{Line,Mod,W}}) -> 
-                            io:fwrite(<<"~s:~w: ~s~s\n">>,
+                            io:fwrite(<<"~s:~w: ~s~ts\n">>,
                                       [File,Line,Prefix,
 				       Mod:format_error(W)])
                     end, sort(St#yecc.warnings));
@@ -1024,7 +1041,7 @@ compute_states(St0) ->
                    rp_info = RulePointerInfo,
                    goto = GotoTab},
 
-    erase(),
+    _ = erase(),
     EndsymCode = code_terminal(StC#yecc.endsymbol, StC#yecc.symbol_tab),
     {StateId, State0} = compute_state([{EndsymCode, 1}], Tables),
 
@@ -1923,9 +1940,10 @@ output_prelude(Outport, Inport, St0) when St0#yecc.includefile =:= [] ->
                 {St20, 0, no_erlang_code};
             Next_line ->
                 St_10 = output_file_directive(St20, Infile, Next_line-1),
-                Nmbr_of_lines = include1([], Inport, Outport),
-                {St_10, Nmbr_of_lines, 
-                 {last_erlang_code_line, Next_line+Nmbr_of_lines}}
+                Last_line = include1([], Inport, Outport, Infile,
+                                     Next_line, St_10),
+                Nmbr_of_lines = Last_line - Next_line,
+                {St_10, Nmbr_of_lines, {last_erlang_code_line, Last_line}}
     end,
     St30 = nl(St25),
     IncludeFile = 
@@ -1946,13 +1964,13 @@ output_prelude(Outport, Inport, St0) ->
             {St30, N_lines_1, no_erlang_code};
         Next_line ->
             St = output_file_directive(St30, Infile, Next_line-1),
-            Nmbr_of_lines = include1([], Inport, Outport),
-            {St, Nmbr_of_lines + N_lines_1, 
-             {last_erlang_code_line, Next_line+Nmbr_of_lines}}
+            Last_line = include1([], Inport, Outport, Infile, Next_line, St),
+            Nmbr_of_lines = Last_line - Next_line,
+            {St, Nmbr_of_lines + N_lines_1, {last_erlang_code_line, Last_line}}
     end.
 
 output_header(St0) ->
-    lists:foldl(fun(Str, St) -> fwrite(St, <<"~s\n">>, [Str]) 
+    lists:foldl(fun(Str, St) -> fwrite(St, <<"~ts\n">>, [Str])
                 end, St0, St0#yecc.header).
 
 output_goto(St, [{_Nonterminal, []} | Go], StateInfo) ->
@@ -2250,8 +2268,8 @@ output_inlined(St0, FunctionName, Reduce, Infile) ->
                           [append(["[", tl(A), " | __Stack]"])])
            end,
     St = St40#yecc{line = St40#yecc.line + NLines},
-    fwrite(St, <<" [begin\n  ~s\n  end | ~s].\n\n">>, 
-           [pp_tokens(Tokens, Line0), Stack]).
+    fwrite(St, <<" [begin\n  ~ts\n  end | ~s].\n\n">>,
+           [pp_tokens(Tokens, Line0, St#yecc.encoding), Stack]).
 
 inlined_function_name(State, "Cat") ->
     inlined_function_name(State, "");
@@ -2421,24 +2439,24 @@ include(St, File, Outport) ->
         {error, Reason} ->
             throw(add_error(File, none, {file_error, Reason}, St));
         {ok, Inport} ->
+            _ = epp:set_encoding(Inport),
             Line = io:get_line(Inport, ''),
-            N_lines = include1(Line, Inport, Outport),
-            file:close(Inport),
-            N_lines
+            try include1(Line, Inport, Outport, File, 1, St) - 1
+            after ok = file:close(Inport)
+            end
     end.
 
-include1(Line, Inport, Outport) ->
-    include1(Line, Inport, Outport, 0).
-
-include1(eof, _, _, Nmbr_of_lines) ->
-    Nmbr_of_lines;
-include1(Line, Inport, Outport, Nmbr_of_lines) ->
+include1(eof, _, _, _File, L, _St) ->
+    L;
+include1({error, _}=_Error, _Inport, _Outport, File, L, St) ->
+    throw(add_error(File, L, cannot_parse, St));
+include1(Line, Inport, Outport, File, L, St) ->
     Incr = case member($\n, Line) of
                true -> 1;
                false -> 0
            end,
     io:put_chars(Outport, Line),
-    include1(io:get_line(Inport, ''), Inport, Outport, Nmbr_of_lines + Incr).
+    include1(io:get_line(Inport, ''), Inport, Outport, File, L + Incr, St).
 
 includefile_version([]) ->
     {1,4};
@@ -2465,18 +2483,22 @@ parse_file(Epp) ->
     end.
 
 %% Keeps the line breaks of the original code.
-pp_tokens(Tokens, Line0) ->
-    concat(pp_tokens1(Tokens, Line0, [])).
+pp_tokens(Tokens, Line0, Enc) ->
+    concat(pp_tokens1(Tokens, Line0, Enc, [])).
     
-pp_tokens1([], _Line0, _T0) ->
+pp_tokens1([], _Line0, _Enc, _T0) ->
     [];
-pp_tokens1([T | Ts], Line0, T0) ->
+pp_tokens1([T | Ts], Line0, Enc, T0) ->
     Line = element(2, T),
-    [pp_sep(Line, Line0, T0), pp_symbol(T) | pp_tokens1(Ts, Line, T)].
+    [pp_sep(Line, Line0, T0), pp_symbol(T, Enc)|pp_tokens1(Ts, Line, Enc, T)].
 
-pp_symbol({var,_,Var}) -> Var;
-pp_symbol({_,_,Symbol}) -> io_lib:fwrite(<<"~p">>, [Symbol]);
-pp_symbol({Symbol, _}) -> Symbol.
+pp_symbol({var,_,Var}, _Enc) -> Var;
+pp_symbol({string,_,String}, latin1) ->
+    io_lib:write_unicode_string_as_latin1(String);
+pp_symbol({string,_,String}, _Enc) -> io_lib:write_unicode_string(String);
+pp_symbol({_,_,Symbol}, latin1) -> io_lib:fwrite(<<"~p">>, [Symbol]);
+pp_symbol({_,_,Symbol}, _Enc) -> io_lib:fwrite(<<"~tp">>, [Symbol]);
+pp_symbol({Symbol, _}, _Enc) -> Symbol.
 
 pp_sep(Line, Line0, T0) when Line > Line0 -> 
     ["\n   " | pp_sep(Line - 1, Line0, T0)];
@@ -2485,6 +2507,16 @@ pp_sep(_Line, _Line0, {'.',_}) ->
 pp_sep(_Line, _Line0, _T0) -> 
     " ".
 
+set_encoding(#yecc{encoding = none}, Port) ->
+    ok = io:setopts(Port, [{encoding, epp:default_encoding()}]);
+set_encoding(#yecc{encoding = E}, Port) ->
+    ok = io:setopts(Port, [{encoding, E}]).
+
+output_encoding_comment(#yecc{encoding = none}=St) ->
+    St;
+output_encoding_comment(#yecc{encoding = Encoding}=St) ->
+    fwrite(St, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
+
 output_file_directive(St, Filename, Line) when St#yecc.file_attrs ->
     fwrite(St, <<"-file(~s, ~w).\n">>, 
            [format_filename(Filename), Line]);
@@ -2529,7 +2561,7 @@ format_assoc(nonassoc) ->
 
 format_symbol(Symbol) ->
     String = concat([Symbol]),
-    case erl_scan:string(String) of
+    case erl_scan:string(String, 1, [unicode]) of
         {ok, [{atom, _, _}], _} ->
             io_lib:fwrite(<<"~w">>, [Symbol]);
         {ok, [{Word, _}], _} when Word =/= ':', Word =/= '->' ->
diff --git a/lib/parsetools/src/yeccscan.erl b/lib/parsetools/src/yeccscan.erl
index d7ec3ba8d3..9e0e85143a 100644
--- a/lib/parsetools/src/yeccscan.erl
+++ b/lib/parsetools/src/yeccscan.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The 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,7 @@ scan(Inport) ->
     scan(Inport, '', 1).
 
 scan(Inport, Prompt, Line1) ->
-    case catch io:scan_erl_form(Inport, Prompt, Line1) of
+    case catch io:scan_erl_form(Inport, Prompt, Line1, [unicode]) of
 	{eof, Line2} ->
 	    {eof, Line2};
 	{ok, Tokens, Line2} ->
@@ -34,6 +34,8 @@ scan(Inport, Prompt, Line1) ->
 		_ ->
 		    {ok, lex(Tokens), Line2}
 	    end;
+        {error, Reason} ->
+            {error, Reason};
 	{error, Descriptor, Line2} ->
 	    {error, Descriptor, Line2};
 	{'EXIT', Why} ->
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 1e50aedf07..9d591c0d05 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: latin-1 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %% 
 %% The 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 +43,9 @@
 -export([
 	 file/1, compile/1, syntax/1,
 	 
-	 pt/1, man/1, ex/1, ex2/1, not_yet/1]).
+	 pt/1, man/1, ex/1, ex2/1, not_yet/1,
+
+         otp_10302/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -63,7 +66,8 @@ all() ->
 
 groups() -> 
     [{checks, [], [file, compile, syntax]},
-     {examples, [], [pt, man, ex, ex2, not_yet]}].
+     {examples, [], [pt, man, ex, ex2, not_yet]},
+     {tickets, [], [otp_10302]}].
 
 init_per_suite(Config) ->
     Config.
@@ -645,7 +649,6 @@ reserved_word('fun') -> true;
 reserved_word('if') -> true;
 reserved_word('let') -> true;
 reserved_word('of') -> true;
-reserved_word('query') -> true;
 reserved_word('receive') -> true;
 reserved_word('when') -> true;
 reserved_word('bnot') -> true;
@@ -875,6 +878,111 @@ not_yet(Config) when is_list(Config) ->
 
     ok.
 
+otp_10302(doc) ->
+    "OTP-10302. Unicode characters scanner/parser.";
+otp_10302(suite) -> [];
+otp_10302(Config) when is_list(Config) ->
+    Dir = ?privdir,
+    Filename = filename:join(Dir, "file.xrl"),
+    Ret = [return, {report, true}],
+
+    ok = file:write_file(Filename,<<
+         "%% coding: UTF-8\n"
+         "�"
+     >>),
+    {error,[{_,[{2,leex,cannot_parse}]}],[]} =
+        leex:file(Filename, Ret),
+
+    ok = file:write_file(Filename,<<
+         "%% coding: UTF-8\n"
+         "Definitions.\n"
+         "�"
+     >>),
+    {error,[{_,[{3,leex,cannot_parse}]}],[]} = leex:file(Filename, Ret),
+
+    ok = file:write_file(Filename,<<
+         "%% coding: UTF-8\n"
+         "Definitions.\n"
+         "A = a\n"
+         "L = [{A}-{Z}]\n"
+         "Z = z\n"
+         "Rules.\n"
+         "{L}+ : {token,{list_to_atom(TokenChars),H�pp}}.\n"
+     >>),
+    {error,[{_,[{7,leex,cannot_parse}]}],[]} = leex:file(Filename, Ret),
+
+    ok = file:write_file(Filename,<<
+         "%% coding: UTF-8\n"
+         "Definitions.\n"
+         "A = a\n"
+         "L = [{A}-{Z}]\n"
+         "Z = z\n"
+         "Rules.\n"
+         "{L}+ : {token,{list_to_atom(TokenChars)}}.\n"
+         "Erlang code.\n"
+         "-export([t/0]).\n"
+         "t() ->\n"
+         "    H�pp\n"
+      >>),
+    {error,[{_,[{11,leex,cannot_parse}]}],[]} = leex:file(Filename, Ret),
+
+    Mini = <<"Definitions.\n"
+             "D  = [0-9]\n"
+             "Rules.\n"
+             "{L}+  : {token,{word,TokenLine,TokenChars}}.\n"
+             "Erlang code.\n">>,
+    LeexPre = filename:join(Dir, "leexinc.hrl"),
+    ?line ok = file:write_file(LeexPre, <<"%% coding: UTF-8\n �">>),
+    PreErrors = run_test(Config, Mini, LeexPre),
+    {error,[{IncludeFile,[{2,leex,cannot_parse}]}],[]} = PreErrors,
+    "leexinc.hrl" = filename:basename(IncludeFile),
+
+    Ts = [{uni_1,
+       <<"%% coding: UTF-8\n"
+         "Definitions.\n"
+         "A = a\n"
+         "L = [{A}-{Z}]\n"
+         "Z = z\n"
+         "Rules.\n"
+         "{L}+ : {token,{list_to_atom(TokenChars),\n"
+         "begin Häpp = foo, Häpp end,"
+         " 'Häpp',\"\\x{400}B\",\"örn_Ѐ\"}}.\n"
+         "Erlang code.\n"
+         "-export([t/0]).\n"
+         "t() ->\n"
+         "    %% Häpp, 'Häpp',\"\\x{400}B\",\"örn_Ѐ\"\n"
+         "    {ok, [R], 1} = string(\"tip\"),\n"
+         "    {tip,foo,'Häpp',[1024,66],[246,114,110,95,1024]} = R,\n"
+         "    Häpp = foo,\n"
+         "    {tip, Häpp, 'Häpp',\"\\x{400}B\",\"örn_Ѐ\"} = R,\n"
+         "    ok.\n">>,
+          default,
+          ok},
+      {uni_2,
+       <<"%% coding: Latin-1\n"
+         "Definitions.\n"
+         "A = a\n"
+         "L = [{A}-{Z}]\n"
+         "Z = z\n"
+         "Rules.\n"
+         "{L}+ : {token,{list_to_atom(TokenChars),\n"
+         "begin H�pp = foo, H�pp end,"
+         " 'H�pp',\"\\x{400}B\",\"örn_Ѐ\"}}.\n"
+         "Erlang code.\n"
+         "-export([t/0]).\n"
+         "t() ->\n"
+         "    %% H�pp, 'H�pp',\"\\x{400}B\",\"örn_Ѐ\"\n"
+         "    {ok, [R], 1} = string(\"tip\"),\n"
+         "    {tip,foo,'H�pp',[1024,66],[195,182,114,110,95,208,128]} = R,\n"
+         "    H�pp = foo,\n"
+         "    {tip, H�pp, 'H�pp',\"\\x{400}B\",\"örn_Ѐ\"} = R,\n"
+         "    ok.\n">>,
+          default,
+          ok}],
+    run(Config, Ts),
+
+    ok.
+
 unwritable(Fname) ->
     {ok, Info} = file:read_file_info(Fname),
     Mode = Info#file_info.mode - 8#00200,
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 3d26adf1be..c306dbe833 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: latin-1 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %%
 %% The 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,7 +49,7 @@
 	 
 	 otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
 	 
-	 otp_7292/1, otp_7969/1, otp_8919/1]).
+	 otp_7292/1, otp_7969/1, otp_8919/1, otp_10302/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -75,7 +76,7 @@ groups() ->
       [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]}].
+     {improvements, [], [otp_7292, otp_7969, otp_8919, otp_10302]}].
 
 init_per_suite(Config) ->
     Config.
@@ -1815,6 +1816,153 @@ otp_8919(Config) when is_list(Config) ->
     "syntax error before: \"hello\"" = lists:flatten(Mod:format_error(Mess)),
     ok.
 
+otp_10302(doc) ->
+    "OTP-10302. Unicode characters scanner/parser.";
+otp_10302(suite) -> [];
+otp_10302(Config) when is_list(Config) ->
+    Dir = ?privdir,
+    Filename = filename:join(Dir, "OTP-10302.yrl"),
+    Ret = [return, {report, true}],
+    Mini1 = <<"%% coding: utf-8
+               Nonterminals H�pp.
+               nt -> t.">>,
+    ok = file:write_file(Filename, Mini1),
+    %% This could (and should) be refined:
+    {error,[{Filename,[{2,Mod1,Err1}]}],[]} =
+        yecc:file(Filename, Ret),
+    "cannot translate from UTF-8" = Mod1:format_error(Err1),
+
+    Mini2 = <<"%% coding: Utf-8
+               Nonterminals Hopp.
+               Terminals t.
+               Rootsymbol Hopp.
+
+               Hopp -> t.
+
+               Erlang code.
+
+               t() ->
+                   H�pp.">>,
+    ok = file:write_file(Filename, Mini2),
+    {error,[{Filename,[{11,Mod2,Err2}]}],[]} =
+        yecc:file(Filename, Ret),
+    "cannot parse; possibly encoding mismatch" = Mod2:format_error(Err2),
+
+    Mini3 = <<"%% coding: latin-1
+               Nonterminals Hopp.
+               Terminals t.
+               Rootsymbol Hopp.
+
+               Hopp -> t.
+
+               Erlang code.
+
+               t() ->
+                   H�pp.">>,
+    ok = file:write_file(Filename, Mini3),
+    YeccPre = filename:join(Dir, "yeccpre.hrl"),
+    ok = file:write_file(YeccPre, [<<"%% coding: UTF-8\n �.\n">>]),
+    Inc = [{includefile,YeccPre}],
+    {error,[{_,[{2,yecc,cannot_parse}]}],[]} =
+        yecc:file(Filename, Inc ++ Ret),
+
+    ok = file:write_file(Filename,
+     <<"%% coding: UTF-8
+        Nonterminals Hopp.
+        Terminals t.
+        Rootsymbol \"örn_Ѐ\".
+        Hopp -> t : '$1'.">>),
+    {error,[{Filename,[{4,yecc,{bad_symbol,"�rn_"++[1024]}}]}],[]} =
+        yecc:file(Filename, Ret),
+
+    ok = file:write_file(Filename,
+     <<"%% coding: UTF-8
+        Nonterminals Hopp.
+        Terminals t.
+        Rootsymbol Hopp.
+        Endsymbol \"örn_Ѐ\".
+        Hopp -> t : '$1'.">>),
+    {error,[{Filename,[{5,yecc,{bad_symbol,"�rn_"++[1024]}}]}],[]} =
+        yecc:file(Filename, Ret),
+
+    ok = file:write_file(Filename,
+     <<"%% coding: UTF-8
+        Nonterminals Hopp.
+        Terminals t.
+        Rootsymbol Hopp.
+        Expect \"örn_Ѐ\".
+        Hopp -> t : '$1'.">>),
+    {error,[{Filename,[{5,yecc,{bad_symbol,"�rn_"++[1024]}}]}],[]} =
+        yecc:file(Filename, Ret),
+
+    ok = file:write_file(Filename,
+     <<"%% coding: UTF-8
+        Nonterminals Hopp.
+        Terminals t.
+        Rootsymbol Hopp.
+        States \"örn_Ѐ\".
+        Hopp -> t : '$1'.">>),
+    {error,[{Filename,[{5,yecc,{bad_symbol,"�rn_"++[1024]}}]}],[]} =
+        yecc:file(Filename, Ret),
+
+    Ts = [{otp_10302_1,<<"
+           %% coding: UTF-8
+           Header \"%% örn_Ѐ\" \"%% \\x{400}B\".
+           Nonterminals Häpp list.
+           Terminals element.
+           Rootsymbol Häpp.
+
+           Häpp -> list : '$1'.
+
+           list -> element : '$1'.
+           list -> list element :
+                       begin
+                           Häpp = foo,
+                           {Häpp, 'Häpp',\"\\x{400}B\",\"örn_Ѐ\"}
+                       end.
+
+           Erlang code.
+
+           -export([t/0]).
+
+           t() ->
+               L = [{element, 1}, {element,2}],
+               {ok, R} = parse(L),
+               Häpp = foo,
+               {_,_,[1024,66],[246,114,110,95,1024]} = R,
+               {Häpp,'Häpp',\"\\x{400}B\",\"örn_Ѐ\"} = R,
+               ok.
+          ">>,default,ok},
+          {otp_10302_2,<<"
+           %% coding: Latin-1
+           Nonterminals H�pp list.
+           Terminals element.
+           Rootsymbol H�pp.
+
+           H�pp -> list : '$1'.
+
+           list -> element : '$1'.
+           list -> list element :
+                       begin
+                           H�pp = foo,
+                           {H�pp, 'H�pp',\"\\x{400}B\",\"örn_Ѐ\"}
+                       end.
+
+           Erlang code.
+
+           -export([t/0]).
+
+           t() ->
+               L = [{element, 1}, {element,2}],
+               {ok, R} = parse(L),
+               H�pp = foo,
+               {_,_,[1024,66],[195,182,114,110,95,208,128]} = R,
+               {H�pp,'H�pp',\"\\x{400}B\",\"örn_Ѐ\"} = R,
+               ok.
+          ">>,default,ok}],
+    run(Config, Ts),
+    ok.
+
 yeccpre_size() ->
     yeccpre_size(default_yeccpre()).
 
diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
index 253a8c2da3..6bf0af9dc6 100644
--- a/lib/percept/src/Makefile
+++ b/lib/percept/src/Makefile
@@ -80,10 +80,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile
index fa01fe7238..eb0413bdbc 100644
--- a/lib/pman/src/Makefile
+++ b/lib/pman/src/Makefile
@@ -85,10 +85,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index 763b788e53..f765906b3b 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -81,10 +81,10 @@ clean:
 docs:
 
 %.erl %.hrl: %.set.asn
-	erlc $(ASN_FLAGS) $<
+	$(asn_verbose)erlc $(ASN_FLAGS) $<
 
 $(INCLUDE)/%.hrl: %.hrl
-	cp -p $<  $@
+	$(gen_verbose)cp -p $<  $@
 
 # ----------------------------------------------------
 # Release Target
@@ -119,6 +119,6 @@ OTP-PUB-KEY.asn1db:		PKIX1Algorithms88.asn1 \
 				OTP-PKIX.asn1
 
 $(EBIN)/PKCS-FRAME.beam: 	        PKCS-FRAME.erl PKCS-FRAME.hrl
-PKCS-FRAME.erl PKCS-FRAME.hrl:	        PKCS-FRAME.asn1db
+PKCS-FRAME.erl PKCS-FRAME.hrl:		PKCS-FRAME.asn1db
 PKCS-FRAME.asn1db:			PKCS5v2-0.asn1\
 					PKCS-8.asn1\
diff --git a/lib/public_key/asn1/OTP-PUB-KEY.asn1config b/lib/public_key/asn1/OTP-PUB-KEY.asn1config
index 86f4c54748..9ca30564af 100644
--- a/lib/public_key/asn1/OTP-PUB-KEY.asn1config
+++ b/lib/public_key/asn1/OTP-PUB-KEY.asn1config
@@ -1,2 +1,3 @@
 {exclusive_decode,{'OTP-PUB-KEY',
-        [{decode_TBSCert_exclusive,['Certificate',[{tbsCertificate,undecoded}]]}]}}.
+		   [{decode_TBSCert_exclusive,['Certificate',[{tbsCertificate,undecoded}]]},
+		    {decode_TBSCertList_exclusive,['CertificateList',[{tbsCertList,undecoded}]]}]}}.
diff --git a/lib/public_key/doc/src/cert_records.xml b/lib/public_key/doc/src/cert_records.xml
index 94c7c46350..f01f7dbaf5 100644
--- a/lib/public_key/doc/src/cert_records.xml
+++ b/lib/public_key/doc/src/cert_records.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -34,12 +34,11 @@
     <file>cert_records.xml</file>
   </header>
 
-  <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
+  <p>This chapter briefly describes erlang records derived from ASN1
+  specifications used to handle <c> X509 certificates</c> and <c>CertificationRequest</c>.
+  The intent is to describe the data types and not to specify the meaning of each
   component for this we refer you to <url
-  href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url>. Also
-  descirbed is <p>CertificationRequest</p> that is defined by 
+  href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url> and
   <url href="http://www.rsa.com/rsalabs/node.asp?id=2124">PKCS-10</url>.
   </p>
 
@@ -48,7 +47,7 @@
   
   <code> -include_lib("public_key/include/public_key.hrl"). </code>
 
-  <p>The used asn1 specifications are available <c>asn1</c> subdirectory
+  <p>The used ASN1 specifications are available <c>asn1</c> subdirectory
     of the application <c>public_key</c>.
   </p>
 
@@ -62,7 +61,7 @@
     follows here.</p>
 
     <p><c>oid() - a tuple of integers 
-    as generated by the asn1 compiler.</c></p>
+    as generated by the ASN1 compiler.</c></p>
 
     <p><c>time() = uct_time() | general_time()</c></p>
     
@@ -101,7 +100,7 @@
 #'Certificate'{
 		tbsCertificate,        % #'TBSCertificate'{}
 		signatureAlgorithm,    % #'AlgorithmIdentifier'{} 
-		signature              % {0, binary()} - asn1 compact bitstring
+		signature              % {0, binary()} - ASN1 compact bitstring
 	       }.
 
 #'TBSCertificate'{
@@ -119,7 +118,7 @@
 	  
 #'AlgorithmIdentifier'{
 	  algorithm,  % oid() 
-	  parameters  % asn1_der_encoded()
+	  parameters  % der_encoded()
 	 }.
 </code>
 
@@ -127,7 +126,7 @@
 #'OTPCertificate'{
 		tbsCertificate,        % #'OTPTBSCertificate'{}
 		signatureAlgorithm,    % #'SignatureAlgorithm'
-		signature              % {0, binary()} - asn1 compact bitstring
+		signature              % {0, binary()} - ASN1 compact bitstring
 	       }.
 
 #'OTPTBSCertificate'{
@@ -137,7 +136,7 @@
 	  issuer,               % {rdnSequence, [#AttributeTypeAndValue'{}]} 
 	  validity,             % #'Validity'{}
 	  subject,              % {rdnSequence, [#AttributeTypeAndValue'{}]} 
-	  subjectPublicKeyInfo, % #'SubjectPublicKeyInfo'{}
+	  subjectPublicKeyInfo, % #'OTPSubjectPublicKeyInfo'{}
 	  issuerUniqueID,       % binary() | asn1_novalue
 	  subjectUniqueID,      % binary() | asn1_novalue
 	  extensions            % [#'Extension'{}] 
@@ -290,7 +289,7 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 #'Extension'{
 	  extnID,    % id_extensions() | oid() 
 	  critical,  % boolean()
-	  extnValue  % asn1_der_encoded() 
+	  extnValue  % der_encoded()
 	 }.
 </code>
 
@@ -372,7 +371,7 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
       
       <row>
 	<cell align="left" valign="middle">id-ce-cRLDistributionPoints</cell>
-	<cell align="left" valign="middle">#'DistributionPoint'{}</cell>
+	<cell align="left" valign="middle">[#'DistributionPoint'{}]</cell>
       </row>
       
       <row>
@@ -461,7 +460,7 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 
 #'Attribute'{
           type,  % oid()
-	  values % [asn1_der_encoded()]
+	  values % [der_encoded()]
 	  }).
 
 #'BasicConstraints'{
@@ -486,9 +485,10 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 	 }).
 
 #'DistributionPoint'{
-	  distributionPoint, % general_name() | [#AttributeTypeAndValue{}]
+	  distributionPoint, % {fullName, [general_name()]} | {nameRelativeToCRLIssuer,
+	  [#AttributeTypeAndValue{}]}
 	  reasons,           % [dist_reason()]
-	  cRLIssuer          % general_name()
+	  cRLIssuer          % [general_name()]
 	 }).
 </code>
 
@@ -530,7 +530,7 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 #'CertificateList'{
           tbsCertList,        % #'TBSCertList{}
           signatureAlgorithm, % #'AlgorithmIdentifier'{} 
-          signature           % {0, binary()} - asn1 compact bitstring
+          signature           % {0, binary()} - ASN1 compact bitstring
 	  }).
 
 #'TBSCertList'{
@@ -589,7 +589,8 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
       
       <code>
 #'IssuingDistributionPoint'{
-          distributionPoint,         % general_name() | [#AttributeTypeAndValue'{}]
+          distributionPoint,         % {fullName, [general_name()]} | {nameRelativeToCRLIssuer,
+	  [#AttributeTypeAndValue'{}]}
 	  onlyContainsUserCerts,     % boolean()
 	  onlyContainsCACerts,       % boolean()
 	  onlySomeReasons,           % [dist_reason()]
@@ -641,7 +642,7 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 #'CertificationRequest'{
           certificationRequestInfo #'CertificationRequestInfo'{},
 	  signatureAlgorithm	   #'CertificationRequest_signatureAlgorithm'{}}.
-	  signature                {0, binary()} - asn1 compact bitstring
+	  signature                {0, binary()} - ASN1 compact bitstring
 	  }
 
 #'CertificationRequestInfo'{
@@ -653,17 +654,17 @@ oid names see table below. Ex: ?'id-dsa-with-sha1'</p>
 
 #'CertificationRequestInfo_subjectPKInfo'{
           algorithm		#'CertificationRequestInfo_subjectPKInfo_algorithm'{}
-	  subjectPublicKey 	 {0, binary()} - asn1 compact bitstring
+	  subjectPublicKey 	 {0, binary()} - ASN1 compact bitstring
 	  }
 
 #'CertificationRequestInfo_subjectPKInfo_algorithm'{
      algorithm = oid(),
-     parameters = asn1_der_encoded()
+     parameters = der_encoded()
 }	  
 
 #'CertificationRequest_signatureAlgorithm'{
      algorithm = oid(),
-     parameters = asn1_der_encoded()
+     parameters = der_encoded()
      }  
    </code> 
  </section>
diff --git a/lib/public_key/doc/src/introduction.xml b/lib/public_key/doc/src/introduction.xml
index e0dd5603f7..4b59cc2245 100644
--- a/lib/public_key/doc/src/introduction.xml
+++ b/lib/public_key/doc/src/introduction.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -36,11 +36,13 @@
 
   <section>
     <title>Purpose</title>
-    <p> This application provides an API to public key infrastructure
-    from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC
-    5280</url> (X.509 certificates) and public key formats defined by
-    the <url href="http://www.rsa.com/rsalabs/node.asp?id=2124">
-    PKCS-standard</url></p>
+    <p> public_key deals with public key related file formats, digital
+    signatures and <url href="http://www.ietf.org/rfc/rfc5280.txt">
+    X-509 certificates</url>. It is a library application that
+    provides encode/decode, sign/verify, encrypt/decrypt and similar
+    functionality, it does not read or write files it expects or returns
+    file contents or partial file contents as binaries.
+    </p>
   </section>
 
   <section>
@@ -51,9 +53,9 @@
 
   <section>
     <title>Performance tips</title>
-    <p>The public_key decode and encode functions will try to use the nifs
-    which are in the asn1 compilers runtime modules if they can be found.
-    So for the best  performance you want to have the asn1 application in the
+    <p>The public_key decode and encode functions will try to use the NIFs
+    which are in the ASN1 compilers runtime modules if they can be found.
+    So for the best  performance you want to have the ASN1 application in the
     path of your system. </p>
   </section>
 
diff --git a/lib/public_key/doc/src/part.xml b/lib/public_key/doc/src/part.xml
index ea3123b5bd..08fa4eec58 100644
--- a/lib/public_key/doc/src/part.xml
+++ b/lib/public_key/doc/src/part.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -32,8 +32,10 @@
   </header>
   <description>
     <p> This application provides an API to public key infrastructure
-    from  RFC 3280 (X.509 certificates) and some public key formats defined
-    by the PKCS-standard. </p>
+    from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC
+    5280</url> (X.509 certificates) and public key formats defined by
+    the <url href="http://www.rsa.com/rsalabs/node.asp?id=2124">
+    PKCS-standard</url></p>
   </description>
   <xi:include href="introduction.xml"/>
   <xi:include href="public_key_records.xml"/>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 2ec1fcff9d..5864de2d57 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -33,12 +33,30 @@
   <module>public_key</module>
   <modulesummary> API module for public key infrastructure.</modulesummary>
   <description>
-    <p>This module provides functions to handle public key infrastructure
-    from <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280</url>- X.509 certificates and some parts of the PKCS-standard.
+    <p>This module provides functions to handle public key infrastructure. It can
+    encode/decode different file formats (PEM, openssh), sign and verify digital signatures and validate
+    certificate paths and certificate revocation lists.
     </p>
   </description>
 
   <section>
+    <title>public_key</title>
+
+    <list type="bulleted">
+      <item>public_key requires the crypto application.</item>
+
+      <item>Supports <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280 </url> -
+      Internet X.509 Public Key Infrastructure Certificate and Certificate Revocation List (CRL) Profile </item>
+      <item>Supports <url href="http://www.rsa.com/rsalabs/node.asp?id=2125"> PKCS-1 </url> - RSA Cryptography Standard </item>
+      <item>Supports <url href="http://csrc.nist.gov/publications/fips/fips186-3/fips_186-3.pdf"> DSA</url>- Digital Signature Algorithm</item>
+      <item>Supports <url href="http://www.rsa.com/rsalabs/node.asp?id=2126"> PKCS-3 </url> - Diffie-Hellman Key Agreement Standard </item>
+      <item>Supports <url href="http://www.rsa.com/rsalabs/node.asp?id=2127"> PKCS-5</url> - Password-Based Cryptography Standard </item>
+      <item>Supports <url href="http://www.rsa.com/rsalabs/node.asp?id=2130"> PKCS-8</url> - Private-Key Information Syntax Standard</item>
+      <item>Supports <url href="http://www.rsa.com/rsalabs/node.asp?id=2132"> PKCS-10</url> - Certification Request Syntax Standard</item>
+    </list>
+  </section>
+
+  <section>
     <title>COMMON DATA TYPES </title> 
     
     <note><p>All records used in this manual 
@@ -58,10 +76,13 @@
     
     <p><code>boolean() = true | false</code></p>
 
-    <p><code>string = [bytes()]</code></p>
+    <p><code>string() = [bytes()]</code></p>
+
+    <p><code>der_encoded() = binary()</code></p>
    
-    <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
-    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'| 'PrivateKeyInfo' | 'CertificationRequest'</code></p>
+    <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey' |
+    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo' |
+    'PrivateKeyInfo' | 'CertificationRequest'</code></p>
     
     <p><code>pem_entry () = {pki_asn1_type(), binary(), %% DER or encrypted DER
           not_encrypted | cipher_info()} </code></p>
@@ -86,6 +107,9 @@
 
     <p><code> dss_digest_type()  = 'sha' </code></p>
 
+    <p><code> crl_reason()  = unspecified | keyCompromise | cACompromise | affiliationChanged | superseded | cessationOfOperation | certificateHold | privilegeWithdrawn |  aACompromise
+    </code></p>
+
     <p><code> ssh_file()  = openssh_public_key | rfc4716_public_key |
     known_hosts | auth_keys </code></p>
     
@@ -150,7 +174,7 @@
 
   <func>
     <name>der_decode(Asn1type, Der) -> term()</name>
-    <fsummary> Decodes a public key asn1 der encoded entity.</fsummary>
+    <fsummary> Decodes a public key ASN.1 DER encoded entity.</fsummary>
     <type>
       <v>Asn1Type = atom()</v>
       <d> ASN.1 type present in the public_key applications
@@ -158,7 +182,7 @@
       <v>Der = der_encoded()</v>
     </type> 
     <desc> 
-      <p> Decodes a public key ASN.1 der encoded entity.</p>
+      <p> Decodes a public key ASN.1 DER encoded entity.</p>
     </desc> 
   </func>
     
@@ -180,14 +204,14 @@
   <func>
     <name>pem_decode(PemBin) -> [pem_entry()]</name>
     <fsummary>Decode PEM binary data and return
-    entries as ASN.1 der encoded entities. </fsummary>
+    entries as ASN.1 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 ASN.1 der encoded entities.</p>
+    entries as ASN.1 DER encoded entities.</p>
   </desc> 
   </func> 
     
@@ -211,8 +235,8 @@
       <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
+    <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> 
@@ -221,7 +245,7 @@
    <func>
     <name>pem_entry_encode(Asn1Type, Entity) -> pem_entry()</name>
     <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>
+    <fsummary> Creates a PEM entry that can be fed to pem_encode/1.</fsummary>
     <type>
       <v>Asn1Type = pki_asn1_type()</v>
       <v>Entity = term()</v>
@@ -235,7 +259,7 @@
       <v>Password = string()</v> 
   </type> 
   <desc> 
-    <p> Creates a pem entry that can be feed to pem_encode/1.</p> 
+    <p> Creates a PEM entry that can be feed to pem_encode/1.</p>
   </desc> 
   </func>
 
@@ -265,12 +289,12 @@
   
   <func>
     <name>pkix_decode_cert(Cert, otp|plain) ->  #'Certificate'{} | #'OTPCertificate'{}</name>
-    <fsummary> Decodes an ASN.1 der encoded pkix x509 certificate.</fsummary>
+    <fsummary> Decodes an ASN.1 DER encoded PKIX x509 certificate.</fsummary>
     <type>
       <v>Cert = der_encoded()</v> 
   </type> 
   <desc> 
-    <p>Decodes an ASN.1 der encoded pkix certificate.  The otp option
+    <p>Decodes an ASN.1 DER encoded PKIX certificate.  The otp option
     will use the customized ASN.1 specification OTP-PKIX.asn1 for
     decoding and also recursively decode most of the standard
     parts.</p>
@@ -279,14 +303,15 @@
 
   <func>
     <name>pkix_encode(Asn1Type, Entity, otp | plain) -> der_encoded()</name>
-    <fsummary>Der encodes a pkix x509 certificate or part of such a
+    <fsummary>DER encodes a PKIX x509 certificate or part of such a
     certificate.</fsummary>
     <type>
       <v>Asn1Type = atom()</v>
       <d>The ASN.1 type can be 'Certificate', 'OTPCertificate' or a subtype of either .</d>
+      <v>Entity = #'Certificate'{} | #'OTPCertificate'{} | a valid subtype</v>
   </type> 
   <desc> 
-    <p>Der encodes a pkix x509 certificate or part of such a
+    <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 in the otp format, whereas for the plain format this
     function will directly call der_encode/2. </p> 
@@ -356,18 +381,104 @@
   </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> -->
+  <func>
+    <name>pkix_path_validation(TrustedCert, CertChain, Options) -> {ok, {PublicKeyInfo, PolicyTree}} | {error, {bad_cert, Reason}} </name>
+    <fsummary> Performs a basic path validation according to RFC 5280.</fsummary>
+     <type>
+       <v> TrustedCert =  #'OTPCertificate'{} | der_encode() | unknown_ca | selfsigned_peer  </v>
+       <d>Normally a trusted certificate but it can also be one of the path validation
+       errors <c>unknown_ca </c> or <c>selfsigned_peer </c> that can be discovered while
+       constructing the input to this function and that should be run through the <c>verify_fun</c>.</d>
+       <v> CertChain = [der_encode()]</v>
+       <d>A list of DER encoded certificates in trust order ending with the peer certificate.</d>
+       <v> Options = proplists:proplists()</v>
+       <v>PublicKeyInfo = {?'rsaEncryption' | ?'id-dsa',
+       rsa_public_key() | integer(), 'NULL' | 'Dss-Parms'{}}</v>
+       <v> PolicyTree = term() </v>
+       <d>At the moment this will always be an empty list as Policies are not currently supported</d>
+       <v> Reason = cert_expired | invalid_issuer | invalid_signature | unknown_ca |
+       selfsigned_peer | name_not_permitted | missing_basic_constraint | invalid_key_usage | crl_reason()
+       </v>
+     </type>
+     <desc>
+       <p>
+	 Performs a basic path validation according to
+	 <url href="http://www.ietf.org/rfc/rfc5280.txt">RFC 5280.</url>
+	 However CRL validation is done separately by <seealso
+	 marker="public_key#pkix_crls_validate-3">pkix_crls_validate/3 </seealso> and should be called
+	 from the supplied <c>verify_fun</c>
+       </p>
+
+       <taglist>
+	 <p> Available options are: </p>
+
+	<tag>{verify_fun, fun()}</tag>
+	<item>
+	  <p>The 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>If the verify callback fun returns {fail, Reason}, the
+	verification process is immediately stopped. If the verify
+	callback fun returns {valid, UserState}, the verification
+	process is continued, this can be used to accept specific path
+	validation errors such as <c>selfsigned_peer</c> as well as
+	verifying application specific extensions.  If called with an
+	extension unknown to the user application the return value
+	{unknown, UserState} should be used.</p>
+
+	</item>
+	<tag>{max_path_length, integer()}</tag>
+	<item>
+	  The <c>max_path_length</c> is the maximum number of non-self-issued
+	  intermediate certificates that may follow the peer certificate
+	  in a valid certification path.  So if <c>max_path_length</c> is 0 the PEER must
+	  be signed by the trusted ROOT-CA directly, if 1 the path can
+	  be PEER, CA, ROOT-CA, if it is 2 PEER, CA, CA, ROOT-CA and so
+	  on.
+	</item>
+      </taglist>
+    </desc>
+   </func>
+
+   <func>
+     <name>pkix_crls_validate(OTPCertificate, DPAndCRLs, Options) -> CRLStatus()</name>
+     <fsummary> Performs CRL validation.</fsummary>
+     <type>
+       <v> OTPCertificate =  #'OTPCertificate'{}</v>
+       <v> DPAndCRLs  = [{DP::#'DistributionPoint'{} ,CRL::#'CertificateList'{}}] </v>
+       <v> Options = proplists:proplists()</v>
+       <v> CRLStatus() =  valid | {bad_cert, revocation_status_undetermined} |
+       {bad_cert, {revoked, crl_reason()}}</v>
+     </type>
+     <desc>
+      <p> Performs CRL validation. It is intended to be called from
+      the verify fun of  <seealso marker="public_key#pkix_path_validation-3"> pkix_path_validation/3
+       </seealso></p>
+      <taglist>
+	<p> Available options are: </p>
+	<tag>{update_crl, fun()}</tag>
+	<item>
+	  <p>The fun has the following type spec:</p>
+
+	  <code> fun(#'DistributionPoint'{}, #'CertificateList'{}) -> #'CertificateList'{}</code>
+
+	  <p>The fun should use the information in the distribution point to acesses
+	  the lates possible version of the CRL. If this fun is not specified
+	  public_key will use the default implementation:
+	  </p>
+	  <code> fun(_DP, CRL) -> CRL end</code>
+	</item>
+      </taglist>
+    </desc>
+   </func>
 
-  
   <func>
     <name>pkix_sign(#'OTPTBSCertificate'{}, Key) -> der_encode()</name>
     <fsummary>Signs certificate.</fsummary>
@@ -388,7 +499,7 @@
       <v>Key = rsa_public_key() | dsa_public_key()</v> 
     </type> 
   <desc> 
-    <p> Verify pkix x.509 certificate signature.</p> 
+    <p> Verify PKIX x.509 certificate signature.</p>
   </desc> 
   </func> 
 
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml
index bb90290266..e39ad0ec64 100644
--- a/lib/public_key/doc/src/public_key_records.xml
+++ b/lib/public_key/doc/src/public_key_records.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>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -34,7 +34,7 @@
     <file>public_key_records.xml</file>
   </header>
     
-  <p>This chapter briefly describes Erlang records derived from asn1
+  <p>This chapter briefly describes Erlang records derived from ASN1
   specifications used to handle public and private keys. The intent
   is to describe the data types and not to specify the meaning of
   each component for this we refer you to the relevant standards and RFCs.</p>
@@ -67,9 +67,9 @@
 	 }.
 
 #'OtherPrimeInfo'{
-         prime,           % integer() 
- 	 exponent,        % integer()
-         coefficient      % integer() 
+	prime,           % integer()
+	exponent,        % integer()
+	coefficient      % integer()
  	 }.	 
     </code>
 
diff --git a/lib/public_key/doc/src/using_public_key.xml b/lib/public_key/doc/src/using_public_key.xml
index f0eaeb8654..5d9f1536d9 100644
--- a/lib/public_key/doc/src/using_public_key.xml
+++ b/lib/public_key/doc/src/using_public_key.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2011</year><year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -21,7 +21,7 @@
     
     </legalnotice>
 
-    <title>Using the public_key API</title>
+    <title>Getting Started</title>
     <file>using_public_key.xml</file>
   </header>
 
@@ -40,7 +40,7 @@
     
   <section>
     <title>PEM files</title>
-    <p> Pulic key data (keys, certificates etc) may be stored in PEM format. PEM files
+    <p> Public key data (keys, certificates etc) may be stored in PEM format. PEM files
     comes from the Private Enhanced Mail Internet standard and has a
     structure that looks like this:</p>
 
@@ -63,7 +63,7 @@
       <code>1> {ok, PemBin} = file:read_file("dsa.pem").
 {ok,&lt;&lt;"-----BEGIN DSA PRIVATE KEY-----\nMIIBuw"...&gt;&gt;}</code>
       
-      <p>This PEM file only has one entry a private DSA key.</p>
+      <p>This PEM file only has one entry, a private DSA key.</p>
       <code>2> [DSAEntry] =  public_key:pem_decode(PemBin).
 [{'DSAPrivateKey',&lt;&lt;48,130,1,187,2,1,0,2,129,129,0,183,
                     179,230,217,37,99,144,157,21,228,204,
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index 90ca7256ea..4d1d510f29 100644
--- a/lib/public_key/include/public_key.hrl
+++ b/lib/public_key/include/public_key.hrl
@@ -68,17 +68,32 @@
 -record(revoke_state, {
 	  reasons_mask,
 	  cert_status,
-	  interim_reasons_mask
+	  interim_reasons_mask,
+	  valid_ext
 	 }).
 
+
+-define(unspecified, 0).
+-define(keyCompromise, 1).
+-define(cACompromise, 2).
+-define(affiliationChanged, 3).
+-define(superseded, 4).
+-define(cessationOfOperation, 5).
+-define(certificateHold, 6).
+-define(removeFromCRL, 8).
+-define(privilegeWithdrawn, 9).
+-define(aACompromise, 10).
+
 -type public_key()           ::  rsa_public_key() | dsa_public_key().
 -type rsa_public_key()       ::  #'RSAPublicKey'{}.
 -type rsa_private_key()      ::  #'RSAPrivateKey'{}.
 -type dsa_private_key()      ::  #'DSAPrivateKey'{}.
 -type dsa_public_key()       :: {integer(), #'Dss-Parms'{}}.
+-type der_encoded()          :: binary().
+-type decrypt_der()          :: binary().
 -type pki_asn1_type()        ::  'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
 			       | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
-                               | 'SubjectPublicKeyInfo' | 'CertificationRequest'.
+                               | 'SubjectPublicKeyInfo' | 'CertificationRequest' | 'CertificateList'.
 -type pem_entry()            :: {pki_asn1_type(), binary(), %% DER or Encrypted DER
 				 not_encrypted | {Cipher :: string(), Salt :: binary()}}.
 -type asn1_type()            :: atom(). %% see "OTP-PUB-KEY.hrl
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
index d5cd13d81a..b8ad68ecc7 100644
--- a/lib/public_key/src/Makefile
+++ b/lib/public_key/src/Makefile
@@ -44,7 +44,8 @@ MODULES = \
 	pubkey_ssh \
 	pubkey_pbe \
 	pubkey_cert \
-	pubkey_cert_records 
+        pubkey_cert_records \
+	pubkey_crl
 
 HRL_FILES = $(INCLUDE)/public_key.hrl 
 
@@ -91,10 +92,10 @@ clean:
 docs:
 
 $(APP_TARGET):	$(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index f9e2025479..f53c94b334 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -26,10 +26,11 @@
 -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_extensions/4,
 	 normalize_general_name/1, digest_type/1, is_self_signed/1,
 	 is_issuer/2, issuer_id/2, is_fixed_dh_cert/1,
-	 verify_data/1, verify_fun/4]).
+	 verify_data/1, verify_fun/4, select_extension/2, match_name/3,
+	 extensions_list/1, cert_auth_key_id/1, time_str_2_gregorian_sec/1]).
 
 -define(NULL, 0).
  
@@ -204,17 +205,6 @@ validate_names(OtpCert, Permit, Exclude, Last, UserState, VerifyFun) ->
     end.
 
 %%--------------------------------------------------------------------
--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})
-    UserState.
-%%--------------------------------------------------------------------
 -spec validate_extensions(#'OTPCertificate'{}, #path_validation_state{},
 			  term(), fun())->
 				 {#path_validation_state{}, UserState :: term()}.
@@ -256,8 +246,10 @@ is_self_signed(#'OTPCertificate'{tbsCertificate=
 %%
 %% Description:  Checks if <Issuer> issued <Candidate>.
 %%--------------------------------------------------------------------	
-is_issuer({rdnSequence, Issuer}, {rdnSequence, Candidate}) ->
-    is_dir_name(Issuer, Candidate, true).
+is_issuer({rdnSequence, _} = Issuer, {rdnSequence, _} = Candidate) ->
+    {rdnSequence, IssuerDirName} = normalize_general_name(Issuer),
+    {rdnSequence, CandidateDirName} = normalize_general_name(Candidate),
+    is_dir_name(IssuerDirName, CandidateDirName, true).
 %%--------------------------------------------------------------------
 -spec issuer_id(#'OTPCertificate'{}, self | other) -> 
 		       {ok, {integer(), term()}}  | {error, issuer_not_found}.
@@ -307,9 +299,9 @@ verify_fun(Otpcert, Result, UserState0, VerifyFun) ->
 	{valid,UserState} ->
 	    UserState;
 	{fail, Reason} ->
-	    case Result of
+	    case Reason of
 		{bad_cert, _} ->
-		    throw(Result);
+		    throw(Reason);
 		_ ->
 		    throw({bad_cert, Reason})
 	    end;
@@ -321,6 +313,91 @@ verify_fun(Otpcert, Result, UserState0, VerifyFun) ->
 		    UserState
 	    end
     end.
+%%--------------------------------------------------------------------
+-spec select_extension(Oid ::tuple(),[#'Extension'{}]) ->
+			      #'Extension'{} | undefined.
+%%
+%% Description: Extracts a specific extension from a list of extensions.
+%%--------------------------------------------------------------------
+select_extension(_, []) ->
+    undefined;
+select_extension(Id, [#'Extension'{extnID = Id} = Extension | _]) ->
+    Extension;
+select_extension(Id, [_ | Extensions]) ->
+    select_extension(Id, Extensions).
+
+%%--------------------------------------------------------------------
+%% TODO:
+%%
+%% Description:
+%%--------------------------------------------------------------------
+match_name(rfc822Name, Name, [PermittedName | Rest]) ->
+    match_name(fun is_valid_host_or_domain/2, Name, PermittedName, Rest);
+
+match_name(directoryName, DirName,  [PermittedName | Rest]) ->
+    match_name(fun is_rdnSeq/2, DirName, PermittedName, Rest);
+
+match_name(uniformResourceIdentifier, URI,  [PermittedName | Rest]) ->
+    case split_uri(URI) of
+	incomplete ->
+	    false;
+	{_, _, Host, _, _} ->
+	    match_name(fun is_valid_host_or_domain/2, Host,
+		       PermittedName, Rest)
+    end;
+
+match_name(emailAddress, Name, [PermittedName | Rest]) ->
+    Fun = fun(Email, PermittedEmail) ->
+		  is_valid_email_address(Email, PermittedEmail,
+				   string:tokens(PermittedEmail,"@"))
+	  end,
+     match_name(Fun, Name, PermittedName, Rest);
+
+match_name(dNSName, Name, [PermittedName | Rest]) ->
+    Fun = fun(Domain, [$.|Domain]) -> true;
+	     (Name1,Name2) ->
+		  lists:suffix(string:to_lower(Name2),
+			       string:to_lower(Name1))
+	  end,
+    match_name(Fun, Name, [$.|PermittedName], Rest);
+
+match_name(x400Address, OrAddress, [PermittedAddr | Rest]) ->
+    match_name(fun is_or_address/2, OrAddress, PermittedAddr, Rest);
+
+match_name(ipAdress, IP, [PermittedIP | Rest]) ->
+    Fun = fun([IP1, IP2, IP3, IP4],
+	      [IP5, IP6, IP7, IP8, M1, M2, M3, M4]) ->
+		  is_permitted_ip([IP1, IP2, IP3, IP4],
+				  [IP5, IP6, IP7, IP8],
+				  [M1, M2, M3, M4]);
+	     ([IP1, IP2, IP3, IP4, IP5, IP6, IP7, IP8,
+	       IP9, IP10, IP11, IP12, IP13, IP14, IP15, IP16],
+	      [IP17, IP18, IP19, IP20, IP21, IP22, IP23, IP24,
+	       IP25, IP26, IP27, IP28, IP29, IP30, IP31, IP32,
+	       M1, M2, M3, M4, M5, M6, M7, M8,
+	       M9, M10, M11, M12, M13, M14, M15, M16]) ->
+		  is_permitted_ip([IP1, IP2, IP3, IP4, IP5, IP6, IP7, IP8,
+				   IP9, IP10, IP11, IP12, IP13,
+				   IP14, IP15, IP16],
+				  [IP17, IP18, IP19, IP20, IP21, IP22, IP23,
+				   IP24,IP25, IP26, IP27, IP28, IP29, IP30,
+				   IP31, IP32],
+				    [M1, M2, M3, M4, M5, M6, M7, M8, M9, M10,
+				     M11, M12, M13, M14, M15, M16]);
+	     (_,_) ->
+		  false
+	  end,
+    match_name(Fun, IP, PermittedIP, Rest).
+
+match_name(Fun, Name, PermittedName, []) ->
+    Fun(Name, PermittedName);
+match_name(Fun, Name, PermittedName, [Head | Tail]) ->
+    case Fun(Name, PermittedName) of
+	true ->
+	    true;
+	false ->
+	    match_name(Fun, Name, Head, Tail)
+    end.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -332,7 +409,7 @@ do_normalize_general_name(Issuer) ->
 		   (Atter)  ->
 			Atter
 		end,
-    lists:sort(lists:map(Normalize, Issuer)).
+    lists:map(Normalize, Issuer).
 
 %% See rfc3280 4.1.2.6 Subject: regarding emails.
 extract_email({rdnSequence, List}) ->
@@ -477,13 +554,6 @@ strip_spaces(String) ->
 		    string:tokens(String, " ")),
     string:strip(NewString).
 
-select_extension(_, []) ->
-    undefined;
-select_extension(Id, [#'Extension'{extnID = Id} = Extension | _]) ->
-    Extension;
-select_extension(Id, [_ | Extensions]) ->
-    select_extension(Id, Extensions).
-
 %% No extensions present
 validate_extensions(OtpCert, asn1_NOVALUE, ValidationState, ExistBasicCon,
 		    SelfSigned, UserState, VerifyFun) ->
@@ -503,18 +573,16 @@ validate_extensions(OtpCert, [], ValidationState =
 	true  ->
 	    {ValidationState#path_validation_state{max_path_length = Len - 1},
 	     UserState0};
-	%% basic_constraint must appear in certs used for digital sign
-	%% see 4.2.1.10 in rfc 3280
 	false ->
-	    UserState = verify_fun(OtpCert, {bad_cert, missing_basic_constraint},
-				   UserState0, VerifyFun),
-	    case SelfSigned of
+	    %% basic_constraint must appear in certs used for digital sign
+	    %% see 4.2.1.10 in rfc 3280
+	    case is_digitally_sign_cert(OtpCert) of
 		true ->
-		    {ValidationState, UserState};
-		false ->
-		    {ValidationState#path_validation_state{max_path_length = 
-							       Len - 1},
-		     UserState}
+		    missing_basic_constraints(OtpCert, SelfSigned,
+					      ValidationState, VerifyFun,
+					      UserState0, Len);
+		false -> %% Example CRL signer only
+		    {ValidationState, UserState0}
 	    end
     end;
 
@@ -861,74 +929,6 @@ type_subtree_names(Type, SubTrees) ->
     [Name || #'GeneralSubtree'{base = {TreeType, Name}} <- SubTrees,
 	     TreeType =:= Type].
 
-match_name(rfc822Name, Name, [PermittedName | Rest]) ->
-    match_name(fun is_valid_host_or_domain/2, Name, PermittedName, Rest);
-	
-match_name(directoryName, DirName,  [PermittedName | Rest]) ->
-    match_name(fun is_rdnSeq/2, DirName, PermittedName, Rest);
-
-match_name(uniformResourceIdentifier, URI,  [PermittedName | Rest]) ->
-    case split_uri(URI) of
-	incomplete ->
-	    false;
-	{_, _, Host, _, _} ->
-	    match_name(fun is_valid_host_or_domain/2, Host, 
-		       PermittedName, Rest)
-    end;
-
-match_name(emailAddress, Name, [PermittedName | Rest]) ->
-    Fun = fun(Email, PermittedEmail) -> 
-		  is_valid_email_address(Email, PermittedEmail,
-				   string:tokens(PermittedEmail,"@"))
-	  end,
-     match_name(Fun, Name, PermittedName, Rest);
-
-match_name(dNSName, Name, [PermittedName | Rest]) ->
-    Fun = fun(Domain, [$.|Domain]) -> true;
-	     (Name1,Name2) ->
-		  lists:suffix(string:to_lower(Name2), 
-			       string:to_lower(Name1))
-	  end,
-    match_name(Fun, Name, [$.|PermittedName], Rest);	  
-	     
-match_name(x400Address, OrAddress, [PermittedAddr | Rest]) ->
-    match_name(fun is_or_address/2, OrAddress, PermittedAddr, Rest);
-
-match_name(ipAdress, IP, [PermittedIP | Rest]) ->
-    Fun = fun([IP1, IP2, IP3, IP4],
-	      [IP5, IP6, IP7, IP8, M1, M2, M3, M4]) ->
-		  is_permitted_ip([IP1, IP2, IP3, IP4],
-				  [IP5, IP6, IP7, IP8],
-				  [M1, M2, M3, M4]);
-	     ([IP1, IP2, IP3, IP4, IP5, IP6, IP7, IP8,
-	       IP9, IP10, IP11, IP12, IP13, IP14, IP15, IP16],
-	      [IP17, IP18, IP19, IP20, IP21, IP22, IP23, IP24,
-	       IP25, IP26, IP27, IP28, IP29, IP30, IP31, IP32,
-	       M1, M2, M3, M4, M5, M6, M7, M8,
-	       M9, M10, M11, M12, M13, M14, M15, M16]) ->
-		  is_permitted_ip([IP1, IP2, IP3, IP4, IP5, IP6, IP7, IP8,
-				   IP9, IP10, IP11, IP12, IP13,
-				   IP14, IP15, IP16],
-				  [IP17, IP18, IP19, IP20, IP21, IP22, IP23, 
-				   IP24,IP25, IP26, IP27, IP28, IP29, IP30, 
-				   IP31, IP32],
-				    [M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, 
-				     M11, M12, M13, M14, M15, M16]);
-	     (_,_) ->
-		  false
-	  end,
-    match_name(Fun, IP, PermittedIP, Rest).
-    
-match_name(Fun, Name, PermittedName, []) ->
-    Fun(Name, PermittedName);
-match_name(Fun, Name, PermittedName, [Head | Tail]) ->
-    case Fun(Name, PermittedName) of
-	true ->
-	    true;
-	false ->
-	    match_name(Fun, Name, Head, Tail)
-    end.
-
 is_permitted_ip([], [], []) ->
     true;
 is_permitted_ip([CandidatIp | CandidatIpRest], 
@@ -1037,3 +1037,25 @@ is_dh(?'dhpublicnumber')->
     true;
 is_dh(_) ->
     false.
+
+is_digitally_sign_cert(OtpCert) ->
+    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+    Extensions = extensions_list(TBSCert#'OTPTBSCertificate'.extensions),
+    case pubkey_cert:select_extension(?'id-ce-keyUsage', Extensions) of
+	undefined ->
+	     false;
+	#'Extension'{extnValue = KeyUse} ->
+	    lists:member(keyCertSign, KeyUse)
+    end.
+
+missing_basic_constraints(OtpCert, SelfSigned, ValidationState, VerifyFun, UserState0,Len) ->
+    UserState = verify_fun(OtpCert, {bad_cert, missing_basic_constraint},
+			   UserState0, VerifyFun),
+    case SelfSigned of
+	true ->
+	    {ValidationState, UserState};
+	false ->
+	    {ValidationState#path_validation_state{max_path_length =
+						       Len - 1},
+	     UserState}
+    end.
diff --git a/lib/public_key/src/pubkey_crl.erl b/lib/public_key/src/pubkey_crl.erl
new file mode 100644
index 0000000000..3e4c3c8b6d
--- /dev/null
+++ b/lib/public_key/src/pubkey_crl.erl
@@ -0,0 +1,701 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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(pubkey_crl).
+
+-include("public_key.hrl").
+
+-export([validate/7, init_revokation_state/0, fresh_crl/3, verify_crl_signature/4,
+	 is_delta_crl/1, combines/2, match_one/2]).
+
+-record(userstate, {dpcrls,
+		    idp
+		   }).
+
+validate(OtpCert, OtherDPCRLs, DP, {DerCRL, CRL}, {DerDeltaCRL, DeltaCRL},
+	     Options, RevokedState0) ->
+    RevokedState =
+	case verify_crl(OtpCert, DP, CRL, DerCRL, DeltaCRL,
+			DerDeltaCRL, OtherDPCRLs, Options, RevokedState0) of
+	    {valid, Revoked, DeltaRevoked, RevokedState1, IDP} ->
+		TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+		SerialNumber = TBSCert#'OTPTBSCertificate'.serialNumber,
+		CertIssuer = TBSCert#'OTPTBSCertificate'.issuer,
+		TBSCRL = CRL#'CertificateList'.tbsCertList,
+		CRLIssuer =  TBSCRL#'TBSCertList'.issuer,
+		AltNames = subject_alt_names(TBSCert#'OTPTBSCertificate'.extensions),
+		revoked_status(DP, IDP, {directoryName, CRLIssuer},
+			       [ {directoryName, CertIssuer} | AltNames], SerialNumber, Revoked,
+			       DeltaRevoked, RevokedState1);
+	    {invalid, Revoked} ->
+		Revoked
+	end,
+    crl_status(RevokedState).
+
+init_revokation_state() ->
+    #revoke_state{reasons_mask = sets:new(),
+		  interim_reasons_mask = sets:new(),
+		  cert_status = unrevoked}.
+
+fresh_crl(_, {undefined, undefined}, _) ->
+    %% Typically happens when there is no delta CRL that covers a CRL
+    no_fresh_crl;
+
+fresh_crl(DP, {_, #'CertificateList'{tbsCertList = TBSCRL}} = CRL, CallBack) ->
+    Now = calendar:datetime_to_gregorian_seconds(calendar:universal_time()),
+    UpdateTime =
+	pubkey_cert:time_str_2_gregorian_sec(TBSCRL#'TBSCertList'.nextUpdate),
+    case Now >= UpdateTime of
+	true ->
+	    case CallBack(DP, CRL) of
+		CRL ->
+		    no_fresh_crl;
+	       NewCRL ->
+		    fresh_crl(DP, NewCRL, CallBack)
+	    end;
+	false ->
+	    {fresh, CRL}
+    end.
+
+is_delta_crl(#'CertificateList'{tbsCertList = TBSCRL}) ->
+    Extensions = TBSCRL#'TBSCertList'.crlExtensions,
+    case pubkey_cert:select_extension(?'id-ce-deltaCRLIndicator',
+				      Extensions) of
+	undefined ->
+	    false;
+	_ ->
+	    true
+    end.
+
+combines(CRL, DeltaCRL) ->
+    check_crl_num(CRL, DeltaCRL) andalso
+	check_delta_issuer_and_scope(CRL, DeltaCRL).
+
+crl_status(State)->
+    %% Fun argument is to enable future implementation of CRL checking
+    %% that does not care about all possible reasons.
+    crl_status(State, fun all_reasons/0).
+
+crl_status({skip, #revoke_state{cert_status = Status} = RevokedState}, _) ->
+    {undetermined, status(Status), RevokedState};
+
+crl_status(#revoke_state{cert_status = unrevoked = Status,
+			 valid_ext = false} = RevokedState, _) ->
+    {undetermined, Status, RevokedState};
+
+crl_status(#revoke_state{cert_status = Status,
+			 valid_ext = false}, _) ->
+    {finished, status(Status)};
+
+crl_status(#revoke_state{reasons_mask = Mask,
+			 cert_status = Status,
+			 valid_ext = true} = RevokedState, Fun) ->
+    case is_all_reasons(Mask, Fun) of
+	true ->
+	    {finished, status(Status)};
+	false when (Status == unrevoked) ->
+	    {undetermined, Status, RevokedState};
+	_ ->
+	    {finished ,status(Status)}
+    end.
+
+verify_crl(OtpCert, DP, CRL, DerCRL, DeltaCRL, DerDeltaCRL, OtherDPCRLs,
+	   Options, State0) ->
+    #'CertificateList'{tbsCertList =
+			   #'TBSCertList'{crlExtensions = Extensions,
+					  revokedCertificates = TmpRevoked}
+		      } = CRL,
+    Revoked = revoked(TmpRevoked),
+    IDP = issuing_distribution_point(Extensions),
+
+    DeltaRevoked = delta_revoked(DeltaCRL),
+
+    ValidExt = verify_extensions(Extensions) and
+	verify_extensions(Revoked),
+
+    IntMask = compute_interim_reasons_mask(DP, IDP),
+
+    RevokedState =
+	State0#revoke_state{interim_reasons_mask = IntMask,
+			    valid_ext = ValidExt},
+
+    {Fun, AdditionalArgs} =  IssuerFun = proplists:get_value(issuer_fun, Options),
+
+    try verify_issuer_and_scope(OtpCert, DP, IDP, CRL) of
+	{ok, Issuer} ->
+	    case Fun(DP, CRL, Issuer, AdditionalArgs) of
+		{ok, TrustedOtpCert, Path} ->
+		    verify_mask_and_signatures(Revoked, DeltaRevoked,
+					       RevokedState,
+					       CRL, DerCRL, DeltaCRL, DerDeltaCRL,
+					       IssuerFun, TrustedOtpCert, Path, OtherDPCRLs, IDP);
+		_ ->
+		    {invalid, State0#revoke_state{valid_ext = ValidExt}}
+	    end;
+	{error, issuer_not_found} ->
+	    case Fun(DP, CRL, issuer_not_found, AdditionalArgs) of
+		{ok, TrustedOtpCert, Path} ->
+		    verify_mask_and_signatures(Revoked, DeltaRevoked,
+					       RevokedState, CRL, DerCRL, DeltaCRL,
+					       DerDeltaCRL, IssuerFun,
+					       TrustedOtpCert, Path, OtherDPCRLs, IDP);
+		_ ->
+		    {invalid, {skip, State0}}
+	    end
+    catch
+	throw:{bad_crl, invalid_issuer} ->
+	    {invalid, {skip, State0}};
+	throw:_ ->
+	    {invalid, State0#revoke_state{valid_ext = ValidExt}}
+    end.
+
+verify_mask_and_signatures(Revoked, DeltaRevoked, RevokedState, CRL, DerCRL, DeltaCRL, DerDeltaCRL,
+			   IssuerFun, TrustedOtpCert, Path, OtherDPCRLs, IDP) ->
+
+    ReasonsMask = sets:union(RevokedState#revoke_state.reasons_mask,
+			     RevokedState#revoke_state.interim_reasons_mask),
+    try
+	verify_interim_reasons_mask(RevokedState),
+	true = verify_crl_signatures(CRL, DerCRL, DeltaCRL, DerDeltaCRL,
+				     TrustedOtpCert, Path, IssuerFun, OtherDPCRLs, IDP),
+	{valid, Revoked, DeltaRevoked, RevokedState#revoke_state{reasons_mask = ReasonsMask}, IDP}
+    catch
+	throw:_ ->
+	    {invalid, RevokedState};
+	error:{badmatch, _} ->
+	    {invalid, RevokedState}
+    end.
+
+
+verify_crl_signatures(CRL, DerCRL, DeltaCRL, DerDeltaCRL, TrustedOtpCert, Path,
+		      IssuerFun, OtherDPCRLs, IDP) ->
+    try
+	VerifyFunAndState =
+	    {fun(_, {bad_cert, _} = Reason, _UserState) ->
+		    {fail, Reason};
+		(_,{extension, _}, UserState) ->
+		     {unknown, UserState};
+		(_Cert, valid, UserState) ->
+		     {valid, UserState};
+		(Cert, valid_peer, UserState) ->
+		     case verify_crl_keybit(Cert, cRLSign) of
+			 true ->
+			     handle_crlsigner(Cert, IssuerFun, UserState);
+			 false ->
+			     {fail, crl_sign_bit_not_set}
+		     end
+	     end, #userstate{dpcrls = OtherDPCRLs, idp = IDP}},
+
+	{ok, {{_,Key, KeyParams},_}} =
+	    public_key:pkix_path_validation(TrustedOtpCert, Path,
+					    [{verify_fun, VerifyFunAndState}]),
+	true = verify_crl_signature(CRL, DerCRL, Key, KeyParams),
+	true = verify_crl_signature(DeltaCRL, DerDeltaCRL, Key, KeyParams)
+    catch
+	error:{badmatch, _} ->
+	    false
+    end.
+
+handle_crlsigner(OtpCert, IssuerFun, #userstate{idp = IDP} = UserState) ->
+    case verify_crl_keybit(OtpCert, keyCertSign) of
+	true ->
+	    {valid, UserState};
+	false ->
+	    case not is_indirect_crl(IDP) andalso not public_key:pkix_is_self_signed(OtpCert) of
+		true ->
+		    validate_crl_signing_cert(OtpCert, IssuerFun, UserState);
+		false ->
+		    {valid, UserState}
+	    end
+    end.
+
+validate_crl_signing_cert(_, _,#userstate{dpcrls = []} = UserState) ->
+    {valid, UserState};
+validate_crl_signing_cert(OtpCert, IssuerFun, #userstate{dpcrls = CRLInfo} = UserState) ->
+    case public_key:pkix_crls_validate(OtpCert, CRLInfo, [{issuer_fun, IssuerFun}]) of
+	valid ->
+	    {valid, UserState};
+	Reason ->
+	    {fail, Reason}
+    end.
+
+delta_revoked(undefined)->
+    [];
+delta_revoked(#'CertificateList'{tbsCertList =
+				     #'TBSCertList'{revokedCertificates
+						    = DeltaRevoked}}) ->
+    revoked(DeltaRevoked).
+
+revoked(asn1_NOVALUE) ->
+    [];
+revoked(Revoked) ->
+   Revoked.
+
+revoked_status(DP, IDP, CRLIssuer, Names, SerialNumber, Revoked, DeltaRevoked, RevokedState0) ->
+    DefaultIssuer0 = default_issuer(CRLIssuer, DeltaRevoked),
+    RevokedState1 = check_revoked(DP, IDP, DefaultIssuer0, Names, SerialNumber, DeltaRevoked, RevokedState0),
+    RevokedState = case RevokedState1#revoke_state.cert_status of
+		       unrevoked when RevokedState1#revoke_state.cert_status =/= removeFromCRL ->
+			   DefaultIssuer = default_issuer(CRLIssuer, Revoked),
+			   check_revoked(DP, IDP, DefaultIssuer, Names, SerialNumber,
+					 Revoked, RevokedState1);
+		       _ ->
+			   RevokedState1
+		   end,
+    case RevokedState#revoke_state.cert_status of
+	removeFromCRL ->
+	    RevokedState#revoke_state{cert_status = unrevoked};
+	_ ->
+	    RevokedState
+    end.
+
+default_issuer(_, []) ->
+    undefined;
+default_issuer(Default, [#'TBSCertList_revokedCertificates_SEQOF'{crlEntryExtensions = Extensions}| _]) ->
+    case extension_value(?'id-ce-certificateIssuer', 'GeneralNames', Extensions) of
+	undefined ->
+	    [pubkey_cert_records:transform(Default, decode)];
+	GeneralNames ->
+	    gen_names(GeneralNames)
+    end.
+
+is_all_reasons(Mask, AllReasonsFun) ->
+    AllReasons = AllReasonsFun(),
+    case sets:is_subset(AllReasons, Mask) of
+	true ->
+	    true;
+	false ->
+	    %% As the "uspecified" reason should not
+	    %% be explicitly used according to RFC 3280
+	    %% and the conformance tests have test cases
+	    %% that should succed, and that does not specify
+	    %% "unspecified", we tolorate that it is not included.
+	    sets:is_subset(sets:del_element(unspecified, AllReasons), Mask)
+    end.
+
+all_reasons() ->
+    sets:from_list([unspecified, keyCompromise,
+		    cACompromise, affiliationChanged, superseded,
+		    cessationOfOperation, certificateHold,
+		    privilegeWithdrawn, aACompromise]).
+
+verify_issuer_and_scope(#'OTPCertificate'{tbsCertificate = TBSCert} = Cert,
+			#'DistributionPoint'{cRLIssuer = DPIssuer} = DP, IDP,
+			#'CertificateList'{tbsCertList = TBSCRL} = CRL)
+  when DPIssuer =/= asn1_NOVALUE ->
+    CRLIssuer = pubkey_cert_records:transform(TBSCRL#'TBSCertList'.issuer, decode),
+    Issuer = dp_crlissuer_to_issuer(DPIssuer),
+    case pubkey_cert:is_issuer(Issuer, CRLIssuer) and is_indirect_crl(IDP) of
+	true ->
+	    verify_scope(Cert, DP, IDP),
+	    issuer_id(Cert, CRL);
+	false ->
+	    %% otherwise verify that the CRL issuer matches the certificate issuer
+	    verify_issuer_and_scope(Cert, DP#'DistributionPoint'{
+					    distributionPoint = [TBSCert#'OTPTBSCertificate'.issuer],
+					    cRLIssuer = asn1_NOVALUE},
+				    IDP, CRL)
+    end;
+verify_issuer_and_scope(#'OTPCertificate'{tbsCertificate = TBSCert}= Cert,
+			DP, IDP,
+			#'CertificateList'{tbsCertList = TBSCRL}) ->
+    CRLIssuer = pubkey_cert_records:transform(TBSCRL#'TBSCertList'.issuer, decode),
+    CertIssuer = TBSCert#'OTPTBSCertificate'.issuer,
+    case pubkey_cert:is_issuer(CertIssuer, CRLIssuer) of
+	true ->
+	    verify_scope(Cert, DP, IDP),
+	    issuer_id(Cert);
+	false ->
+	    throw({bad_crl, invalid_issuer})
+    end.
+
+dp_crlissuer_to_issuer(DPCRLIssuer) ->
+     [{directoryName, Issuer}] = pubkey_cert_records:transform(DPCRLIssuer, decode),
+     Issuer.
+
+is_indirect_crl(#'IssuingDistributionPoint'{indirectCRL = Value})->
+    Value;
+is_indirect_crl(_) ->
+    false.
+
+verify_scope(_,_, undefined) ->
+    ok;
+verify_scope(#'OTPCertificate'{tbsCertificate = TBSCert}, #'DistributionPoint'{cRLIssuer = DPIssuer} = DP, IDP) ->
+    CertIssuer = TBSCert#'OTPTBSCertificate'.issuer,
+    Names = case gen_names(DPIssuer) of
+		[{directoryName, TNames}] ->
+		    TNames;
+		Other ->
+		    Other
+	    end,
+    DPName =  dp_names(DP#'DistributionPoint'.distributionPoint, Names, CertIssuer),
+    IDPName = dp_names(IDP#'IssuingDistributionPoint'.distributionPoint, Names, CertIssuer),
+    verify_scope(DPName, IDPName, Names, TBSCert, IDP).
+
+verify_scope(asn1_NOVALUE, _, asn1_NOVALUE, _, _) ->
+    throw({bad_crl, scope_error1});
+verify_scope(asn1_NOVALUE, IDPName, DPIssuerNames, TBSCert, IDP) ->
+    verify_dp_name(IDPName, DPIssuerNames),
+    verify_dp_bools(TBSCert, IDP);
+
+verify_scope(DPName, IDPName, _, TBSCert, IDP) ->
+    verify_dp_name(IDPName, DPName),
+    verify_dp_bools(TBSCert, IDP).
+
+dp_names(asn1_NOVALUE, _, _) ->
+    asn1_NOVALUE;
+dp_names({fullName, Name}, _, _) ->
+     gen_names(Name);
+dp_names({nameRelativeToCRLIssuer, Fragment}, asn1_NOVALUE, {rdnSequence, RelativeDestinguistNames}) ->
+    [{directoryName, {rdnSequence, RelativeDestinguistNames ++
+			  [lists:map(fun(AttrAndValue) ->
+					     pubkey_cert_records:transform(AttrAndValue, decode)
+				     end, Fragment)]}}];
+dp_names({nameRelativeToCRLIssuer, Fragment},{rdnSequence, RelativeDestinguistNames}, _) ->
+     [{directoryName, {rdnSequence, RelativeDestinguistNames ++
+			   [lists:map(fun(AttrAndValue) ->
+					      pubkey_cert_records:transform(AttrAndValue, decode)
+				      end, Fragment)]}}];
+dp_names([{rdnSequence, _}] = Name0, _,_) ->
+    [Name] = pubkey_cert_records:transform(Name0, decode),
+    [{directoryName, Name}].
+
+gen_names(asn1_NOVALUE) ->
+    asn1_NOVALUE;
+gen_names([]) ->
+    [];
+gen_names([{NameType, Name} | Rest]) ->
+    [ {NameType, pubkey_cert_records:transform(Name, decode)} | gen_names(Rest)].
+
+verify_dp_name(asn1_NOVALUE, _) ->
+    ok;
+
+verify_dp_name(IDPNames, DPorIssuerNames) ->
+    case match_one(DPorIssuerNames, IDPNames) of
+	true ->
+	    ok;
+	false ->
+	    throw({bad_crl, scope_error})
+    end.
+
+match_one([], _) ->
+    false;
+match_one([{Type, Name} | Names], CandidateNames) ->
+    Candidates = [NameName || {NameType, NameName} <- CandidateNames, NameType == Type],
+    case Candidates of
+	[] ->
+	    false;
+	[_|_] -> case pubkey_cert:match_name(Type, Name, Candidates) of
+		     true ->
+			 true;
+		 false ->
+			 match_one(Names, CandidateNames)
+		 end
+    end.
+
+verify_dp_bools(TBSCert, IDP) ->
+    BasicConstraints =
+	pubkey_cert:select_extension(?'id-ce-basicConstraints',
+				     TBSCert#'OTPTBSCertificate'.extensions),
+
+    case verify_onlyContainsUserCerts(BasicConstraints, IDP) andalso
+	verify_onlyContainsCACerts(BasicConstraints, IDP) andalso
+	verify_onlyContainsAttributeCerts(IDP) of
+	true ->
+	    ok;
+	_  ->
+	    throw({bad_crl, scope_error})
+    end.
+
+verify_onlyContainsUserCerts(
+  #'Extension'{extnValue = #'BasicConstraints'{cA = true}},
+  #'IssuingDistributionPoint'{onlyContainsUserCerts = true}) ->
+    false;
+verify_onlyContainsUserCerts(_,_) ->
+    true.
+
+verify_onlyContainsCACerts(
+  #'Extension'{extnValue = #'BasicConstraints'{cA = true}},
+  #'IssuingDistributionPoint'{onlyContainsCACerts = true}) ->
+    true;
+verify_onlyContainsCACerts(_,#'IssuingDistributionPoint'{onlyContainsCACerts = true}) ->
+    false;
+verify_onlyContainsCACerts(_,_) ->
+    true.
+
+verify_onlyContainsAttributeCerts(
+  #'IssuingDistributionPoint'{onlyContainsAttributeCerts = Bool}) ->
+    not Bool.
+
+check_crl_num(#'CertificateList'{tbsCertList = TBSCRL},
+	      #'CertificateList'{tbsCertList = TBSDeltaCRL})->
+    Extensions = TBSCRL#'TBSCertList'.crlExtensions,
+    DeltaExtensions = TBSDeltaCRL#'TBSCertList'.crlExtensions,
+
+    try
+	CRLNum = assert_extension_value(?'id-ce-cRLNumber', 'CRLNumber', Extensions),
+	DeltaBaseNum = assert_extension_value(?'id-ce-deltaCRLIndicator',
+					      'CRLNumber', DeltaExtensions),
+	DeltaCRLNum = assert_extension_value(?'id-ce-cRLNumber', 'CRLNumber', DeltaExtensions),
+	(CRLNum >= DeltaBaseNum) andalso (CRLNum < DeltaCRLNum)
+    catch
+	throw:no_extension_present ->
+	    false
+    end;
+check_crl_num(_,_) ->
+    false.
+
+
+extension_value(Extension, ExtType, Extensions) ->
+    case pubkey_cert:select_extension(Extension, Extensions) of
+	#'Extension'{extnValue = Value} ->
+	    public_key:der_decode(ExtType, list_to_binary(Value));
+	_ ->
+	    undefined
+    end.
+
+
+assert_extension_value(Extension, ExtType, Extensions) ->
+    case extension_value(Extension, ExtType, Extensions) of
+	undefined ->
+	    throw(no_extension_present);
+	Value ->
+	    Value
+    end.
+
+check_delta_issuer_and_scope(_, undefined) ->
+    true;
+check_delta_issuer_and_scope(#'CertificateList'{tbsCertList = TBSCRL},
+			     #'CertificateList'{tbsCertList = TBSDeltaCRL}) ->
+    case pubkey_cert:is_issuer(TBSCRL#'TBSCertList'.issuer,
+			       TBSDeltaCRL#'TBSCertList'.issuer) of
+	true ->
+	    check_delta_scope(TBSCRL, TBSDeltaCRL);
+	false ->
+	    false
+    end.
+
+check_delta_scope(#'TBSCertList'{crlExtensions = Extensions},
+		   #'TBSCertList'{crlExtensions = DeltaExtensions})->
+    IDP = issuing_distribution_point(Extensions),
+    DeltaIDP = issuing_distribution_point(DeltaExtensions),
+
+    AuthKey = authority_key_identifier(Extensions),
+    DeltaAuthKey = authority_key_identifier(DeltaExtensions),
+    is_match(IDP, DeltaIDP) andalso is_match(AuthKey, DeltaAuthKey).
+
+is_match(X, X) ->
+    true;
+is_match(_,_) ->
+    false.
+
+compute_interim_reasons_mask(#'DistributionPoint'{reasons = asn1_NOVALUE},
+			     #'IssuingDistributionPoint'{onlySomeReasons =
+							     asn1_NOVALUE}) ->
+    all_reasons();
+compute_interim_reasons_mask(#'DistributionPoint'{reasons = asn1_NOVALUE},
+			     undefined) ->
+    all_reasons();
+
+compute_interim_reasons_mask(#'DistributionPoint'{reasons = asn1_NOVALUE},
+			     #'IssuingDistributionPoint'{onlySomeReasons =
+							     IDPReasons}) ->
+    sets:from_list(IDPReasons);
+compute_interim_reasons_mask(#'DistributionPoint'{reasons = DPReasons},
+			     #'IssuingDistributionPoint'{onlySomeReasons =
+							     asn1_NOVALUE}) ->
+    sets:from_list(DPReasons);
+compute_interim_reasons_mask(#'DistributionPoint'{reasons = DPReasons},
+			     undefined) ->
+    sets:from_list(DPReasons);
+compute_interim_reasons_mask(#'DistributionPoint'{reasons = DPReasons},
+			     #'IssuingDistributionPoint'{onlySomeReasons =
+							     IDPReasons}) ->
+    sets:intersection(sets:from_list(DPReasons), sets:from_list(IDPReasons)).
+
+verify_interim_reasons_mask(#revoke_state{reasons_mask = Mask,
+					  interim_reasons_mask = IntMask}) ->
+    case sets:fold(fun(Element, Acc) ->
+			   case sets:is_element(Element, Mask) of
+			       true ->
+				   Acc;
+			   false ->
+				   true
+			   end
+		   end, false, IntMask) of
+	true ->
+	    ok;
+	false ->
+	    throw({bad_crl, mask_error})
+    end.
+
+verify_crl_signature(undefined, undefined, _,_) ->
+    true;
+verify_crl_signature(CRL, DerCRL, Key, KeyParams) ->
+    {DigestType, PlainText, Signature} = extract_crl_verify_data(CRL, DerCRL),
+    case Key of
+	#'RSAPublicKey'{} ->
+	    public_key:verify(PlainText, DigestType, Signature, Key);
+	_ ->
+	    public_key:verify(PlainText, DigestType, Signature,
+			      {Key, KeyParams})
+    end.
+extract_crl_verify_data(CRL, DerCRL) ->
+    {0, Signature} = CRL#'CertificateList'.signature,
+    #'AlgorithmIdentifier'{algorithm = SigAlg} =
+	CRL#'CertificateList'.signatureAlgorithm,
+    PlainText = encoded_tbs_crl(DerCRL),
+    DigestType = pubkey_cert:digest_type(SigAlg),
+    {DigestType, PlainText, Signature}.
+
+encoded_tbs_crl(CRL) ->
+    {ok, PKIXCRL} =
+	'OTP-PUB-KEY':decode_TBSCertList_exclusive(CRL),
+    {'CertificateList',
+     {'CertificateList_tbsCertList', EncodedTBSCertList}, _, _} = PKIXCRL,
+    EncodedTBSCertList.
+
+check_revoked(_,_,_,_,_,[], State) ->
+    State;
+check_revoked(#'DistributionPoint'{cRLIssuer = DPIssuer} = DP, IDP, DefaultIssuer0, Names, SerialNr,
+	      [#'TBSCertList_revokedCertificates_SEQOF'{userCertificate =
+							    SerialNr,
+							crlEntryExtensions =
+							    Extensions}| Rest],
+	      State) ->
+    Reason = revoked_reason(Extensions),
+    case (DPIssuer =/= asn1_NOVALUE) and is_indirect_crl(IDP) of
+	true ->
+	    handle_indirect_crl_check(DP, IDP, DefaultIssuer0, Names, SerialNr, Extensions, Reason, Rest, State);
+	false ->
+	    State#revoke_state{cert_status = Reason}
+    end;
+
+check_revoked(DP, IDP, DefaultIssuer0, Names, SerialNr,
+	      [#'TBSCertList_revokedCertificates_SEQOF'{crlEntryExtensions =
+							    Extensions}| Rest], State) ->
+    DefaultIssuer = case extension_value(?'id-ce-certificateIssuer', 'GeneralNames', Extensions) of
+			undefined ->
+			    DefaultIssuer0;
+			GeneralNames ->
+			    gen_names(GeneralNames)
+		    end,
+    check_revoked(DP, IDP, DefaultIssuer, Names, SerialNr, Rest, State).
+
+handle_indirect_crl_check(DP, IDP, DefaultIssuer0, Names, SerialNr, Extensions, Reason, Rest, State) ->
+    case check_crl_issuer_extension(Names, Extensions, DefaultIssuer0) of
+	{true, _} ->
+	    State#revoke_state{cert_status = Reason};
+	{false, DefaultIssuer} ->
+	    check_revoked(DP, IDP, DefaultIssuer, Names, SerialNr, Rest, State)
+    end.
+
+check_crl_issuer_extension(Names, Extensions, Default0) ->
+    case extension_value(?'id-ce-certificateIssuer', 'GeneralNames', Extensions) of
+	undefined ->
+	    {match_one(Default0, Names), Default0};
+	GeneralNames ->
+	    Default = gen_names(GeneralNames),
+	    {match_one(Default, Names), Default}
+    end.
+
+revoked_reason(Extensions) ->
+    case extension_value(?'id-ce-cRLReasons', 'CRLReason', Extensions) of
+	undefined ->
+	    unspecified;
+	Value ->
+	    Value
+    end.
+
+verify_crl_keybit(#'OTPCertificate'{tbsCertificate = TBS}, Bit) ->
+    case pubkey_cert:select_extension( ?'id-ce-keyUsage',
+				       TBS#'OTPTBSCertificate'.extensions) of
+	#'Extension'{extnID = ?'id-ce-keyUsage',
+		     extnValue = KeyUse} ->
+	    lists:member(Bit, KeyUse);
+	_ ->
+	    true
+    end.
+
+issuer_id(Cert, #'CertificateList'{tbsCertList = TBSCRL}) ->
+    Extensions =
+	pubkey_cert:extensions_list(TBSCRL#'TBSCertList'.crlExtensions),
+    case authority_key_identifier(Extensions) of
+	undefined ->
+	    issuer_id(Cert);
+	#'AuthorityKeyIdentifier'{authorityCertIssuer = asn1_NOVALUE,
+				  authorityCertSerialNumber = asn1_NOVALUE} ->
+	    issuer_id(Cert);
+	#'AuthorityKeyIdentifier'{authorityCertIssuer = Issuer,
+				  authorityCertSerialNumber = Nr}  ->
+	    {ok, {Nr, Issuer}}
+    end.
+
+issuer_id(#'OTPCertificate'{} = Cert) ->
+    case public_key:pkix_is_self_signed(Cert) of
+	true ->
+	    public_key:pkix_issuer_id(Cert, self);
+	false ->
+	    public_key:pkix_issuer_id(Cert, other)
+    end.
+
+status(unrevoked) ->
+    unrevoked;
+status(Reason) ->
+    {revoked, Reason}.
+
+verify_extensions([#'TBSCertList_revokedCertificates_SEQOF'{crlEntryExtensions = Ext} | Rest]) ->
+    verify_extensions(pubkey_cert:extensions_list(Ext)) and verify_extensions(Rest);
+verify_extensions([]) ->
+    true;
+verify_extensions([#'Extension'{critical = true, extnID = Id} | Rest]) ->
+    case lists:member(Id, [?'id-ce-authorityKeyIdentifier',
+			   ?'id-ce-issuerAltName',
+			   ?'id-ce-cRLNumber',
+			   ?'id-ce-certificateIssuer',
+			   ?'id-ce-deltaCRLIndicator',
+			   ?'id-ce-issuingDistributionPoint',
+			   ?'id-ce-freshestCRL']) of
+	true ->
+	    verify_extensions(Rest);
+	false ->
+	    false
+    end;
+verify_extensions([_Ext | Rest]) ->
+    verify_extensions(Rest).
+
+issuing_distribution_point(Extensions) ->
+    Enc = extension_value(?'id-ce-issuingDistributionPoint',
+			  'IssuingDistributionPoint', Extensions),
+    pubkey_cert_records:transform(Enc, decode).
+
+authority_key_identifier(Extensions) ->
+    Enc = extension_value(?'id-ce-authorityKeyIdentifier',
+			  'AuthorityKeyIdentifier', Extensions),
+    pubkey_cert_records:transform(Enc, decode).
+
+subject_alt_names(Extensions) ->
+    Enc = extension_value(?'id-ce-subjectAltName',
+			  'GeneralNames', Extensions),
+    case Enc of
+	undefined ->
+	    [];
+	_ ->
+	    pubkey_cert_records:transform(Enc, decode)
+    end.
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 4012825f20..6bdc35fb79 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -167,6 +167,8 @@ split_lines(Bin) ->
 %% Ignore white space at end of line
 join_entry([<<"-----END ", _/binary>>| Lines], Entry) ->
     {lists:reverse(Entry), Lines};
+join_entry([<<"-----END X509 CRL-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
 join_entry([Line | Lines], Entry) ->
     join_entry(Lines, [Line | Entry]).
 
@@ -198,7 +200,9 @@ pem_start('DHParameter') ->
 pem_start('CertificationRequest') ->
     <<"-----BEGIN CERTIFICATE REQUEST-----">>;
 pem_start('ContentInfo') ->
-    <<"-----BEGIN PKCS7-----">>.
+    <<"-----BEGIN PKCS7-----">>;
+pem_start('CertificateList') ->
+     <<"-----BEGIN X509 CRL-----">>.
 
 pem_end(<<"-----BEGIN CERTIFICATE-----">>) ->
     <<"-----END CERTIFICATE-----">>;
@@ -220,6 +224,8 @@ pem_end(<<"-----BEGIN CERTIFICATE REQUEST-----">>) ->
     <<"-----END CERTIFICATE REQUEST-----">>;
 pem_end(<<"-----BEGIN PKCS7-----">>) ->
     <<"-----END PKCS7-----">>;
+pem_end(<<"-----BEGIN X509 CRL-----">>) ->
+    <<"-----END X509 CRL-----">>;
 pem_end(_) ->
     undefined.
 
@@ -242,7 +248,9 @@ asn1_type(<<"-----BEGIN ENCRYPTED PRIVATE KEY-----">>) ->
 asn1_type(<<"-----BEGIN CERTIFICATE REQUEST-----">>) ->
     'CertificationRequest';
 asn1_type(<<"-----BEGIN PKCS7-----">>) ->
-    'ContentInfo'.
+    'ContentInfo';
+asn1_type(<<"-----BEGIN X509 CRL-----">>) ->
+    'CertificateList'.
 
 pem_decrypt() ->
     <<"Proc-Type: 4,ENCRYPTED">>.
diff --git a/lib/public_key/src/public_key.app.src b/lib/public_key/src/public_key.app.src
index 4cc81ea573..9f0677606d 100644
--- a/lib/public_key/src/public_key.app.src
+++ b/lib/public_key/src/public_key.app.src
@@ -7,6 +7,7 @@
 		  pubkey_ssh,
 		  pubkey_cert,
 		  pubkey_cert_records,
+		  pubkey_crl,
 		  'OTP-PUB-KEY',
 		  'PKCS-FRAME'
             ]},
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index d5df53e848..9b7d98728f 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -42,7 +42,8 @@
 	 pkix_issuer_id/2,
 	 pkix_normalize_name/1,
 	 pkix_path_validation/3,
-	 ssh_decode/2, ssh_encode/2
+	 ssh_decode/2, ssh_encode/2,
+	 pkix_crls_validate/3
 	]).
 
 -type rsa_padding()          :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
@@ -50,6 +51,8 @@
 -type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
 -type rsa_digest_type()      :: 'md5' | 'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512'.
 -type dss_digest_type()      :: 'none' | 'sha'. %% None is for backwards compatibility
+-type crl_reason()           ::  unspecified | keyCompromise | cACompromise | affiliationChanged | superseded
+			       | cessationOfOperation | certificateHold | privilegeWithdrawn |  aACompromise.
 
 -define(UINT32(X), X:32/unsigned-big-integer).
 -define(DER_NULL, <<5, 0>>).
@@ -428,9 +431,9 @@ pkix_verify(DerCert,  #'RSAPublicKey'{} = RSAKey)
     verify(PlainText, DigestType, Signature, RSAKey).
 
 %%--------------------------------------------------------------------
--spec pkix_is_issuer(Cert::binary()| #'OTPCertificate'{},
-		     IssuerCert::binary()|
-				 #'OTPCertificate'{}) -> boolean().
+-spec pkix_is_issuer(Cert :: der_encoded()| #'OTPCertificate'{} | #'CertificateList'{},
+		     IssuerCert :: der_encoded()|
+				   #'OTPCertificate'{}) -> boolean().
 %%
 %% Description: Checks if <IssuerCert> issued <Cert>.
 %%--------------------------------------------------------------------
@@ -443,7 +446,11 @@ pkix_is_issuer(Cert, IssuerCert) when is_binary(IssuerCert) ->
 pkix_is_issuer(#'OTPCertificate'{tbsCertificate = TBSCert}, 
 	       #'OTPCertificate'{tbsCertificate = Candidate}) ->
     pubkey_cert:is_issuer(TBSCert#'OTPTBSCertificate'.issuer,
-			  Candidate#'OTPTBSCertificate'.subject).
+			  Candidate#'OTPTBSCertificate'.subject);
+pkix_is_issuer(#'CertificateList'{tbsCertList = TBSCRL},
+	       #'OTPCertificate'{tbsCertificate = Candidate}) ->
+    pubkey_cert:is_issuer(Candidate#'OTPTBSCertificate'.subject,
+			  pubkey_cert_records:transform(TBSCRL#'TBSCertList'.issuer, decode)).
 
 %%--------------------------------------------------------------------
 -spec pkix_is_self_signed(Cert::binary()| #'OTPCertificate'{}) -> boolean().
@@ -502,7 +509,7 @@ pkix_normalize_name(Issuer) ->
 %%-------------------------------------------------------------------- 
 -spec pkix_path_validation(Cert::binary()| #'OTPCertificate'{} | atom(),
 			   CertChain :: [binary()] ,
-			   Options :: list()) ->  
+			   Options :: proplists:proplist()) ->
 				  {ok, {PublicKeyInfo :: term(), 
 					PolicyTree :: term()}} |
 				  {error, {bad_cert, Reason :: term()}}.
@@ -511,7 +518,7 @@ pkix_normalize_name(Issuer) ->
 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),
+    Otpcert = otp_cert(Cert),
     Reason = {bad_cert, PathErr},
     try VerifyFun(Otpcert, Reason, Userstat0) of
 	{valid, Userstate} ->
@@ -537,6 +544,27 @@ pkix_path_validation(#'OTPCertificate'{} = TrustedCert, CertChain, Options)
 							Options),
     path_validation(CertChain, ValidationState).
 
+%--------------------------------------------------------------------
+-spec pkix_crls_validate(#'OTPCertificate'{},
+			 [{DP::#'DistributionPoint'{} ,CRL::#'CertificateList'{}}],
+			 Options :: proplists:proplist()) -> valid | {bad_cert, revocation_status_undetermined}
+								| {bad_cert, {revoked, crl_reason()}}.
+
+%% Description: Performs a basic path validation according to RFC 5280.
+%%--------------------------------------------------------------------
+pkix_crls_validate(OtpCert, [{_,_,_} |_] = DPAndCRLs, Options) ->
+    pkix_crls_validate(OtpCert, DPAndCRLs, DPAndCRLs,
+		       Options, pubkey_crl:init_revokation_state());
+
+pkix_crls_validate(OtpCert, DPAndCRLs0, Options) ->
+    CallBack = proplists:get_value(update_crl, Options, fun(_, CurrCRL) ->
+							       CurrCRL
+						       end),
+    DPAndCRLs = sort_dp_crls(DPAndCRLs0, CallBack),
+    pkix_crls_validate(OtpCert, DPAndCRLs, DPAndCRLs,
+		       Options, pubkey_crl:init_revokation_state()).
+
+
 %%--------------------------------------------------------------------
 -spec ssh_decode(binary(), public_key | ssh_file()) -> [{public_key(), Attributes::list()}].
 %%
@@ -611,12 +639,13 @@ path_validation([DerCert | Rest], ValidationState = #path_validation_state{
 	    {error, Reason}
     end;
 
-path_validation([DerCert | _] = Path,
+path_validation([Cert | _] = Path,
 		#path_validation_state{user_state = UserState0,
 				       verify_fun = VerifyFun} =
 		    ValidationState) ->
     Reason = {bad_cert, max_path_length_reached},
-    OtpCert = pkix_decode_cert(DerCert, otp),
+    OtpCert = otp_cert(Cert),
+
     try VerifyFun(OtpCert,  Reason, UserState0) of
 	{valid, UserState} ->
 	    path_validation(Path,
@@ -630,7 +659,7 @@ path_validation([DerCert | _] = Path,
 	    {error, Reason}
     end.
 
-validate(DerCert, #path_validation_state{working_issuer_name = Issuer,
+validate(Cert, #path_validation_state{working_issuer_name = Issuer,
 					 working_public_key = Key,
 					 working_public_key_parameters = 
 					 KeyParams, 
@@ -641,31 +670,31 @@ validate(DerCert, #path_validation_state{working_issuer_name = Issuer,
 					 verify_fun = VerifyFun} =
 	     ValidationState0) ->
 
-    OtpCert = pkix_decode_cert(DerCert, otp),
+    OtpCert = otp_cert(Cert),
 
-    UserState1 = pubkey_cert:validate_time(OtpCert, UserState0, VerifyFun),
+    {ValidationState1, UserState1} =
+	pubkey_cert:validate_extensions(OtpCert, ValidationState0, UserState0,
+					VerifyFun),
 
-    UserState2 = pubkey_cert:validate_issuer(OtpCert, Issuer, UserState1, VerifyFun),
+    %% We want the key_usage extension to be checked before we validate
+    %% other things so that CRL validation errors will comply to standard
+    %% test suite description
 
-    UserState3 = pubkey_cert:validate_names(OtpCert, Permit, Exclude, Last,
-					    UserState2,VerifyFun),
+    UserState2 = pubkey_cert:validate_time(OtpCert, UserState1, VerifyFun),
 
-    UserState4 = pubkey_cert:validate_revoked_status(OtpCert, UserState3, VerifyFun),
-    
-    {ValidationState1, UserState5} =
-	pubkey_cert:validate_extensions(OtpCert, ValidationState0, UserState4,
-					VerifyFun),
+    UserState3 = pubkey_cert:validate_issuer(OtpCert, Issuer, UserState2, VerifyFun),
 
-    %% We want the key_usage extension to be checked before we validate
-    %% the signature. 
-    UserState6 = pubkey_cert:validate_signature(OtpCert, DerCert,
-						Key, KeyParams, UserState5, VerifyFun),
+    UserState4 = pubkey_cert:validate_names(OtpCert, Permit, Exclude, Last,
+					    UserState3, VerifyFun),
+
+    UserState5 = pubkey_cert:validate_signature(OtpCert, der_cert(Cert),
+						Key, KeyParams, UserState4, VerifyFun),
     UserState = case Last of
 		    false ->
-			pubkey_cert:verify_fun(OtpCert, valid, UserState6, VerifyFun);
+			pubkey_cert:verify_fun(OtpCert, valid, UserState5, VerifyFun);
 		    true ->
 			pubkey_cert:verify_fun(OtpCert, valid_peer,
-					       UserState6, VerifyFun)
+					       UserState5, VerifyFun)
 		end,
 
     ValidationState  = 
@@ -676,3 +705,110 @@ validate(DerCert, #path_validation_state{working_issuer_name = Issuer,
 sized_binary(Binary) ->
     Size = size(Binary),
     <<?UINT32(Size), Binary/binary>>.
+
+otp_cert(Der) when is_binary(Der) ->
+    pkix_decode_cert(Der, otp);
+otp_cert(#'OTPCertificate'{} =Cert) ->
+    Cert.
+
+der_cert(#'OTPCertificate'{} = Cert) ->
+    pkix_encode('OTPCertificate', Cert, otp);
+der_cert(Der) when is_binary(Der) ->
+    Der.
+
+pkix_crls_validate(_, [],_, _, _) ->
+    {bad_cert, revocation_status_undetermined};
+pkix_crls_validate(OtpCert, [{DP, CRL, DeltaCRL} | Rest],  All, Options, RevokedState0) ->
+    CallBack = proplists:get_value(update_crl, Options, fun(_, CurrCRL) ->
+							       CurrCRL
+						       end),
+    case pubkey_crl:fresh_crl(DP, CRL, CallBack) of
+	{fresh, CRL} ->
+	    do_pkix_crls_validate(OtpCert, [{DP, CRL, DeltaCRL} | Rest],
+				  All, Options, RevokedState0);
+	{fresh, NewCRL} ->
+	    NewAll = [{DP, NewCRL, DeltaCRL} | All -- [{DP, CRL, DeltaCRL}]],
+	    do_pkix_crls_validate(OtpCert, [{DP, NewCRL, DeltaCRL} | Rest],
+				  NewAll, Options, RevokedState0);
+	no_fresh_crl ->
+	    pkix_crls_validate(OtpCert, Rest, All, Options, RevokedState0)
+    end.
+
+do_pkix_crls_validate(OtpCert, [{DP, CRL, DeltaCRL} | Rest],  All, Options, RevokedState0) ->
+    OtherDPCRLs = All -- [{DP, CRL, DeltaCRL}],
+    case pubkey_crl:validate(OtpCert, OtherDPCRLs, DP, CRL, DeltaCRL, Options, RevokedState0) of
+	{undetermined, _, _} when Rest == []->
+	    {bad_cert, revocation_status_undetermined};
+	{undetermined, _, RevokedState} when Rest =/= []->
+	    pkix_crls_validate(OtpCert, Rest, All, Options, RevokedState);
+	{finished, unrevoked} ->
+	    valid;
+	{finished, Status} ->
+	    {bad_cert, Status}
+    end.
+
+sort_dp_crls(DpsAndCrls, FreshCB) ->
+    Sorted = do_sort_dp_crls(DpsAndCrls, dict:new()),
+    sort_crls(Sorted, FreshCB, []).
+
+do_sort_dp_crls([], Dict) ->
+    dict:to_list(Dict);
+do_sort_dp_crls([{DP, CRL} | Rest], Dict0) ->
+    Dict = try dict:fetch(DP, Dict0) of
+	       _ ->
+		   dict:append(DP, CRL, Dict0)
+	   catch _:_ ->
+		   dict:store(DP, [CRL], Dict0)
+	   end,
+    do_sort_dp_crls(Rest, Dict).
+
+sort_crls([], _, Acc) ->
+    Acc;
+
+sort_crls([{DP, AllCRLs} | Rest], FreshCB, Acc)->
+    {DeltaCRLs, CRLs} = do_sort_crls(AllCRLs),
+    DpsAndCRLs = combine(CRLs, DeltaCRLs, DP, FreshCB, []),
+    sort_crls(Rest, FreshCB, DpsAndCRLs ++ Acc).
+
+do_sort_crls(CRLs) ->
+    lists:partition(fun({_, CRL}) ->
+			    pubkey_crl:is_delta_crl(CRL)
+		    end, CRLs).
+
+combine([], _,_,_,Acc) ->
+    Acc;
+combine([{_, CRL} = Entry | CRLs], DeltaCRLs, DP, FreshCB, Acc) ->
+    DeltaCRL = combine(CRL, DeltaCRLs),
+    case pubkey_crl:fresh_crl(DP, DeltaCRL, FreshCB) of
+	no_fresh_crl ->
+	    combine(CRLs, DeltaCRLs, DP, FreshCB, [{DP, Entry, {undefined, undefined}} | Acc]);
+	{fresh, NewDeltaCRL} ->
+	    combine(CRLs, DeltaCRLs, DP, FreshCB, [{DP, Entry, NewDeltaCRL} | Acc])
+    end.
+
+combine(CRL, DeltaCRLs) ->
+    Deltas = lists:filter(fun({_,DeltaCRL}) ->
+				  pubkey_crl:combines(CRL, DeltaCRL)
+			  end, DeltaCRLs),
+    case Deltas of
+	[] ->
+	    {undefined, undefined};
+	[Delta] ->
+	    Delta;
+	[_,_|_] ->
+	    Fun =
+		fun({_, #'CertificateList'{tbsCertList = FirstTBSCRL}} = CRL1,
+		    {_, #'CertificateList'{tbsCertList = SecondTBSCRL}} = CRL2) ->
+			Time1 = pubkey_cert:time_str_2_gregorian_sec(
+				  FirstTBSCRL#'TBSCertList'.thisUpdate),
+			Time2 = pubkey_cert:time_str_2_gregorian_sec(
+				  SecondTBSCRL#'TBSCertList'.thisUpdate),
+			case Time1 > Time2 of
+			      true ->
+				CRL1;
+			    false ->
+				CRL2
+			end
+		end,
+	    lists:foldl(Fun,  hd(Deltas), tl(Deltas))
+    end.
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl
index d6bdd05d01..95e288cd71 100644
--- a/lib/public_key/test/erl_make_certs.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -234,7 +234,7 @@ extensions(Opts) ->
     end.
 
 default_extensions(Exts) ->
-    Def = [{key_usage,undefined}, 
+    Def = [{key_usage, default},
 	   {subject_altname, undefined},
 	   {issuer_altname, undefined},
 	   {basic_constraints, default},
@@ -265,6 +265,11 @@ extension({basic_constraints, Data}) ->
 	    #'Extension'{extnID = ?'id-ce-basicConstraints',
 			 extnValue = Data}
     end;
+
+extension({key_usage, default}) ->
+    #'Extension'{extnID = ?'id-ce-keyUsage',
+		 extnValue = [keyCertSign], critical = true};
+
 extension({Id, Data, Critical}) ->
     #'Extension'{extnID = Id, extnValue = Data, critical = Critical}.
 
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 380a67db7b..8fba1e8cd3 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
 %%
 %% The 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,72 +19,16 @@
 
 -module(pbe_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
-%% Test server callback functions
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    try crypto:start() of
-	ok ->
-	    Config
-    catch _:_ ->
-	    {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) ->
-    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(_TestCase, Config) ->
-   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
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-end_per_testcase(_TestCase, _Config) ->
-   ok.
 
-%%--------------------------------------------------------------------
-%% 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() -> 
@@ -96,17 +40,40 @@ all() ->
 groups() -> 
     [].
 
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    try crypto:start() of
+	ok ->
+	    Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
+
 init_per_group(_GroupName, Config) ->
     Config.
 
 end_per_group(_GroupName, Config) ->
     Config.
 
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+   Config.
+
+
+end_per_testcase(_TestCase, _Config) ->
+   ok.
 
-%% Test cases starts here.
 %%--------------------------------------------------------------------
-pbdkdf1(doc) ->
-    ["Test with PKCS #5 PBKDF1 Test Vectors"];
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+pbdkdf1() ->
+    [{doc,"Test with PKCS #5 PBKDF1 Test Vectors"}].
 pbdkdf1(Config) when is_list(Config) ->
     %%Password = "password"
     %%     = (0x)70617373776F7264
@@ -126,8 +93,8 @@ pbdkdf1(Config) when is_list(Config) ->
      16#4A, 16#3D, 16#2A, 16#20, _/binary>> =
 	pubkey_pbe:pbdkdf1(Password, Salt, Count, sha).
 
-pbdkdf2(doc) ->
-    ["Test with PKCS #5 PBKDF2 Test Vectors"];
+pbdkdf2() ->
+    [{doc,"Test with PKCS #5 PBKDF2 Test Vectors"}].
 pbdkdf2(Config) when is_list(Config) ->
     %% Input:
     %%   P = "password" (8 octets)
@@ -225,28 +192,28 @@ pbdkdf2(Config) when is_list(Config) ->
 	= pubkey_pbe:pbdkdf2("pass\0word", 
 			     "sa\0lt", 4096, 16, fun crypto:sha_mac/3, 20).
     
-encrypted_private_key_info(doc) ->
-    ["Tests reading a EncryptedPrivateKeyInfo file encrypted with different ciphers"];
+encrypted_private_key_info() ->
+    [{doc,"Tests reading a EncryptedPrivateKeyInfo file encrypted with different ciphers"}].
 encrypted_private_key_info(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
     {ok, PemDes} = file:read_file(filename:join(Datadir, "des_cbc_enc_key.pem")),
     
     PemDesEntry = public_key:pem_decode(PemDes),
-    test_server:format("Pem entry: ~p" , [PemDesEntry]),
+    ct:print("Pem entry: ~p" , [PemDesEntry]),
     [{'PrivateKeyInfo', _, {"DES-CBC",_}} = PubEntry0] = PemDesEntry,
     KeyInfo = public_key:pem_entry_decode(PubEntry0, "password"),
     
     {ok, Pem3Des} = file:read_file(filename:join(Datadir, "des_ede3_cbc_enc_key.pem")),
 
     Pem3DesEntry = public_key:pem_decode(Pem3Des),
-    test_server:format("Pem entry: ~p" , [Pem3DesEntry]),
+    ct:print("Pem entry: ~p" , [Pem3DesEntry]),
     [{'PrivateKeyInfo', _, {"DES-EDE3-CBC",_}} = PubEntry1] = Pem3DesEntry,
     KeyInfo = public_key:pem_entry_decode(PubEntry1, "password"),
 
     {ok, PemRc2} = file:read_file(filename:join(Datadir, "rc2_cbc_enc_key.pem")),
 
     PemRc2Entry = public_key:pem_decode(PemRc2),
-    test_server:format("Pem entry: ~p" , [PemRc2Entry]),
+    ct:print("Pem entry: ~p" , [PemRc2Entry]),
     [{'PrivateKeyInfo', _, {"RC2-CBC",_}} = PubEntry2] = PemRc2Entry,
     KeyInfo = public_key:pem_entry_decode(PubEntry2, "password"),
 
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index e59f299399..d901adaadd 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The 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,16 +23,18 @@
 
 -module(pkits_SUITE).
 
--compile(export_all).
-
 -include_lib("public_key/include/public_key.hrl").
 
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
 -define(error(Format,Args), error(Format,Args,?FILE,?LINE)).
 -define(warning(Format,Args), warning(Format,Args,?FILE,?LINE)).
 
 -define(CERTS, "pkits/certs").
 -define(MIME,  "pkits/smime").
 -define(CONV,  "pkits/smime-pem").
+-define(CRL,   "pkits/crls").
 
 -define(NIST1, "2.16.840.1.101.3.2.1.48.1").
 -define(NIST2, "2.16.840.1.101.3.2.1.48.2").
@@ -42,10 +44,13 @@
 -define(NIST6, "2.16.840.1.101.3.2.1.48.6").
 
 -record(verify_state, {
-	  certs_db,
-	  crl_info,
+	  crls,
+	  crl_paths,
 	  revoke_state}).
-%%
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
@@ -54,9 +59,9 @@ all() ->
      {group, validity_periods},
      {group, verifying_name_chaining},
      {group, verifying_paths_with_self_issued_certificates},
-     %%{group, basic_certificate_revocation_tests},
-     %%{group, delta_crls},
-     %%{group, distribution_points},
+     {group, basic_certificate_revocation_tests},
+     {group, delta_crls},
+     {group, distribution_points},
      {group, verifying_basic_constraints},
      {group, key_usage},
      {group, name_constraints},
@@ -72,20 +77,22 @@ groups() ->
       [invalid_name_chain, whitespace_name_chain, capitalization_name_chain,
        uid_name_chain, attrib_name_chain, string_name_chain]},
      {verifying_paths_with_self_issued_certificates, [],
-      [basic_valid, %%basic_invalid, 
-       crl_signing_valid, crl_signing_invalid]},
-     %% {basic_certificate_revocation_tests, [],
-     %%  [missing_CRL, revoked_CA, revoked_peer, invalid_CRL_signature,
-     %%   invalid_CRL_issuer, invalid_CRL, valid_CRL,
-     %%   unknown_CRL_extension, old_CRL, fresh_CRL, valid_serial,
-     %%   invalid_serial, valid_seperate_keys, invalid_separate_keys]},
-     %% {delta_crls, [], [delta_without_crl, valid_delta_crls, invalid_delta_crls]},
-     %% {distribution_points, [], [valid_distribution_points,
-     %% 				valid_distribution_points_no_issuing_distribution_point,
-     %% 				invalid_distribution_points, valid_only_contains,
-     %% 				invalid_only_contains, valid_only_some_reasons,
-     %% 				invalid_only_some_reasons, valid_indirect_crl,
-     %% 				invalid_indirect_crl, valid_crl_issuer, invalid_crl_issuer]},
+      [basic_valid, basic_invalid, crl_signing_valid, crl_signing_invalid]},
+     {basic_certificate_revocation_tests, [],
+      [missing_CRL,
+       revoked_CA,
+       revoked_peer,
+       invalid_CRL_signature,
+       invalid_CRL_issuer, invalid_CRL, valid_CRL,
+       unknown_CRL_extension, old_CRL, fresh_CRL, valid_serial,
+       invalid_serial, valid_seperate_keys, invalid_separate_keys]},
+     {delta_crls, [], [delta_without_crl, valid_delta_crls, invalid_delta_crls]},
+     {distribution_points, [], [valid_distribution_points,
+				valid_distribution_points_no_issuing_distribution_point,
+				invalid_distribution_points, valid_only_contains,
+				invalid_only_contains, valid_only_some_reasons,
+				invalid_only_some_reasons, valid_indirect_crl,
+				invalid_indirect_crl, valid_crl_issuer, invalid_crl_issuer]},
      {verifying_basic_constraints,[],
       [missing_basic_constraints, valid_basic_constraint, invalid_path_constraints,
        valid_path_constraints]},
@@ -102,12 +109,25 @@ groups() ->
       [unknown_critical_extension, unknown_not_critical_extension]}
     ].
 
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    try crypto:start() of
+	ok ->
+	    crypto_support_check(Config)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
 init_per_group(_GroupName, Config) ->
     Config.
 
 end_per_group(_GroupName, Config) ->
     Config.
-
+%%--------------------------------------------------------------------
 init_per_testcase(_Func, Config) ->
     Datadir = proplists:get_value(data_dir, Config),
     put(datadir, Datadir),
@@ -116,143 +136,105 @@ init_per_testcase(_Func, Config) ->
 end_per_testcase(_Func, Config) ->
     Config.
 
-init_per_suite(Config) ->
-    try crypto:start() of
-     	ok ->
-	  crypto_support_check(Config)  
-    catch _:_ ->
-     	    {skip, "Crypto did not start"}
-    end.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
 
-end_per_suite(_Config) ->
-    application:stop(crypto).
-
-%%-----------------------------------------------------------------------------
-valid_rsa_signature(doc) ->
-    ["Test rsa signatur verification"];
-valid_rsa_signature(suite) ->
-    [];
+%%--------------------------- signature_verification--------------------------------------------------
+valid_rsa_signature() ->
+    [{doc, "Test rsa signatur verification"}].
 valid_rsa_signature(Config) when is_list(Config) ->
     run([{ "4.1.1", "Valid Certificate Path Test1 EE", ok}]).
 
-invalid_rsa_signature(doc) ->
-    ["Test rsa signatur verification"];
-invalid_rsa_signature(suite) ->
-    [];
+invalid_rsa_signature() ->
+    [{doc,"Test rsa signatur verification"}].
 invalid_rsa_signature(Config) when is_list(Config) ->
     run([{ "4.1.2", "Invalid CA Signature Test2 EE", {bad_cert,invalid_signature}},
 	 { "4.1.3", "Invalid EE Signature Test3 EE", {bad_cert,invalid_signature}}]).
 
-valid_dsa_signature(doc) ->
-    ["Test dsa signatur verification"];
-valid_dsa_signature(suite) ->
-    [];
+valid_dsa_signature() ->
+    [{doc,"Test dsa signatur verification"}].
 valid_dsa_signature(Config) when is_list(Config) ->
     run([{ "4.1.4", "Valid DSA Signatures Test4 EE", ok},
 	 { "4.1.5", "Valid DSA Parameter Inheritance Test5 EE", ok}]).
 
-invalid_dsa_signature(doc) ->
-    ["Test dsa signatur verification"];
-invalid_dsa_signature(suite) ->
-    [];
+invalid_dsa_signature() ->
+    [{doc,"Test dsa signatur verification"}].
 invalid_dsa_signature(Config) when is_list(Config) ->
     run([{ "4.1.6", "Invalid DSA Signature Test6 EE",{bad_cert,invalid_signature}}]).
-%%-----------------------------------------------------------------------------
-not_before_invalid(doc) ->
-    [""];
-not_before_invalid(suite) ->
-    [];
+
+%%-----------------------------validity_periods------------------------------------------------
+not_before_invalid() ->
+    [{doc,"Test valid periods"}].
 not_before_invalid(Config) when is_list(Config) ->
     run([{ "4.2.1", "Invalid CA notBefore Date Test1 EE",{bad_cert, cert_expired}},
 	 { "4.2.2", "Invalid EE notBefore Date Test2 EE",{bad_cert, cert_expired}}]).
 
-not_before_valid(doc) ->
-    [""];
-not_before_valid(suite) ->
-    [];
+not_before_valid() ->
+    [{doc,"Test valid periods"}].
 not_before_valid(Config) when is_list(Config) ->
     run([{ "4.2.3", "Valid pre2000 UTC notBefore Date Test3 EE", ok},
 	 { "4.2.4", "Valid GeneralizedTime notBefore Date Test4 EE", ok}]).
 
-not_after_invalid(doc) ->
-    [""];
-not_after_invalid(suite) ->
-    [];
+not_after_invalid() ->
+    [{doc,"Test valid periods"}].
 not_after_invalid(Config) when is_list(Config) ->
     run([{ "4.2.5", "Invalid CA notAfter Date Test5 EE", {bad_cert, cert_expired}},
 	 { "4.2.6", "Invalid EE notAfter Date Test6 EE", {bad_cert, cert_expired}},
 	 { "4.2.7", "Invalid pre2000 UTC EE notAfter Date Test7 EE",{bad_cert, cert_expired}}]).
 
-not_after_valid(doc) ->
-    [""];
-not_after_valid(suite) ->
-    [];
+not_after_valid() ->
+    [{doc,"Test valid periods"}].
 not_after_valid(Config) when is_list(Config) ->
     run([{ "4.2.8", "Valid GeneralizedTime notAfter Date Test8 EE", ok}]).
-%%-----------------------------------------------------------------------------
-invalid_name_chain(doc) ->
-    [""];
-invalid_name_chain(suite) ->
-    [];
+
+%%----------------------------verifying_name_chaining-------------------------------------------------
+invalid_name_chain() ->
+    [{doc,"Test name chaining"}].
 invalid_name_chain(Config) when is_list(Config) ->
     run([{ "4.3.1", "Invalid Name Chaining Test1 EE", {bad_cert, invalid_issuer}},
 	 { "4.3.2", "Invalid Name Chaining Order Test2 EE", {bad_cert, invalid_issuer}}]).
 
-whitespace_name_chain(doc) ->
-    [""];
-whitespace_name_chain(suite) ->
-    [];
+whitespace_name_chain() ->
+    [{doc,"Test name chaining"}].
 whitespace_name_chain(Config) when is_list(Config) ->
     run([{ "4.3.3", "Valid Name Chaining Whitespace Test3 EE", ok},
 	 { "4.3.4", "Valid Name Chaining Whitespace Test4 EE", ok}]).
 
-capitalization_name_chain(doc) ->
-    [""];
-capitalization_name_chain(suite) ->
-    [];
+capitalization_name_chain() ->
+    [{doc,"Test name chaining"}].
 capitalization_name_chain(Config) when is_list(Config) ->
     run([{ "4.3.5", "Valid Name Chaining Capitalization Test5 EE",ok}]).
 
-uid_name_chain(doc) ->
-    [""];
-uid_name_chain(suite) ->
-    [];
+uid_name_chain() ->
+    [{doc,"Test name chaining"}].
 uid_name_chain(Config) when is_list(Config) ->
     run([{ "4.3.6", "Valid Name UIDs Test6 EE",ok}]).
 
-attrib_name_chain(doc) ->
-    [""];
-attrib_name_chain(suite) ->
-    [];
+attrib_name_chain() ->
+    [{doc,"Test name chaining"}].
 attrib_name_chain(Config) when is_list(Config) ->
     run([{ "4.3.7", "Valid RFC3280 Mandatory Attribute Types Test7 EE", ok},
 	 { "4.3.8", "Valid RFC3280 Optional Attribute Types Test8 EE",  ok}]).
 
-string_name_chain(doc) ->
-    [""];
-string_name_chain(suite) ->
-    [];
+string_name_chain() ->
+    [{doc,"Test name chaining"}].
 string_name_chain(Config) when is_list(Config) ->
     run([{ "4.3.9", "Valid UTF8String Encoded Names Test9 EE", ok},
 	 %%{ "4.3.10", "Valid Rollover from PrintableString to UTF8String Test10 EE", ok},
 	 { "4.3.11", "Valid UTF8String Case Insensitive Match Test11 EE", ok}]).
 
-%%-----------------------------------------------------------------------------
-
-basic_valid(doc) ->
-    [""];
-basic_valid(suite) ->
-    [];
+%%----------------------------verifying_paths_with_self_issued_certificates-------------------------------------------------
+basic_valid() ->
+    [{doc,"Test self issued certificates"}].
 basic_valid(Config) when is_list(Config) ->
     run([{ "4.5.1",  "Valid Basic Self-Issued Old With New Test1 EE", ok},
 	 { "4.5.3",  "Valid Basic Self-Issued New With Old Test3 EE", ok},
 	 { "4.5.4",  "Valid Basic Self-Issued New With Old Test4 EE", ok}
 	]).
 
-basic_invalid(doc) ->
-    [""];
-basic_invalid(suite) ->
-    [];
+basic_invalid() ->
+    [{doc,"Test self issued certificates"}].
 basic_invalid(Config) when is_list(Config) ->
     run([{"4.5.2",  "Invalid Basic Self-Issued Old With New Test2 EE",
 	  {bad_cert, {revoked, keyCompromise}}},
@@ -260,84 +242,63 @@ basic_invalid(Config) when is_list(Config) ->
 	  {bad_cert, {revoked, keyCompromise}}}
 	]).
 
-crl_signing_valid(doc) ->
-    [""];
-crl_signing_valid(suite) ->
-    [];
+crl_signing_valid() ->
+    [{doc,"Test self issued certificates"}].
 crl_signing_valid(Config) when is_list(Config) ->
     run([{ "4.5.6",  "Valid Basic Self-Issued CRL Signing Key Test6 EE", ok}]).
 
-crl_signing_invalid(doc) ->
-    [""];
-crl_signing_invalid(suite) ->
-    [];
+crl_signing_invalid() ->
+    [{doc,"Test self issued certificates"}].
 crl_signing_invalid(Config) when is_list(Config) ->
-    run([%% { "4.5.7",  "Invalid Basic Self-Issued CRL Signing Key Test7 EE",
-	 %%   {bad_cert, {revoked, keyCompromise}}},
+    run([{ "4.5.7",  "Invalid Basic Self-Issued CRL Signing Key Test7 EE",
+	   {bad_cert, {revoked, keyCompromise}}},
 	 { "4.5.8",  "Invalid Basic Self-Issued CRL Signing Key Test8 EE",
 	   {bad_cert, invalid_key_usage}}
 	]).
 
-%%-----------------------------------------------------------------------------
-missing_CRL(doc) ->
-    [""];
-missing_CRL(suite) ->
-    [];
+%%-----------------------------basic_certificate_revocation_tests------------------------------------------------
+missing_CRL() ->
+    [{doc,"Test basic CRL handling"}].
 missing_CRL(Config) when is_list(Config) ->
-    run([{ "4.4.1", "Missing CRL Test1 EE",{bad_cert,
+    run([{ "4.4.1", "Invalid Missing CRL Test1 EE",{bad_cert,
     revocation_status_undetermined}}]).
 
-revoked_CA(doc) ->
-    [""];
-revoked_CA(suite) ->
-    [];
+revoked_CA() ->
+    [{doc,"Test basic CRL handling"}].
 revoked_CA(Config) when is_list(Config) ->
     run([{ "4.4.2", "Invalid Revoked CA Test2 EE", {bad_cert,
     {revoked, keyCompromise}}}]).
 
-revoked_peer(doc) ->
-    [""];
-revoked_peer(suite) ->
-    [];
+revoked_peer() ->
+    [{doc,"Test basic CRL handling"}].
 revoked_peer(Config) when is_list(Config) ->
-    run([{ "4.4.3", "Invalid Revoked EE Test3 EE", {bad_cert,
-    {revoked, keyCompromise}}}]).
+    run([{ "4.4.3", "Invalid Revoked EE Test3 EE",
+	   {bad_cert, {revoked, keyCompromise}}}]).
 
-invalid_CRL_signature(doc) ->
-    [""];
-invalid_CRL_signature(suite) ->
-    [];
+invalid_CRL_signature() ->
+    [{doc,"Test basic CRL handling"}].
 invalid_CRL_signature(Config) when is_list(Config) ->
     run([{ "4.4.4", "Invalid Bad CRL Signature Test4 EE",
-	   {bad_cert, revocation_status_undetermined}}]).
-
-invalid_CRL_issuer(doc) ->
-    [""];
-invalid_CRL_issuer(suite) ->
-    [];
+		   {bad_cert, revocation_status_undetermined}}]).
+invalid_CRL_issuer() ->
+    [{doc,"Test basic CRL handling"}].
 invalid_CRL_issuer(Config) when is_list(Config) ->
     run({ "4.4.5", "Invalid Bad CRL Issuer Name Test5 EE",
 	  {bad_cert, revocation_status_undetermined}}).
 
-invalid_CRL(doc) ->
-    [""];
-invalid_CRL(suite) ->
-    [];
+invalid_CRL() ->
+    [{doc,"Test basic CRL handling"}].
 invalid_CRL(Config) when is_list(Config) ->
     run([{ "4.4.6", "Invalid Wrong CRL Test6 EE",
 	   {bad_cert, revocation_status_undetermined}}]).
 
-valid_CRL(doc) ->
-    [""];
-valid_CRL(suite) ->
-    [];
+valid_CRL() ->
+    [{doc,"Test basic CRL handling"}].
 valid_CRL(Config) when is_list(Config) ->
     run([{ "4.4.7", "Valid Two CRLs Test7 EE", ok}]).
 
-unknown_CRL_extension(doc) ->
-    [""];
-unknown_CRL_extension(suite) ->
-    [];
+unknown_CRL_extension() ->
+    [{doc,"Test basic CRL handling"}].
 unknown_CRL_extension(Config) when is_list(Config) ->
     run([{ "4.4.8", "Invalid Unknown CRL Entry Extension Test8 EE",
 	   {bad_cert, {revoked, keyCompromise}}},
@@ -346,27 +307,21 @@ unknown_CRL_extension(Config) when is_list(Config) ->
 	 { "4.4.10", "Invalid Unknown CRL Extension Test10 EE",
 	   {bad_cert, revocation_status_undetermined}}]).
 
-old_CRL(doc) ->
-    [""];
-old_CRL(suite) ->
-    [];
+old_CRL() ->
+    [{doc,"Test basic CRL handling"}].
 old_CRL(Config) when is_list(Config) ->
     run([{ "4.4.11", "Invalid Old CRL nextUpdate Test11 EE",
 	   {bad_cert, revocation_status_undetermined}},
 	 { "4.4.12", "Invalid pre2000 CRL nextUpdate Test12 EE",
 	   {bad_cert, revocation_status_undetermined}}]).
 
-fresh_CRL(doc) ->
-    [""];
-fresh_CRL(suite) ->
-    [];
+fresh_CRL() ->
+    [{doc,"Test basic CRL handling"}].
 fresh_CRL(Config) when is_list(Config) ->
     run([{ "4.4.13", "Valid GeneralizedTime CRL nextUpdate Test13 EE", ok}]).
 
-valid_serial(doc) ->
-    [""];
-valid_serial(suite) ->
-    [];
+valid_serial() ->
+    [{doc,"Test basic CRL handling"}].
 valid_serial(Config) when is_list(Config) ->
     run([
 	 { "4.4.14", "Valid Negative Serial Number Test14 EE",ok},
@@ -374,38 +329,30 @@ valid_serial(Config) when is_list(Config) ->
 	 { "4.4.17", "Valid Long Serial Number Test17 EE", ok}
 	]).
 
-invalid_serial(doc) ->
-    [""];
-invalid_serial(suite) ->
-    [];
+invalid_serial() ->
+    [{doc,"Test basic CRL handling"}].
 invalid_serial(Config) when is_list(Config) ->
     run([{ "4.4.15", "Invalid Negative Serial Number Test15 EE",
 	   {bad_cert, {revoked, keyCompromise}}},
 	 { "4.4.18", "Invalid Long Serial Number Test18 EE",
 	   {bad_cert, {revoked, keyCompromise}}}]).
 
-valid_seperate_keys(doc) ->
-    [""];
-valid_seperate_keys(suite) ->
-    [];
+valid_seperate_keys() ->
+    [{doc,"Test basic CRL handling"}].
 valid_seperate_keys(Config) when is_list(Config) ->
     run([{ "4.4.19", "Valid Separate Certificate and CRL Keys Test19 EE",   ok}]).
 
-invalid_separate_keys(doc) ->
-    [""];
-invalid_separate_keys(suite) ->
-    [];
+invalid_separate_keys() ->
+    [{doc,"Test basic CRL handling"}].
 invalid_separate_keys(Config) when is_list(Config) ->
-    run([{ "4.4.20", "Invalid Separate Certificate and CRL Keys Test20",
+    run([{ "4.4.20", "Invalid Separate Certificate and CRL Keys Test20 EE",
 	   {bad_cert, {revoked, keyCompromise}}},
-	 { "4.4.21", "Invalid Separate Certificate and CRL Keys Test21",
+	 { "4.4.21", "Invalid Separate Certificate and CRL Keys Test21 EE",
 	   {bad_cert, revocation_status_undetermined}}
 	]).
-%%-----------------------------------------------------------------------------
-missing_basic_constraints(doc) ->
-    [""];
-missing_basic_constraints(suite) ->
-    [];
+%%----------------------------verifying_basic_constraints-------------------------------------------------
+missing_basic_constraints() ->
+    [{doc,"Basic constraint tests"}].
 missing_basic_constraints(Config) when is_list(Config) ->
     run([{ "4.6.1",  "Invalid Missing basicConstraints Test1 EE",
 	   {bad_cert, missing_basic_constraint}},
@@ -414,17 +361,13 @@ missing_basic_constraints(Config) when is_list(Config) ->
 	 { "4.6.3",  "Invalid cA False Test3 EE",
 	   {bad_cert, missing_basic_constraint}}]).
 
-valid_basic_constraint(doc) ->
-    [""];
-valid_basic_constraint(suite) ->
-    [];
+valid_basic_constraint() ->
+    [{doc,"Basic constraint tests"}].
 valid_basic_constraint(Config) when is_list(Config) ->
     run([{"4.6.4", "Valid basicConstraints Not Critical Test4 EE", ok}]).
 
-invalid_path_constraints(doc) ->
-    [""];
-invalid_path_constraints(suite) ->
-    [];
+invalid_path_constraints() ->
+    [{doc,"Basic constraint tests"}].
 invalid_path_constraints(Config) when is_list(Config) ->
     run([{ "4.6.5", "Invalid pathLenConstraint Test5 EE", {bad_cert, max_path_length_reached}},
 	 { "4.6.6", "Invalid pathLenConstraint Test6 EE", {bad_cert, max_path_length_reached}},
@@ -435,10 +378,8 @@ invalid_path_constraints(Config) when is_list(Config) ->
 	 { "4.6.16", "Invalid Self-Issued pathLenConstraint Test16 EE",
 	   {bad_cert, max_path_length_reached}}]).
 
-valid_path_constraints(doc) ->
-    [""];
-valid_path_constraints(suite) ->
-    [];
+valid_path_constraints() ->
+    [{doc,"Basic constraint tests"}].
 valid_path_constraints(Config) when is_list(Config) ->
     run([{ "4.6.7",  "Valid pathLenConstraint Test7 EE", ok},
 	 { "4.6.8",  "Valid pathLenConstraint Test8 EE", ok},
@@ -447,60 +388,54 @@ valid_path_constraints(Config) when is_list(Config) ->
 	 { "4.6.15", "Valid Self-Issued pathLenConstraint Test15 EE", ok},
 	 { "4.6.17", "Valid Self-Issued pathLenConstraint Test17 EE", ok}]).
 
-%%-----------------------------------------------------------------------------
-invalid_key_usage(doc) ->
-    [""];
-invalid_key_usage(suite) ->
-    [];
+%%-----------------------------key_usage------------------------------------------------
+invalid_key_usage() ->
+    [{doc,"Key usage tests"}].
 invalid_key_usage(Config) when is_list(Config) ->
     run([{ "4.7.1",  "Invalid keyUsage Critical keyCertSign False Test1 EE",
 	   {bad_cert,invalid_key_usage} },
 	 { "4.7.2",  "Invalid keyUsage Not Critical keyCertSign False Test2 EE",
-	   {bad_cert,invalid_key_usage}}
-	%% { "4.7.4",  "Invalid keyUsage Critical cRLSign False Test4 EE",
-	%%   {bad_cert, revocation_status_undetermined}},
-	%%  { "4.7.5",  "Invalid keyUsage Not Critical cRLSign False Test5 EE",
-	%%    {bad_cert, revocation_status_undetermined}}
+	   {bad_cert,invalid_key_usage}},
+	 { "4.7.4",  "Invalid keyUsage Critical cRLSign False Test4 EE",
+	   {bad_cert, invalid_key_usage}},
+	 { "4.7.5",  "Invalid keyUsage Not Critical cRLSign False Test5 EE",
+	   {bad_cert, invalid_key_usage}}
 	]).
 
-valid_key_usage(doc) ->
-    [""];
-valid_key_usage(suite) ->
-    [];
+valid_key_usage() ->
+    [{doc,"Key usage tests"}].
 valid_key_usage(Config) when is_list(Config) ->
     run([{ "4.7.3",  "Valid keyUsage Not Critical Test3 EE", ok}]).
 
 %%-----------------------------------------------------------------------------
-certificate_policies(doc) ->    [""];
-certificate_policies(suite) -> [];
+certificate_policies() ->
+    [{doc,"Not supported yet"}].
 certificate_policies(Config) when is_list(Config) ->
-    run(certificate_policies()).
+    run(certificate_policies_tests()).
 %%-----------------------------------------------------------------------------
-require_explicit_policy(doc) ->    [""];
-require_explicit_policy(suite) -> [];
+require_explicit_policy() ->
+    [{doc,"Not supported yet"}].
 require_explicit_policy(Config) when is_list(Config) ->
-    run(require_explicit_policy()).
+    run(require_explicit_policy_tests()).
 %%-----------------------------------------------------------------------------
-policy_mappings(doc) ->     [""];
-policy_mappings(suite) -> [];
+policy_mappings() ->
+    [{doc,"Not supported yet"}].
 policy_mappings(Config) when is_list(Config) ->
-    run(policy_mappings()).
+    run(policy_mappings_tests()).
 %%-----------------------------------------------------------------------------
-inhibit_policy_mapping(doc) ->    [""];
-inhibit_policy_mapping(suite) -> [];
+inhibit_policy_mapping() ->
+    [{doc,"Not supported yet"}].
 inhibit_policy_mapping(Config) when is_list(Config) ->
-    run(inhibit_policy_mapping()).
+    run(inhibit_policy_mapping_tests()).
 %%-----------------------------------------------------------------------------
-inhibit_any_policy(doc) ->    [""];
-inhibit_any_policy(suite) -> [];
+inhibit_any_policy() ->
+    [{doc,"Not supported yet"}].
 inhibit_any_policy(Config) when is_list(Config) ->
-    run(inhibit_any_policy()).
-%%-----------------------------------------------------------------------------
+    run(inhibit_any_policy_tests()).
+%%-------------------------------name_constraints----------------------------------------------
 
-valid_DN_name_constraints(doc) ->
-    [""];
-valid_DN_name_constraints(suite) ->
-    [];
+valid_DN_name_constraints() ->
+    [{doc, "Name constraints tests"}].
 valid_DN_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.1",  "Valid DN nameConstraints Test1 EE", ok},
 	 { "4.13.4",  "Valid DN nameConstraints Test4 EE", ok},
@@ -511,10 +446,8 @@ valid_DN_name_constraints(Config) when is_list(Config) ->
 	 { "4.13.18", "Valid DN nameConstraints Test18 EE", ok},
 	 { "4.13.19", "Valid DN nameConstraints Test19 EE", ok}]).
 
-invalid_DN_name_constraints(doc) ->
-    [""];
-invalid_DN_name_constraints(suite) ->
-    [];
+invalid_DN_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 invalid_DN_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.2", "Invalid DN nameConstraints Test2 EE", {bad_cert, name_not_permitted}},
 	 { "4.13.3",  "Invalid DN nameConstraints Test3 EE", {bad_cert, name_not_permitted}},
@@ -530,20 +463,15 @@ invalid_DN_name_constraints(Config) when is_list(Config) ->
 	 { "4.13.20", "Invalid DN nameConstraints Test20 EE",
 	   {bad_cert, name_not_permitted}}]).
 
-valid_rfc822_name_constraints(doc) ->
-    [""];
-valid_rfc822_name_constraints(suite) ->
-    [];
+valid_rfc822_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 valid_rfc822_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.21", "Valid RFC822 nameConstraints Test21 EE", ok},
 	 { "4.13.23", "Valid RFC822 nameConstraints Test23 EE", ok},
 	 { "4.13.25", "Valid RFC822 nameConstraints Test25 EE", ok}]).
 
-
-invalid_rfc822_name_constraints(doc) ->
-    [""];
-invalid_rfc822_name_constraints(suite) ->
-    [];
+invalid_rfc822_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 invalid_rfc822_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.22", "Invalid RFC822 nameConstraints Test22 EE",
 	   {bad_cert, name_not_permitted}},
@@ -552,71 +480,54 @@ invalid_rfc822_name_constraints(Config) when is_list(Config) ->
 	 { "4.13.26", "Invalid RFC822 nameConstraints Test26 EE",
 	   {bad_cert, name_not_permitted}}]).
 
-valid_DN_and_rfc822_name_constraints(doc) ->
-    [""];
-valid_DN_and_rfc822_name_constraints(suite) ->
-    [];
+valid_DN_and_rfc822_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 valid_DN_and_rfc822_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.27", "Valid DN and RFC822 nameConstraints Test27 EE", ok}]).
 
-invalid_DN_and_rfc822_name_constraints(doc) ->
-    [""];
-invalid_DN_and_rfc822_name_constraints(suite) ->
-    [];
+invalid_DN_and_rfc822_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 invalid_DN_and_rfc822_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.28", "Invalid DN and RFC822 nameConstraints Test28 EE",
 	   {bad_cert, name_not_permitted}},
 	 { "4.13.29", "Invalid DN and RFC822 nameConstraints Test29 EE",
 	   {bad_cert, name_not_permitted}}]).
 
-valid_dns_name_constraints(doc) ->
-    [""];
-valid_dns_name_constraints(suite) ->
-    [];
+valid_dns_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 valid_dns_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.30", "Valid DNS nameConstraints Test30 EE", ok},
 	 { "4.13.32", "Valid DNS nameConstraints Test32 EE", ok}]).
 
-invalid_dns_name_constraints(doc) ->
-    [""];
-invalid_dns_name_constraints(suite) ->
-    [];
+invalid_dns_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 invalid_dns_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.31", "Invalid DNS nameConstraints Test31 EE", {bad_cert, name_not_permitted}},
 	 { "4.13.33", "Invalid DNS nameConstraints Test33 EE", {bad_cert, name_not_permitted}},
 	 { "4.13.38", "Invalid DNS nameConstraints Test38 EE", {bad_cert, name_not_permitted}}]).
 
-valid_uri_name_constraints(doc) ->
-    [""];
-valid_uri_name_constraints(suite) ->
-    [];
+valid_uri_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 valid_uri_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.34", "Valid URI nameConstraints Test34 EE", ok},
 	 { "4.13.36", "Valid URI nameConstraints Test36 EE", ok}]).
 
-invalid_uri_name_constraints(doc) ->
-    [""];
-invalid_uri_name_constraints(suite) ->
-    [];
+invalid_uri_name_constraints() ->
+    [{doc,"Name constraints tests"}].
 invalid_uri_name_constraints(Config) when is_list(Config) ->
     run([{ "4.13.35", "Invalid URI nameConstraints Test35 EE",{bad_cert, name_not_permitted}},
 	 { "4.13.37", "Invalid URI nameConstraints Test37 EE",{bad_cert, name_not_permitted}}]).
 
-%%-----------------------------------------------------------------------------
-delta_without_crl(doc) ->
-    [""];
-delta_without_crl(suite) ->
-    [];
+%%------------------------------delta_crls-----------------------------------------------
+delta_without_crl() ->
+    [{doc,"Delta CRL tests"}].
 delta_without_crl(Config) when is_list(Config) ->
   run([{ "4.15.1",  "Invalid deltaCRLIndicator No Base Test1 EE",{bad_cert,
 							       revocation_status_undetermined}},
        {"4.15.10", "Invalid delta-CRL Test10 EE", {bad_cert,
 						   revocation_status_undetermined}}]).
-
-valid_delta_crls(doc) ->
-    [""];
-valid_delta_crls(suite) ->
-    [];
+valid_delta_crls() ->
+    [{doc,"Delta CRL tests"}].
 valid_delta_crls(Config) when is_list(Config) ->
     run([{ "4.15.2",  "Valid delta-CRL Test2 EE", ok},
 	 { "4.15.5",  "Valid delta-CRL Test5 EE", ok},
@@ -624,22 +535,17 @@ valid_delta_crls(Config) when is_list(Config) ->
 	 { "4.15.8",  "Valid delta-CRL Test8 EE", ok}
 	]).
 
-invalid_delta_crls(doc) ->
-    [""];
-invalid_delta_crls(suite) ->
-    [];
+invalid_delta_crls() ->
+    [{doc,"Delta CRL tests"}].
 invalid_delta_crls(Config) when is_list(Config) ->
     run([{ "4.15.3",  "Invalid delta-CRL Test3 EE", {bad_cert,{revoked, keyCompromise}}},
 	 { "4.15.4",  "Invalid delta-CRL Test4 EE", {bad_cert,{revoked, keyCompromise}}},
 	 { "4.15.6",  "Invalid delta-CRL Test6 EE", {bad_cert,{revoked, keyCompromise}}},
 	 { "4.15.9",  "Invalid delta-CRL Test9 EE", {bad_cert,{revoked, keyCompromise}}}]).
 
-%%-----------------------------------------------------------------------------
-
-valid_distribution_points(doc) ->
-    [""];
-valid_distribution_points(suite) ->
-    [];
+%%---------------------------distribution_points--------------------------------------------------
+valid_distribution_points() ->
+    [{doc,"CRL Distribution Point tests"}].
 valid_distribution_points(Config) when is_list(Config) ->
     run([{ "4.14.1",  "Valid distributionPoint Test1 EE", ok},
 	 { "4.14.4",  "Valid distributionPoint Test4 EE", ok},
@@ -647,18 +553,14 @@ valid_distribution_points(Config) when is_list(Config) ->
 	 { "4.14.7",  "Valid distributionPoint Test7 EE", ok}
 	]).
 
-valid_distribution_points_no_issuing_distribution_point(doc) ->
-    [""];
-valid_distribution_points_no_issuing_distribution_point(suite) ->
-    [];
+valid_distribution_points_no_issuing_distribution_point() ->
+    [{doc,"CRL Distribution Point tests"}].
 valid_distribution_points_no_issuing_distribution_point(Config) when is_list(Config) ->
-    run([{ "4.14.10", "Valid No issuingDistributionPoint Test10", ok}
+    run([{ "4.14.10", "Valid No issuingDistributionPoint Test10 EE", ok}
 	]).
 
-invalid_distribution_points(doc) ->
-    [""];
-invalid_distribution_points(suite) ->
-    [];
+invalid_distribution_points() ->
+    [{doc,"CRL Distribution Point tests"}].
 invalid_distribution_points(Config) when is_list(Config) ->
     run([{ "4.14.2",  "Invalid distributionPoint Test2 EE", {bad_cert,{revoked, keyCompromise}}},
 	 { "4.14.3",  "Invalid distributionPoint Test3 EE", {bad_cert,
@@ -670,40 +572,31 @@ invalid_distribution_points(Config) when is_list(Config) ->
 							  revocation_status_undetermined}}
 	]).
 
-valid_only_contains(doc) ->
-    [""];
-valid_only_contains(suite) ->
-    [];
+valid_only_contains() ->
+    [{doc,"CRL Distribution Point tests"}].
 valid_only_contains(Config) when is_list(Config) ->
-    run([{ "4.14.13", "Valid onlyContainsCACerts CRL Test13 EE", ok}]).
-
+    run([{ "4.14.13", "Valid only Contains CA Certs Test13 EE", ok}]).
 
-invalid_only_contains(doc) ->
-    [""];
-invalid_only_contains(suite) ->
-    [];
+invalid_only_contains() ->
+    [{doc,"CRL Distribution Point tests"}].
 invalid_only_contains(Config) when is_list(Config) ->
-    run([{ "4.14.11", "Invalid onlyContainsUserCerts CRL Test11 EE",
+    run([{ "4.14.11", "Invalid onlyContainsUserCerts Test11 EE",
 	   {bad_cert, revocation_status_undetermined}},
-	 { "4.14.12", "Invalid onlyContainsCACerts CRL Test12 EE",
+	 { "4.14.12", "Invalid onlyContainsCACerts Test12 EE",
 	   {bad_cert, revocation_status_undetermined}},
 	 { "4.14.14", "Invalid onlyContainsAttributeCerts Test14 EE",
 	   {bad_cert, revocation_status_undetermined}}
 	]).
 
-valid_only_some_reasons(doc) ->
-    [""];
-valid_only_some_reasons(suite) ->
-    [];
+valid_only_some_reasons() ->
+    [{doc,"CRL Distribution Point tests"}].
 valid_only_some_reasons(Config) when is_list(Config) ->
     run([{ "4.14.18", "Valid onlySomeReasons Test18 EE", ok},
 	 { "4.14.19", "Valid onlySomeReasons Test19 EE", ok}
 	]).
 
-invalid_only_some_reasons(doc) ->
-    [""];
-invalid_only_some_reasons(suite) ->
-    [];
+invalid_only_some_reasons() ->
+    [{doc,"CRL Distribution Point tests"}].
 invalid_only_some_reasons(Config) when is_list(Config) ->
     run([{ "4.14.15", "Invalid onlySomeReasons Test15 EE",
 	   {bad_cert,{revoked, keyCompromise}}},
@@ -717,20 +610,16 @@ invalid_only_some_reasons(Config) when is_list(Config) ->
 	   {bad_cert,{revoked, affiliationChanged}}}
 	]).
 
-valid_indirect_crl(doc) ->
-    [""];
-valid_indirect_crl(suite) ->
-    [];
+valid_indirect_crl() ->
+    [{doc,"CRL Distribution Point tests"}].
 valid_indirect_crl(Config) when is_list(Config) ->
     run([{ "4.14.22", "Valid IDP with indirectCRL Test22 EE", ok},
 	 { "4.14.24", "Valid IDP with indirectCRL Test24 EE", ok},
 	 { "4.14.25", "Valid IDP with indirectCRL Test25 EE", ok}
 	]).
 
-invalid_indirect_crl(doc) ->
-    [""];
-invalid_indirect_crl(suite) ->
-    [];
+invalid_indirect_crl() ->
+    [{doc,"CRL Distribution Point tests"}].
 invalid_indirect_crl(Config) when is_list(Config) ->
     run([{ "4.14.23", "Invalid IDP with indirectCRL Test23 EE",
 	   {bad_cert,{revoked, keyCompromise}}},
@@ -738,20 +627,16 @@ invalid_indirect_crl(Config) when is_list(Config) ->
 	   {bad_cert, revocation_status_undetermined}}
 	]).
 
-valid_crl_issuer(doc) ->
-    [""];
-valid_crl_issuer(suite) ->
-    [];
+valid_crl_issuer() ->
+    [{doc,"CRL Distribution Point tests"}].
 valid_crl_issuer(Config) when is_list(Config) ->
-    run([{ "4.14.28", "Valid cRLIssuer Test28 EE", ok}%%,
-	 %%{ "4.14.29", "Valid cRLIssuer Test29 EE", ok},
-	 %%{ "4.14.33", "Valid cRLIssuer Test33 EE", ok}
+    run([{ "4.14.28", "Valid cRLIssuer Test28 EE", ok},
+	 { "4.14.29", "Valid cRLIssuer Test29 EE", ok},
+	 { "4.14.33", "Valid cRLIssuer Test33 EE", ok}
 	]).
 
-invalid_crl_issuer(doc) ->
-    [""];
-invalid_crl_issuer(suite) ->
-    [];
+invalid_crl_issuer() ->
+    [{doc,"CRL Distribution Point tests"}].
 invalid_crl_issuer(Config) when is_list(Config) ->
     run([
 	 { "4.14.27", "Invalid cRLIssuer Test27 EE", {bad_cert, revocation_status_undetermined}},
@@ -761,44 +646,36 @@ invalid_crl_issuer(Config) when is_list(Config) ->
 	 { "4.14.35", "Invalid cRLIssuer Test35 EE", {bad_cert, revocation_status_undetermined}}
 	]).
 
-
-%%distribution_points() ->
-    %%{ "4.14",    "Distribution Points" },
-%%    [
-	 %% Although this test is valid it has a circular dependency. As a result
-	 %% an attempt is made to reursively checks a CRL path and rejected due to
-	 %% a CRL path validation error. PKITS notes suggest this test does not
-	 %% need to be run due to this issue.
-%%	 { "4.14.30", "Valid cRLIssuer Test30", 54 }].
+%% Although this test is valid it has a circular dependency. As a result
+%% an attempt is made to reursively checks a CRL path and rejected due to
+%% a CRL path validation error. PKITS notes suggest this test does not
+%% need to be run due to this issue.
+%%	 { "4.14.30", "Valid cRLIssuer Test30", 54 }
 
 
-%%-----------------------------------------------------------------------------
+%%-------------------------------private_certificate_extensions----------------------------------------------
 
-unknown_critical_extension(doc) ->
-    [""];
-unknown_critical_extension(suite) ->
-    [];
+unknown_critical_extension() ->
+    [{doc,"Test that a cert with an unknown critical extension is recjected"}].
 unknown_critical_extension(Config) when is_list(Config) ->
     run([{ "4.16.2",  "Invalid Unknown Critical Certificate Extension Test2 EE",
 	   {bad_cert,unknown_critical_extension}}]).
 
-unknown_not_critical_extension(doc) ->
-    [""];
-unknown_not_critical_extension(suite) ->
-    [];
+unknown_not_critical_extension() ->
+    [{doc,"Test that a not critical unknown extension is ignored"}].
 unknown_not_critical_extension(Config) when is_list(Config) ->
     run([{ "4.16.1",  "Valid Unknown Not Critical Certificate Extension Test1 EE", ok}]).
 
-%%-----------------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
 run(Tests) ->    
     [TA] = read_certs("Trust Anchor Root Certificate"),
     run(Tests, TA).
 
 run({Chap, Test, Result}, TA) ->
     CertChain = cas(Chap) ++ read_certs(Test),
-    lists:foreach(fun(C) ->
-			  io:format("CERT: ~p~n", [public_key:pkix_decode_cert(C, otp)])
-		  end, CertChain),
     Options = path_validation_options(TA, Chap,Test),
     try public_key:pkix_path_validation(TA, CertChain, Options) of
 	{Result, _} -> ok;
@@ -825,7 +702,7 @@ run([],_) -> ok.
 path_validation_options(TA, Chap, Test) ->
     case needs_crl_options(Chap) of
 	true ->
-	    crl_options(TA, Test);
+	    crl_options(TA, Chap, Test);
 	false ->
 	     Fun =
 		fun(_,{bad_cert, _} = Reason, _) ->
@@ -839,6 +716,56 @@ path_validation_options(TA, Chap, Test) ->
 	    [{verify_fun, {Fun, []}}]
     end.
 
+read_certs(Test) ->
+    File = cert_file(Test),
+    Ders = erl_make_certs:pem_to_der(File),
+    [Cert || {'Certificate', Cert, not_encrypted} <- Ders].
+
+read_crls(Test) ->
+    File = crl_file(Test),
+    Ders = erl_make_certs:pem_to_der(File),
+    [CRL || {'CertificateList', CRL, not_encrypted} <- Ders].
+
+cert_file(Test) ->
+    file(?CONV, lists:append(string:tokens(Test, " -")) ++ ".pem").
+
+crl_file(Test) ->
+    file(?CRL, lists:append(string:tokens(Test, " -")) ++ ".pem").
+
+
+file(Sub,File) ->
+    TestDir = case get(datadir) of
+		  undefined -> "./pkits_SUITE_data";
+		  Dir when is_list(Dir) ->
+		      Dir
+	      end,
+    AbsFile = filename:join([TestDir,Sub,File]),
+    case filelib:is_file(AbsFile) of
+	true -> ok;
+	false ->
+	    ?error("Couldn't read data from ~p ~n",[AbsFile])
+    end,
+    AbsFile.
+
+error(Format, Args, File0, Line) ->
+    File = filename:basename(File0),
+    Pid = group_leader(),
+    Pid ! {failed, File, Line},
+    io:format(Pid, "~s(~p): ERROR"++Format, [File,Line|Args]).
+
+warning(Format, Args, File0, Line) ->
+    File = filename:basename(File0),
+    io:format("~s(~p): Warning "++Format, [File,Line|Args]).
+
+crypto_support_check(Config) ->
+    try crypto:sha256(<<"Test">>) of
+	_ ->
+	    Config
+    catch error:notsup ->
+	    crypto:stop(),
+	    {skip, "To old version of openssl"}
+    end.
+
 needs_crl_options("4.4" ++ _) ->
     true;
 needs_crl_options("4.5" ++ _) ->
@@ -854,54 +781,69 @@ needs_crl_options("4.15" ++ _) ->
 needs_crl_options(_) ->
     false.
 
-crl_options(TA, Test) ->
-     case read_crls(Test) of
-	[] ->
-	    [];
-        CRLs ->
-	    Fun =
-		 fun(_,{bad_cert, _} = Reason, _) ->
-			 {fail, Reason};
-		   (_,{extension,
-		       #'Extension'{extnID = ?'id-ce-cRLDistributionPoints',
-				    extnValue = Value}}, UserState0) ->
-			UserState = update_crls(Value, UserState0),
+crl_options(_TA, Chap, _Test) ->
+    CRLNames = crl_names(Chap),
+    CRLs = crls(CRLNames),
+    Paths = lists:map(fun(CRLName) -> crl_path(CRLName) end, CRLNames),
+
+    ct:print("Paths ~p ~n  Names ~p ~n", [Paths, CRLNames]),
+    Fun =
+	fun(_,{bad_cert, _} = Reason, _) ->
+		{fail, Reason};
+	   (_,{extension,
+	       #'Extension'{extnID = ?'id-ce-cRLDistributionPoints',
+			    extnValue = Value}}, UserState0) ->
+		UserState = update_crls(Value, UserState0),
+		{valid, UserState};
+	   (_,{extension, _}, UserState) ->
+		{unknown, UserState};
+	   (OtpCert, Valid, UserState) when Valid == valid;
+					    Valid == valid_peer ->
+		DerCRLs = UserState#verify_state.crls,
+		Paths =  UserState#verify_state.crl_paths,
+		Crls = [{DerCRL, public_key:der_decode('CertificateList',
+						       DerCRL)} || DerCRL <- DerCRLs],
+
+		CRLInfo0 = crl_info(OtpCert, Crls, []),
+		CRLInfo = lists:reverse(CRLInfo0),
+		PathDb = crl_path_db(lists:reverse(Crls), Paths, []),
+
+		Fun = fun(DP, CRLtoValidate, Id, PathDb0) ->
+			      trusted_cert_and_path(DP, CRLtoValidate, Id, PathDb0)
+		      end,
+
+		case CRLInfo of
+		    [] ->
 			{valid, UserState};
-		   (_,{extension, _}, UserState) ->
-			{unknown, UserState};
-		   (OtpCert, Valid, UserState) when Valid == valid;
-						    Valid == valid_peer ->
-			{ErlCerts, CRLs} = UserState#verify_state.crl_info,
-			CRLInfo0 =
-			    crl_info(OtpCert,
-				     ErlCerts,[{DerCRL, public_key:der_decode('CertificateList',
-									      DerCRL)} || DerCRL <- CRLs],
-				     []),
-			CRLInfo = lists:reverse(CRLInfo0),
-			Certs = UserState#verify_state.certs_db,
-			Fun = fun(DP, CRLtoValidate, Id, CertsDb) ->
-				      trusted_cert_and_path(DP, CRLtoValidate, Id, CertsDb)
-			      end,
-			Ignore = ignore_sign_test_when_building_path(Test),
+		    [_|_] ->
 			case public_key:pkix_crls_validate(OtpCert, CRLInfo,
-							   [{issuer_fun,{Fun, {Ignore, Certs}}}]) of
+							   [{issuer_fun,{Fun, PathDb}}]) of
 			    valid ->
 				{valid, UserState};
 			    Reason  ->
 				{fail, Reason}
 			end
-		end,
+		end
+	end,
 
-	    Certs = read_certs(Test),
-	    ErlCerts = [public_key:pkix_decode_cert(Cert, otp) || Cert <- Certs],
+    [{verify_fun, {Fun, #verify_state{crls = CRLs,
+				      crl_paths = Paths}}}].
 
-	    [{verify_fun, {Fun, #verify_state{certs_db = [TA| Certs],
-					      crl_info = {ErlCerts, CRLs}}}}]
-    end.
+crl_path_db([], [], Acc) ->
+    Acc;
+crl_path_db([{_, CRL} |CRLs], [Path | Paths], Acc) ->
+    CertPath = lists:flatten(lists:map(fun([]) ->
+					       [];
+					  (CertFile) ->
+					       ct:print("Certfile ~p", [CertFile]),
+					       read_certs(CertFile)
+				       end, Path)),
+    crl_path_db(CRLs, Paths, [{CRL, CertPath}| Acc]).
 
-crl_info(_, _, [], Acc) ->
+
+crl_info(_, [], Acc) ->
     Acc;
-crl_info(OtpCert, Certs, [{_, #'CertificateList'{tbsCertList =
+crl_info(OtpCert, [{_, #'CertificateList'{tbsCertList =
 						     #'TBSCertList'{issuer = Issuer,
 								    crlExtensions = CRLExtensions}}}
 				= CRL | Rest], Acc) ->
@@ -910,22 +852,36 @@ crl_info(OtpCert, Certs, [{_, #'CertificateList'{tbsCertList =
     ExtList = pubkey_cert:extensions_list(CRLExtensions),
     DPs  = case pubkey_cert:select_extension(?'id-ce-cRLDistributionPoints', Extensions) of
 	      #'Extension'{extnValue = Value} ->
-		   lists:map(fun(Point) -> pubkey_cert_records:transform(Point, decode) end, Value);
-	      _ ->
-		  case same_issuer(OtpCert, Issuer) of
-		      true ->
-			  [make_dp(ExtList, asn1_NOVALUE, Issuer)];
-		      false ->
-			  [make_dp(ExtList, Issuer, ignore)]
-		  end
+		   lists:foldl(fun(Point, Acc0) ->
+				       Dp = pubkey_cert_records:transform(Point, decode),
+				       IDP = pubkey_cert:select_extension(?'id-ce-issuingDistributionPoint',
+									  Extensions),
+				       case Dp#'DistributionPoint'.cRLIssuer of
+					   asn1_NOVALUE ->
+					       [Dp | Acc0];
+					   DpCRLIssuer ->
+					       CRLIssuer = dp_crlissuer_to_issuer(DpCRLIssuer),
+					       CertIssuer =  OtpTBSCert#'OTPTBSCertificate'.issuer,
+					       case  pubkey_cert:is_issuer(CRLIssuer, CertIssuer) of
+						   true ->
+						       [Dp | Acc0];
+						   false when (IDP =/= undefined) ->
+						       Acc0;
+						   false ->
+						       [Dp | Acc0]
+					       end
+				       end
+			       end, [], Value);
+	       _ ->
+		   case same_issuer(OtpCert, Issuer) of
+		       true ->
+			   [make_dp(ExtList, asn1_NOVALUE, Issuer)];
+		       false ->
+			   [make_dp(ExtList, Issuer, ignore)]
+		   end
 	   end,
     DPsCRLs = lists:map(fun(DP) -> {DP, CRL} end, DPs),
-    crl_info(OtpCert, Certs, Rest, DPsCRLs ++ Acc).
-
-ignore_sign_test_when_building_path("Invalid Bad CRL Signature Test4") ->
-    true;
-ignore_sign_test_when_building_path(_) ->
-    false.
+    crl_info(OtpCert, Rest, DPsCRLs ++ Acc).
 
 same_issuer(OTPCert, Issuer) ->
     DecIssuer = pubkey_cert_records:transform(Issuer, decode),
@@ -957,200 +913,23 @@ mk_issuer_dp(Issuer, _) ->
 update_crls(_, State) ->
     State.
 
-trusted_cert_and_path(DP, CRL, Id, {Ignore, CertsList}) ->
-    case crl_issuer(crl_issuer_name(DP), CRL, Id, CertsList, CertsList, Ignore) of
-	{ok, IssuerCert, DerIssuerCert} ->
-	    Certs = [{public_key:pkix_decode_cert(Cert, otp), Cert} || Cert <- CertsList],
-	    CertChain = build_chain(Certs, Certs, IssuerCert, Ignore, [DerIssuerCert]),
-	    {ok, public_key:pkix_decode_cert(hd(CertChain), otp), CertChain};
-	Other ->
-	    Other
-    end.
-
-crl_issuer_name(#'DistributionPoint'{cRLIssuer = asn1_NOVALUE}) ->
-    undefined;
-crl_issuer_name(#'DistributionPoint'{cRLIssuer = [{directoryName, Issuer}]}) ->
-    pubkey_cert_records:transform(Issuer, decode).
+trusted_cert_and_path(_, #'CertificateList'{} = CRL, _, PathDb) ->
+    [TrustedDERCert] =  read_certs(crl_root_cert()),
+    TrustedCert =  public_key:pkix_decode_cert(TrustedDERCert, otp),
 
-build_chain([],_, _, _,Acc) ->
-    Acc;
-
-build_chain([{First, DerFirst}|Certs], All, Cert, Ignore, Acc) ->
-    case public_key:pkix_is_self_signed(Cert) andalso is_test_root(Cert) of
-	true ->
-	    Acc;
-	false ->
-	    case public_key:pkix_is_issuer(Cert, First)
-		%%andalso check_extension_cert_signer(First)
-		andalso is_signer(First, Cert, Ignore)
-	    of
-		true ->
-		    build_chain(All, All, First, Ignore, [DerFirst | Acc]);
-		false ->
-		    build_chain(Certs, All, Cert, Ignore, Acc)
-	    end
-    end.
-
-is_signer(_,_, true) ->
-    true;
-is_signer(Signer, #'OTPCertificate'{} = Cert,_) ->
-    TBSCert = Signer#'OTPCertificate'.tbsCertificate,
-    PublicKeyInfo = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-    PublicKey = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.subjectPublicKey,
-    AlgInfo = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.algorithm,
-    PublicKeyParams = AlgInfo#'PublicKeyAlgorithm'.parameters,
-    try pubkey_cert:validate_signature(Cert, public_key:pkix_encode('OTPCertificate',
-								Cert, otp),
-				   PublicKey, PublicKeyParams, true, ?DEFAULT_VERIFYFUN) of
-	true ->
-	    true
-    catch
-	_:_ ->
-	    false
-    end;
-is_signer(Signer, #'CertificateList'{} = CRL, _) ->
-    TBSCert = Signer#'OTPCertificate'.tbsCertificate,
-    PublicKeyInfo = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-    PublicKey = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.subjectPublicKey,
-    AlgInfo = PublicKeyInfo#'OTPSubjectPublicKeyInfo'.algorithm,
-    PublicKeyParams = AlgInfo#'PublicKeyAlgorithm'.parameters,
-    pubkey_crl:verify_crl_signature(CRL, public_key:pkix_encode('CertificateList',
-								CRL, plain),
-				    PublicKey, PublicKeyParams).
-
-is_test_root(OtpCert) ->
-    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
-    {rdnSequence, AtterList} = TBSCert#'OTPTBSCertificate'.issuer,
-    lists:member([{'AttributeTypeAndValue',{2,5,4,3},{printableString,"Trust Anchor"}}],
-			AtterList).
-
-check_extension_cert_signer(OtpCert) ->
-    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
-     Extensions = TBSCert#'OTPTBSCertificate'.extensions,
-     case pubkey_cert:select_extension(?'id-ce-keyUsage', Extensions) of
-	#'Extension'{extnValue = KeyUse} ->
-	     lists:member(keyCertSign, KeyUse);
-	 _ ->
-	     true
-    end.
-
-check_extension_crl_signer(OtpCert) ->
-    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
-     Extensions = TBSCert#'OTPTBSCertificate'.extensions,
-     case pubkey_cert:select_extension(?'id-ce-keyUsage', Extensions) of
-	#'Extension'{extnValue = KeyUse} ->
-	     lists:member(cRLSign, KeyUse);
-	 _ ->
-	     true
+    case lists:keysearch(CRL, 1, PathDb) of
+	{_, {CRL, [ _| _] = Path}} ->
+		      {ok, TrustedCert, [TrustedDERCert | Path]};
+	{_, {CRL, []}} ->
+	    {ok, TrustedCert, [TrustedDERCert]}
     end.
 
-crl_issuer(undefined, CRL, issuer_not_found, _, CertsList, Ignore) ->
-    crl_issuer(CRL, CertsList, Ignore);
-
-crl_issuer(IssuerName, CRL, issuer_not_found, CertsList, CertsList, Ignore) ->
-    crl_issuer(IssuerName, CRL, IssuerName, CertsList, CertsList, Ignore);
-
-crl_issuer(undefined, CRL, Id, [Cert | Rest], All, false) ->
-    ErlCert = public_key:pkix_decode_cert(Cert, otp),
-    TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
-    SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber,
-    Issuer = public_key:pkix_normalize_name(
-		    TBSCertificate#'OTPTBSCertificate'.subject),
-    Bool = is_signer(ErlCert, CRL, false),
-    case {SerialNumber, Issuer} of
-	Id when Bool == true ->
-	    {ok, ErlCert, Cert};
-	_ ->
-	    crl_issuer(undefined, CRL, Id, Rest, All, false)
-    end;
-
-crl_issuer(IssuerName, CRL, Id, [Cert | Rest], All, false) ->
-    ErlCert = public_key:pkix_decode_cert(Cert, otp),
-    TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
-    SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber,
-    %%Issuer = public_key:pkix_normalize_name(
-    %%		    TBSCertificate#'OTPTBSCertificate'.subject),
-    Bool = is_signer(ErlCert, CRL, false),
-    case {SerialNumber, IssuerName} of
-	Id when Bool == true ->
-	    {ok, ErlCert, Cert};
-	{_, IssuerName}  when Bool == true ->
-	    {ok, ErlCert, Cert};
-	_ ->
-	    crl_issuer(IssuerName, CRL, Id, Rest, All, false)
-    end;
-
-crl_issuer(undefined, CRL, _, [], CertsList, Ignore) ->
-    crl_issuer(CRL, CertsList, Ignore);
-crl_issuer(CRLName, CRL, _, [], CertsList, Ignore) ->
-    crl_issuer(CRLName, CRL, CertsList, Ignore).
-
-
-crl_issuer(_, [],_) ->
-    {error, issuer_not_found};
-crl_issuer(CRL, [Cert | Rest], Ignore) ->
-    ErlCert = public_key:pkix_decode_cert(Cert, otp),
-    case public_key:pkix_is_issuer(CRL, ErlCert) andalso
-	check_extension_crl_signer(ErlCert) andalso
-	is_signer(ErlCert, CRL, Ignore)
-    of
-        true ->
-	    {ok, ErlCert,Cert};
-        false ->
-            crl_issuer(CRL, Rest, Ignore)
-    end.
-
-crl_issuer(_,_, [],_) ->
-    {error, issuer_not_found};
-crl_issuer(IssuerName, CRL, [Cert | Rest], Ignore) ->
-    ErlCert = public_key:pkix_decode_cert(Cert, otp),
-    TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
-    Issuer = public_key:pkix_normalize_name(
-		    TBSCertificate#'OTPTBSCertificate'.subject),
-
-    case
-	public_key:pkix_is_issuer(CRL, ErlCert) andalso
-	check_extension_crl_signer(ErlCert) andalso
-	is_signer(ErlCert, CRL, Ignore)
-    of
-        true ->
-	    case  pubkey_cert:is_issuer(Issuer, IssuerName) of
-		true ->
-		    {ok, ErlCert,Cert};
-		false ->
-		    crl_issuer(IssuerName, CRL, Rest, Ignore)
-	    end;
-	false ->
-            crl_issuer(IssuerName, CRL, Rest, Ignore)
-    end.
-
-read_certs(Test) ->
-    File = test_file(Test),
-    Ders = erl_make_certs:pem_to_der(File),
-    [Cert || {'Certificate', Cert, not_encrypted} <- Ders].
-
-read_crls(Test) ->
-    File = test_file(Test),
-    Ders = erl_make_certs:pem_to_der(File),
-    [CRL || {'CertificateList', CRL, not_encrypted} <- Ders].
 
-test_file(Test) ->
-    io:format("TEST: ~p~n", [Test]),
-    file(?CONV, lists:append(string:tokens(Test, " -")) ++ ".pem").
+dp_crlissuer_to_issuer(DPCRLIssuer) ->
+    [{directoryName, Issuer}] = pubkey_cert_records:transform(DPCRLIssuer, decode),
+    Issuer.
 
-file(Sub,File) ->
-    TestDir = case get(datadir) of
-		  undefined -> "./pkits_SUITE_data";
-		  Dir when is_list(Dir) ->
-		      Dir
-	      end,
-    AbsFile = filename:join([TestDir,Sub,File]),
-    case filelib:is_file(AbsFile) of
-	true -> ok;
-	false ->
-	    ?error("Couldn't read data from ~p ~n",[AbsFile])
-    end,
-    AbsFile.
+%%%%%%%%%%%%%%% CA mappings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 cas(Chap) ->
     CAS = intermidiate_cas(Chap),
@@ -1242,17 +1021,15 @@ intermidiate_cas(Chap) when Chap == "4.6.2" ->
 intermidiate_cas(Chap) when Chap == "4.6.3" ->
     ["basicConstraints Not Critical cA False CA Cert"];
 
-intermidiate_cas(Chap) when Chap == "4.5.2";
-			    Chap == "4.5.5" ->
-    ["Basic Self-Issued New Key CA Cert"];
-
-intermidiate_cas(Chap) when Chap == "4.5.1" ->
+intermidiate_cas(Chap) when Chap == "4.5.1";
+			    Chap == "4.5.2" ->
     ["Basic Self-Issued New Key OldWithNew CA Cert", "Basic Self-Issued New Key CA Cert"];
 
 intermidiate_cas(Chap) when	Chap == "4.5.3" ->
     ["Basic Self-Issued Old Key NewWithOld CA Cert", "Basic Self-Issued Old Key CA Cert"];
 
-intermidiate_cas(Chap) when Chap == "4.5.4" ->
+intermidiate_cas(Chap) when Chap == "4.5.4";
+			    Chap == "4.5.5" ->
     ["Basic Self-Issued Old Key CA Cert"];
 
 intermidiate_cas(Chap) when Chap == "4.13.1"; 
@@ -1301,9 +1078,6 @@ intermidiate_cas(Chap) when Chap == "4.13.19" ->
     ["nameConstraints DN1 Self-Issued CA Cert",
      "nameConstraints DN1 CA Cert"];
 
-intermidiate_cas(Chap) when Chap == "4.5.6" ->
-    ["Basic Self-Issued CRL Signing Key CA Cert"];
-
 intermidiate_cas(Chap) when Chap == "4.7.1";
 			    Chap == "4.7.4" -> 
     ["keyUsage Critical keyCertSign False CA Cert"];
@@ -1387,29 +1161,349 @@ intermidiate_cas(Chap) when Chap == "4.6.16" ->
      "pathLenConstraint0 Self-Issued CA Cert",
      "pathLenConstraint0 CA Cert"];
 
-intermidiate_cas(Chap) when Chap == "4.5.7";
-			    Chap == "4.5.8"
-			    ->
-    ["Basic Self-Issued CRL Signing Key CRL Cert", 
-     "Basic Self-Issued CRL Signing Key CA Cert"].
+intermidiate_cas(Chap) when Chap == "4.4.1" ->
+    ["No CRL CA Cert"];
 
-error(Format, Args, File0, Line) ->
-    File = filename:basename(File0),
-    Pid = group_leader(),
-    Pid ! {failed, File, Line},
-    io:format(Pid, "~s(~p): ERROR"++Format, [File,Line|Args]).
+intermidiate_cas(Chap) when Chap == "4.4.2" ->
+    ["Revoked subCA Cert", "Good CA Cert"];
 
-warning(Format, Args, File0, Line) ->
-    File = filename:basename(File0),
-    io:format("~s(~p): Warning "++Format, [File,Line|Args]).
+intermidiate_cas(Chap) when Chap == "4.4.3" ->
+    ["Good CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.4" ->
+    ["Bad CRL Signature CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.5" ->
+    ["Bad CRL Issuer Name CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.6" ->
+    ["Wrong CRL CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.7" ->
+    ["Two CRLs CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.8" ->
+    ["Unknown CRL Entry Extension CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.9";
+			    Chap == "4.4.10" ->
+    ["Unknown CRL Extension CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.11" ->
+    ["Old CRL nextUpdate CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.12" ->
+    ["pre2000 CRL nextUpdate CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.13" ->
+    ["GeneralizedTime CRL nextUpdate CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.14";
+			    Chap == "4.4.15" ->
+    ["Negative Serial Number CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.16";
+			    Chap == "4.4.17";
+			    Chap == "4.4.18" ->
+    ["Long Serial Number CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.19";
+			    Chap == "4.4.20" ->
+    ["Separate Certificate and CRL Keys Certificate Signing CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.4.21" ->
+    ["Separate Certificate and CRL Keys CA2 Certificate Signing CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.1";
+			    Chap == "4.14.2";
+			    Chap == "4.14.3";
+			    Chap == "4.14.4" ->
+    ["distributionPoint1 CA Cert"];
+intermidiate_cas(Chap) when Chap == "4.14.5";
+			    Chap == "4.14.6";
+			    Chap == "4.14.7";
+			    Chap == "4.14.8";
+			    Chap == "4.14.9" ->
+    ["distributionPoint2 CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.10" ->
+    ["No issuingDistributionPoint CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.11" ->
+    ["onlyContainsUserCerts CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.12";
+			    Chap == "4.14.13" ->
+    ["onlyContainsCACerts CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.14" ->
+    ["onlyContainsAttributeCerts CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.15";
+			    Chap == "4.14.16" ->
+    ["onlySomeReasons CA1 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.17" ->
+    ["onlySomeReasons CA2 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.18" ->
+    ["onlySomeReasons CA3 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.19";
+			    Chap == "4.14.20";
+			    Chap == "4.14.21" ->
+    ["onlySomeReasons CA4 Cert"];
 
+intermidiate_cas(Chap) when Chap == "4.14.22";
+			    Chap == "4.14.23" ->
+    ["indirectCRL CA1 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.24";
+			    Chap == "4.14.25";
+			    Chap == "4.14.26" ->
+    ["indirectCRL CA2 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.27" ->
+    ["indirectCRL CA2 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.28";
+			    Chap == "4.14.29" ->
+    ["indirectCRL CA3 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.31";
+			    Chap == "4.14.32";
+			    Chap == "4.14.33" ->
+    ["indirectCRL CA6 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.14.34";
+			    Chap == "4.14.35" ->
+    ["indirectCRL CA5 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.15.1" ->
+    ["deltaCRLIndicator No Base CA Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.15.2";
+			    Chap == "4.15.3";
+			    Chap == "4.15.4";
+			    Chap == "4.15.5";
+			    Chap == "4.15.6";
+			    Chap == "4.15.7" ->
+    ["deltaCRL CA1 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.15.8";
+			    Chap == "4.15.9" ->
+    ["deltaCRL CA2 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.15.10" ->
+    ["deltaCRL CA3 Cert"];
+
+intermidiate_cas(Chap) when Chap == "4.5.6";
+			    Chap == "4.5.7" ->
+    ["Basic Self-Issued CRL Signing Key CA Cert"];
+intermidiate_cas(Chap) when Chap == "4.5.8" ->
+    ["Basic Self-Issued CRL Signing Key CRL Cert"].
+
+
+%%%%%%%%%%%%%%% CRL mappings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+crl_names("4.4.1") ->
+    ["Trust Anchor Root CRL"];
+crl_names("4.4.2") ->
+    ["Trust Anchor Root CRL", "Good CA CRL", "Revoked subCA CRL"];
+crl_names("4.4.3") ->
+    ["Trust Anchor Root CRL", "Good CA CRL", "Revoked subCA CRL"];
+crl_names("4.4.4") ->
+     ["Trust Anchor Root CRL", "Bad CRL Signature CA CRL"];
+crl_names("4.4.5") ->
+      ["Trust Anchor Root CRL", "Bad CRL Issuer Name CA CRL"];
+crl_names("4.4.6") ->
+     ["Trust Anchor Root CRL", "Wrong CRL CA CRL"];
+crl_names("4.4.7") ->
+   ["Trust Anchor Root CRL", "Two CRLs CA Good CRL", "Two CRLs CA Bad CRL"];
+crl_names("4.4.8") ->
+   ["Trust Anchor Root CRL", "Unknown CRL Entry Extension CA CRL"];
+crl_names(Chap) when Chap == "4.4.9";
+		Chap == "4.4.10"->
+   ["Trust Anchor Root CRL", "Unknown CRL Extension CA CRL"];
+crl_names("4.4.11") ->
+   ["Trust Anchor Root CRL", "Old CRL nextUpdate CA CRL"];
+crl_names("4.4.12") ->
+   ["Trust Anchor Root CRL", "pre2000 CRL nextUpdate CA CRL"];
+crl_names("4.4.13") ->
+   ["Trust Anchor Root CRL", "GeneralizedTime CRL nextUpdate CA CRL"];
+crl_names(Chap) when Chap == "4.4.14";
+		Chap == "4.4.15"->
+    ["Trust Anchor Root CRL", "Negative Serial Number CA CRL"];
+crl_names(Chap) when Chap == "4.4.16";
+		Chap == "4.4.17";
+		Chap == "4.4.18" ->
+    ["Trust Anchor Root CRL", "Long Serial Number CA CRL"];
+crl_names(Chap)when Chap == "4.4.19";
+	       Chap == "4.4.20" ->
+    ["Trust Anchor Root CRL", "Separate Certificate and CRL Keys CRL"];
+crl_names("4.4.21") ->
+   ["Trust Anchor Root CRL", "Separate Certificate and CRL Keys CA2 CRL"];
+crl_names(Chap) when Chap == "4.5.1";
+		     Chap == "4.5.2"->
+   ["Trust Anchor Root CRL", "Basic Self-Issued New Key CA CRL"];
+crl_names(Chap) when Chap == "4.5.3";
+		Chap == "4.5.4";
+		Chap == "4.5.5" ->
+   ["Trust Anchor Root CRL", "Basic Self-Issued Old Key Self-Issued Cert CRL",
+    "Basic Self-Issued Old Key CA CRL"];
+crl_names(Chap) when  Chap == "4.5.6";
+		      Chap == "4.5.7";
+		      Chap == "4.5.8" ->
+   ["Trust Anchor Root CRL", "Basic Self-Issued CRL Signing Key CRL Cert CRL",
+	"Basic Self-Issued CRL Signing Key CA CRL"
+   ];
+crl_names("4.7.4") ->
+   ["Trust Anchor Root CRL", "keyUsage Critical cRLSign False CA CRL"];
+crl_names("4.7.5") ->
+   ["Trust Anchor Root CRL", "keyUsage Not Critical cRLSign False CA CRL"];
+crl_names(Chap) when Chap == "4.14.1";
+		Chap == "4.14.2";
+		Chap == "4.14.3";
+		Chap == "4.14.4" ->
+    ["Trust Anchor Root CRL", "distributionPoint1 CA CRL"];
+crl_names(Chap) when Chap == "4.14.5";
+		Chap == "4.14.6";
+		Chap == "4.14.7";
+		Chap == "4.14.8";
+		Chap == "4.14.9" ->
+    ["Trust Anchor Root CRL", "distributionPoint2 CA CRL"];
+crl_names("4.14.10") ->
+   ["Trust Anchor Root CRL", "No issuingDistributionPoint CA CRL"];
+crl_names("4.14.11") ->
+   ["Trust Anchor Root CRL", "onlyContainsUserCerts CA CRL"];
+crl_names(Chap) when Chap == "4.14.12";
+		Chap == "4.14.13" ->
+    ["Trust Anchor Root CRL", "onlyContainsCACerts CA CRL"];
+crl_names("4.14.14") ->
+    ["Trust Anchor Root CRL", "onlyContainsAttributeCerts CA CRL"];
+crl_names(Chap) when Chap == "4.14.15";
+		Chap == "4.14.16" ->
+   ["Trust Anchor Root CRL", "onlySomeReasons CA1 compromise CRL",
+    "onlySomeReasons CA1 other reasons CRL"];
+crl_names("4.14.17") ->
+   ["Trust Anchor Root CRL",
+    "onlySomeReasons CA2 CRL1", "onlySomeReasons CA2 CRL2"];
+crl_names("4.14.18") ->
+   ["Trust Anchor Root CRL",
+    "onlySomeReasons CA3 compromise CRL", "onlySomeReasons CA3 other reasons CRL"];
+crl_names(Chap) when Chap == "4.14.19";
+		Chap == "4.14.20";
+		Chap == "4.14.21" ->
+   ["Trust Anchor Root CRL", "onlySomeReasons CA4 compromise CRL",
+    "onlySomeReasons CA4 other reasons CRL"];
+crl_names(Chap) when Chap == "4.14.22";
+		Chap == "4.14.23";
+		Chap == "4.14.24";
+		Chap == "4.14.25";
+		Chap == "4.14.26" ->
+   ["Trust Anchor Root CRL", "indirectCRL CA1 CRL"];
+crl_names("4.14.27") ->
+   ["Trust Anchor Root CRL", "Good CA CRL"];
+
+crl_names(Chap) when Chap == "4.14.28";
+		     Chap == "4.14.29" ->
+    ["Trust Anchor Root CRL", "indirectCRL CA3 CRL", "indirectCRL CA3 cRLIssuer CRL"];
+crl_names("4.14.30") ->
+   ["Trust Anchor Root CRL", "indirectCRL CA4 cRLIssuer CRL"];
+crl_names(Chap) when Chap == "4.14.31";
+		Chap == "4.14.32";
+		Chap == "4.14.33";
+		Chap == "4.14.34";
+		Chap == "4.14.35" ->
+   ["Trust Anchor Root CRL", "indirectCRL CA5 CRL"];
+crl_names("4.15.1") ->
+   ["Trust Anchor Root CRL", "deltaCRLIndicator No Base CA CRL"];
+crl_names(Chap)  when Chap == "4.15.2";
+		 Chap == "4.15.3";
+		 Chap == "4.15.4";
+		 Chap == "4.15.5";
+		 Chap == "4.15.6";
+		 Chap == "4.15.7" ->
+    ["Trust Anchor Root CRL", "deltaCRL CA1 CRL", "deltaCRL CA1 deltaCRL"];
+crl_names(Chap) when Chap == "4.15.8";
+		Chap == "4.15.9" ->
+   ["Trust Anchor Root CRL", "deltaCRL CA2 CRL", "deltaCRL CA2 deltaCRL"];
+crl_names("4.15.10") ->
+    ["Trust Anchor Root CRL", "deltaCRL CA3 CRL", "deltaCRL CA3 deltaCRL"].
+
+crl_root_cert() ->
+    "Trust Anchor Root Certificate".
+
+crl_path("Trust Anchor Root CRL") ->
+    []; %% Signed directly by crl_root_cert
+crl_path("Revoked subCA CRL") ->
+    ["Good CA Cert", "Revoked subCA Cert"];
+crl_path("indirectCRL CA3 cRLIssuer CRL") ->
+    ["indirectCRL CA3 Cert", "indirectCRL CA3 cRLIssuer Cert"];
+crl_path("Two CRLs CA Good CRL") ->
+    ["Two CRLs CA Cert"];
+crl_path("Two CRLs CA Bad CRL") ->
+    ["Two CRLs CA Cert"];
+crl_path("Separate Certificate and CRL Keys CRL") ->
+    ["Separate Certificate and CRL Keys CRL Signing Cert"];
+crl_path("Separate Certificate and CRL Keys CA2 CRL") ->
+    ["Separate Certificate and CRL Keys CA2 CRL Signing Cert"];
+crl_path("Basic Self-Issued Old Key Self-Issued Cert CRL") ->
+    ["Basic Self-Issued Old Key CA Cert"];
+crl_path("Basic Self-Issued Old Key CA CRL") ->
+      ["Basic Self-Issued Old Key CA Cert", "Basic Self-Issued Old Key NewWithOld CA Cert"];
+
+crl_path("Basic Self-Issued CRL Signing Key CRL Cert CRL") ->
+    ["Basic Self-Issued CRL Signing Key CA Cert"];
+crl_path("Basic Self-Issued CRL Signing Key CA CRL") ->
+    ["Basic Self-Issued CRL Signing Key CA Cert", "Basic Self-Issued CRL Signing Key CRL Cert"];
+
+crl_path("onlySomeReasons CA1 compromise CRL") ->
+    ["onlySomeReasons CA1 Cert"];
+crl_path("onlySomeReasons CA1 other reasons CRL") ->
+    ["onlySomeReasons CA1 Cert"];
+crl_path("onlySomeReasons CA3 other reasons CRL") ->
+    ["onlySomeReasons CA3 Cert"];
+crl_path("onlySomeReasons CA3 compromise CRL") ->
+    ["onlySomeReasons CA3 Cert"];
+crl_path("onlySomeReasons CA4 compromise CRL") ->
+    ["onlySomeReasons CA4 Cert"];
+crl_path("onlySomeReasons CA4 other reasons CRL") ->
+    ["onlySomeReasons CA4 Cert"];
+crl_path("Basic Self-Issued New Key CA CRL") ->
+    ["Basic Self-Issued New Key CA Cert"];
+crl_path("deltaCRL CA1 deltaCRL") ->
+    crl_path("deltaCRL CA2 CRL");
+crl_path("deltaCRL CA2 deltaCRL") ->
+    crl_path("deltaCRL CA2 CRL");
+crl_path("deltaCRL CA3 deltaCRL") ->
+    crl_path("deltaCRL CA3 CRL");
+crl_path(CRL) when CRL == "onlySomeReasons CA2 CRL1";
+		   CRL == "onlySomeReasons CA2 CRL2" ->
+    ["onlySomeReasons CA2 Cert"];
+
+crl_path(CRL) ->
+    L = length(CRL),
+    Base = string:sub_string(CRL, 1, L -3),
+    [Base ++ "Cert"].
+
+crls(CRLS) ->
+     lists:foldl(fun([], Acc) ->
+			Acc;
+		   (CRLFile, Acc) ->
+			[CRL] = read_crls(CRLFile),
+			[CRL | Acc]
+		end, [], CRLS).
+
+
+%% TODO: If we implement policy support
 %% Certificate policy tests need special handling. They can have several
 %% sub tests and we need to check the outputs are correct.
 
-certificate_policies() ->
+certificate_policies_tests() ->
     %%{ "4.8", "Certificate Policies" },
     [{"4.8.1.1", "All Certificates Same Policy Test1", "-policy anyPolicy -explicit_policy", "True", ?NIST1, ?NIST1, 0},
-     {"4.8.1.2", "All Certificates Same Policy Test1", "-policy ?NIST1 -explicit_policy", "True", ?NIST1, ?NIST1, 0},
+     {"4.8.1.2", "All Certificates Same Policy Test1", "-policy ?NIST1BasicSelfIssuedCRLSigningKeyCACert.pem -explicit_policy", "True", ?NIST1, ?NIST1, 0},
      {"4.8.1.3", "All Certificates Same Policy Test1", "-policy ?NIST2 -explicit_policy", "True", ?NIST1, "<empty>", 43},
      {"4.8.1.4", "All Certificates Same Policy Test1", "-policy ?NIST1 -policy ?NIST2 -explicit_policy", "True", ?NIST1, ?NIST1, 0},
      {"4.8.2.1", "All Certificates No Policies Test2", "-policy anyPolicy", "False", "<empty>", "<empty>", 0},
@@ -1443,7 +1537,7 @@ certificate_policies() ->
      {"4.8.18.2", "User Notice Qualifier Test18", "-policy ?NIST2", "True", "?NIST1:?NIST2", "?NIST2", 0},
      {"4.8.19", "User Notice Qualifier Test19", "-policy anyPolicy", "False", "?NIST1", "?NIST1", 0},
      {"4.8.20", "CPS Pointer Qualifier Test20", "-policy anyPolicy -explicit_policy", "True", "?NIST1", "?NIST1", 0}].
-require_explicit_policy() ->
+require_explicit_policy_tests() ->
     %%{ "4.9", "Require Explicit Policy" },
     [{"4.9.1", "Valid RequireExplicitPolicy Test1", "-policy anyPolicy", "False", "<empty>", "<empty>", 0},
      {"4.9.2", "Valid RequireExplicitPolicy Test2", "-policy anyPolicy", "False", "<empty>", "<empty>", 0},
@@ -1453,7 +1547,7 @@ require_explicit_policy() ->
      {"4.9.6", "Valid Self-Issued requireExplicitPolicy Test6", "-policy anyPolicy", "False", "<empty>", "<empty>", 0},
      {"4.9.7", "Invalid Self-Issued requireExplicitPolicy Test7", "-policy anyPolicy", "True", "<empty>", "<empty>", 43},
      {"4.9.8", "Invalid Self-Issued requireExplicitPolicy Test8", "-policy anyPolicy", "True", "<empty>", "<empty>", 43}].
-policy_mappings() ->
+policy_mappings_tests() ->
     %%{ "4.10", "Policy Mappings" },
     [{"4.10.1.1", "Valid Policy Mapping Test1", "-policy ?NIST1", "True", "?NIST1", "?NIST1", 0},
      {"4.10.1.2", "Valid Policy Mapping Test1", "-policy ?NIST2", "True", "?NIST1", "<empty>", 43},
@@ -1483,7 +1577,7 @@ policy_mappings() ->
      %% TODO: check notice display
      {"4.10.14", "Valid Policy Mapping Test14", "-policy anyPolicy", "True", "?NIST1", "?NIST1", 0}].
 
-inhibit_policy_mapping() ->
+inhibit_policy_mapping_tests() ->
     %%{ "4.11", "Inhibit Policy Mapping" },
     [{"4.11.1", "Invalid inhibitPolicyMapping Test1", "-policy anyPolicy", "True", "<empty>", "<empty>", 43},
      {"4.11.2", "Valid inhibitPolicyMapping Test2", "-policy anyPolicy", "True", "?NIST1", "?NIST1", 0},
@@ -1496,7 +1590,7 @@ inhibit_policy_mapping() ->
      {"4.11.9", "Invalid Self-Issued inhibitPolicyMapping Test9", "-policy anyPolicy", "True", "<empty>", "<empty>", 43},
      {"4.11.10", "Invalid Self-Issued inhibitPolicyMapping Test10", "-policy anyPolicy", "True", "<empty>", "<empty>", 43},
      {"4.11.11", "Invalid Self-Issued inhibitPolicyMapping Test11", "-policy anyPolicy", "True", "<empty>", "<empty>", 43}].
-inhibit_any_policy() ->
+inhibit_any_policy_tests() ->
     %%{ "4.12", "Inhibit Any Policy" },
     [{"4.12.1", "Invalid inhibitAnyPolicy Test1", "-policy anyPolicy", "True", "<empty>", "<empty>", 43},
      {"4.12.2", "Valid inhibitAnyPolicy Test2", "-policy anyPolicy", "True", "?NIST1", "?NIST1", 0},
@@ -1509,12 +1603,3 @@ inhibit_any_policy() ->
      {"4.12.8",  "Invalid Self-Issued inhibitAnyPolicy Test8",    43 },
      {"4.12.9",  "Valid Self-Issued inhibitAnyPolicy Test9",      ok},
      {"4.12.10", "Invalid Self-Issued inhibitAnyPolicy Test10",   43 }].
-
-crypto_support_check(Config) ->
-    try crypto:sha256(<<"Test">>) of
-     	_ ->
-	    Config
-    catch error:notsup ->
-	    crypto:stop(),
-     	    {skip, "To old version of openssl"}
-    end.
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadCRLIssuerNameCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadCRLIssuerNameCACRL.pem
new file mode 100644
index 0000000000..a4cf643928
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadCRLIssuerNameCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZSW5jb3JyZWN0IENS
+TCBJc3N1ZXIgTmFtZRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUEXLyNV0E1Q5KIAcHQSj9lHAAHHEwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAIIk/+6+dqID/yKmKYDaVgXh/yLWZO4uV1m6OYRSrdfa
+8aqYcgwChIaIIX465VDCpGO2LMOXV1Z/COerJguUNRGaiSQCSrsIpNGGZTQE+HNN
+C5mabMfPuSVaBgBMzQZTY3ggLNr6x1G7dXlm+Fpo+q/fSznBVsGFHCgtp53FJHBi
+Xcd3LTBFyZLiyhITqm2xvTwyzl/URcDYBp+tWTmn7ZxADdoThK7OkY2U13O0vxKj
+/haiS1NuVbX2QkS+eH399jGQHAHiBOFlRPs8FGdshTWOJxmLMMTIuS7cIEH3Oz8t
+b1Go7j4qHIYr/b2uKHb9RBMFNRKsZfqVKEQ+1J8TPNc=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadCRLSignatureCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadCRLSignatureCACRL.pem
new file mode 100644
index 0000000000..e17fac1f20
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadCRLSignatureCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUQmFkIENSTCBTaWdu
+YXR1cmUgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFDGLNY2eRGEwFN7nCy4UGUgk2/m9MAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQFsPfAbIcqMI+lzJmY396TIwn2ubAkQgm95U712CIuw00auDjGM
+iebAOLbNLgSktivN23rc5rPxSOqeWsNfgVxwCPKvBv7v4PsLQhzK2OyonV5Cmdl1
+biEymv88bEUcEnibvH3O0Lg3RySMNjPYqZgPfwF9b0iTYeb2JYk+lX+m3WGr5UPg
+M9nuC6sychRxGgF1AQOd/N6spvgSAazEyNqCWhcwdrOeM+HEDPAFOOFAhmCp+jjh
+Fgh2E2Gq1vbxGSzzKlRBDrO1hovT9XhvEa2SjopbWMbfOR/wPTjxEImIQDWw69RL
+KnTL/OdnUXifoSNJIJK3ffPTSG5AEHFUm6j+
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadSignedCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadSignedCACRL.pem
new file mode 100644
index 0000000000..58c89f81c6
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadSignedCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwDCBqQIBATANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEWMBQGA1UEAxMNQmFkIFNpZ25lZCBD
+QRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAU
+e90QO0rgyN1EhU6IPFqLzZkik68wCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQAD
+ggEBAEBt9Jji+aprAMfoXE8zclIPjs520FFAXSPqsJt77l8vTA50oUbD0sILCDfA
+raU16Pm3lIT3wuEAUmM7luTzG5Kg5qbgyv9cLm3rSJOADZCw6oahFAEbZyqOsgfP
+QYRy9EOeg8TUc6EPrlZhTrZzf2kgmDeL6WxTz2Len415oFf6JsDNMLcHSQkDzmdi
+OxYXDA2w5khPrzX0cxbMpmZVJiQksdKJg/RGGCqNJVcZwTqAZFNzSldJvx7fqQPI
+SkcKznfT/cczC37Q2uCupIyG4cntiRdIztkHiKQFRkiUxIMQA3ky3t+ib3lZDnl2
+VwGLcmmYuu4ScsqL+OP0ZjpzZKM=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadnotAfterDateCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadnotAfterDateCACRL.pem
new file mode 100644
index 0000000000..3c952437ce
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadnotAfterDateCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUQmFkIG5vdEFmdGVy
+IERhdGUgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFCwO/ffuPPOkZuznBZ+Is+LPdEbYMAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQBcYZ4ucABlH6Z0XtJMAmcrX6txzEawWpikzfzapuRe0YBL6IHm
+LRqW+vpBfR5vSQ2PBLXFJA9eVpJjjBieF9USt58DsvTF1nuPMJCk1WhxfDrE/hWy
+vR3tnLW38c6e4+omJN9fotQilw+sq32j1yQjnR4KU+VxMs6sgs1W2XmmWpTP+fQw
+W9ukAXGzwQNmBb4mbOjLDVv3fXxzVI5gK8bhcxh83cfmHMkI+dp1g4nAxQ5gRTaw
+2ypGWph9170Z1Y/W6eznbNGA40YreXqqZeq8ujpjYlksC6tpQkOp8lBJGwi7fKaI
+IxV4vXSSbExz7A4CFQ1zYx1ciciCGWcyOyqx
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadnotBeforeDateCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadnotBeforeDateCACRL.pem
new file mode 100644
index 0000000000..fb4bf11a7c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BadnotBeforeDateCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByDCBsQIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEeMBwGA1UEAxMVQmFkIG5vdEJlZm9y
+ZSBEYXRlIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNV
+HSMEGDAWgBRjPrwanvuh8lmhL0uV/ubeVriGQDAKBgNVHRQEAwIBATANBgkqhkiG
+9w0BAQsFAAOCAQEAnN6H352YCy4U82Ndz+iFkIxTLVmwiMi00RViqbziNXLSYbbX
+MpJsCPn93wGhEOokDcJBoWq6/2QeHHmEs9rN758+loP1P1R27wgicrcPIEbT0+BT
+st0TYtZExQoXWVe5QtyTa4cNR7Wz88ga1xf3GyngnjFAHmAWrU4IOpxhKvs2FOS1
+zPaxzdgvNZyxvltIUt6zujlAxDf3wJK9qWyZSt7ORob8RVaAJR12UA60qyVbA2HX
+BdAavTzVJatY2AjtnIiFWAmtI3s/jIvLLNX5yUVVDSEDCI3zWY5YR/URyf4uViEk
+qyy8PQ83mVkpTjaWRxjFrcIvwlUvmRlHTvp2NQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedCRLSigningKeyCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedCRLSigningKeyCACRL.pem
new file mode 100644
index 0000000000..9a34f8a612
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedCRLSigningKeyCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB+zCB5AIBATANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEtMCsGA1UEAxMkQmFzaWMgU2VsZi1J
+c3N1ZWQgQ1JMIFNpZ25pbmcgS2V5IENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEw
+ODMwMDBaMCIwIAIBAxcNMTAwMTAxMDgzMDAwWjAMMAoGA1UdFQQDCgEBoC8wLTAf
+BgNVHSMEGDAWgBQkwVVx+p7hIYUq8K1hpxW51U1DFzAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAE4g/85gXzIM9TYVxAXxgc8KwavltVn6wFCluy5zwxGRz
+lpJXjJWctmJ+Z1qPVlL/K8aOW+YW+keL5zcINUYHxipyQLt+W7qeFDivq5ABgK62
+qpZ6tpwTa02IXkUDixs2QVXM7vXLrHlYacLGjIti+LUP3R7y3fLSjg3BMZcvwA17
+0N1YhfYZrNVwfwqv2H58HIdo5+SSCcUGZe9sbkqRINta3/OKnlS5e7Y4KW5I65oT
+2eX4iPmPNR6NqNv6D+mMXxt6uJGw8NRA2NqO8MS8UqkA6bmZldcdkefcJ5ETJu8r
+xewaq22gblqFL2vdcM/JJ61rcuPVZTqChfDyaQu/rg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.pem
new file mode 100644
index 0000000000..447b7ec511
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICZjCCAU4CAQEwDQYJKoZIhvcNAQELBQAwXTELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExLTArBgNVBAMTJEJhc2ljIFNlbGYt
+SXNzdWVkIENSTCBTaWduaW5nIEtleSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMx
+MDgzMDAwWqCBvDCBuTAfBgNVHSMEGDAWgBQpmkUuNpWd7PJeVJwT1dn2RJEsEzCB
+iQYDVR0cAQH/BH8wfaB7oHmkdzB1MQswCQYDVQQGEwJVUzEfMB0GA1UEChMWVGVz
+dCBDZXJ0aWZpY2F0ZXMgMjAxMTFFMEMGA1UEAxM8U2VsZi1Jc3N1ZWQgQ2VydCBE
+UCBmb3IgQmFzaWMgU2VsZi1Jc3N1ZWQgQ1JMIFNpZ25pbmcgS2V5IENBMAoGA1Ud
+FAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQAnpcVORfH/FTHsCl1sjvHIvPQTdrMI
+73pWCshHQB8/eCwDmTg+xFk7n4KCYSRgbN6ingc4wzbnLkb1WPmw80aXbqd4Tg+/
+U9T0ANxSewLBeW0zUFFcW5LjqrxCJVV4IMDXh+D6F+M8uEWE8/UGzpz3qkIBfW/a
+KHQszpVl7i9x0MhjHFAXkJbCuB7ymXntYfbSQNHvMWwbPW+nt0HadbJqjJy4FH4V
+kaSg/tkFa1StClKjm3T+GDhISPpDWthGUmS4n9cmj4QnPSd6E57d+ix0hb5oqQAg
+DYeL9/xaN7fOIzuGknzE3+p19OT8vNhvp7mRoMpZpzPtm0so48EXagMx
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedNewKeyCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedNewKeyCACRL.pem
new file mode 100644
index 0000000000..9c3d7d42ab
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedNewKeyCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB8zCB3AIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMcQmFzaWMgU2VsZi1J
+c3N1ZWQgTmV3IEtleSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAi
+MCACAQMXDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaAvMC0wHwYDVR0jBBgw
+FoAUoPzALOtV7pIGbKke6V9fop9iI5UwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQEL
+BQADggEBAHAue0P1w9Vgt/mvhideeiLl2unmfJC0JKCIBeeWXl0CYW5jcSrshCwZ
+dHRM5uhs8RQCNRnJIrhwuRUvh9SaDsZGFWqAlOdYbkaXdzbX1cyTigQ0tCNTN+aD
+FxGTm+CWxi6awN2a2ZcOzZ3KuB8D7q0b1mVtnMFsvV7JEMyxZRWFm5/8yJAliOKc
+8wrWtDfbpkU6c1P0l2bPzvmDirISAKwj2IwibkbQimbISwt1b/jijPOQgiArom5S
+sHzZh2DI9xdDBXLImkJveUGF1d8zIngbvyn19Iz7bT8mJVANx2K0U6kC3ODgov8b
+ARv87w9CDE+nCZz505ZS1f/pVtswcPg=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedOldKeyCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedOldKeyCACRL.pem
new file mode 100644
index 0000000000..3f330c715a
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedOldKeyCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB8zCB3AIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMcQmFzaWMgU2VsZi1J
+c3N1ZWQgT2xkIEtleSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAi
+MCACAQQXDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaAvMC0wHwYDVR0jBBgw
+FoAUiF++PzU5ZprrTcImGyaxKie1CCowCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQEL
+BQADggEBALJPjOBcvrNJea5bTdcDaUR+3rWdWzwAFlIFN29RBQgnnwGyoPnMhBaI
+MBMMxrzPQiqc908w+4E82FSbeVKbutPPjs4izG8wE3jwPk5GmWPKozrZZ3Eliqd1
+9Kx1he6yCDnPpHZ6D4qm6qyy/xmspL7X3W40Dz56ldxu3DECDIrDACjdnu9PERDu
+acqDQPFKbcaZeCY9QX9/vsG+vrWH+HxEkzA/S9tyojYSLfVLvYubBd0OAWhTqqR6
+5h2Gx6z7DH6/1vtctb0HGg2VY7bVjpL0YhwXoTjZZXbWlLH1l7N+fP2cH5eqDwwF
+DRhIRhasjSucbUzOFXoc3dmBrOKwtjM=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.pem
new file mode 100644
index 0000000000..8fa388cd45
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICVjCCAT4CAQEwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExJTAjBgNVBAMTHEJhc2ljIFNlbGYt
+SXNzdWVkIE9sZCBLZXkgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqg
+gbQwgbEwHwYDVR0jBBgwFoAU3Q11jVNoEsTLFUDAFIYUFjChvq8wgYEGA1UdHAEB
+/wR3MHWgc6BxpG8wbTELMAkGA1UEBhMCVVMxHzAdBgNVBAoTFlRlc3QgQ2VydGlm
+aWNhdGVzIDIwMTExPTA7BgNVBAMTNFNlbGYtSXNzdWVkIENlcnQgRFAgZm9yIEJh
+c2ljIFNlbGYtSXNzdWVkIE9sZCBLZXkgQ0EwCgYDVR0UBAMCAQEwDQYJKoZIhvcN
+AQELBQADggEBAMCggIi2OzR9WO+bNMEVT0PdVnX9lNyjIAmJZj6g/SECKy85ZQp/
+Xs5YY43xxXswtJ+70cQGunzXIXd22a5xTlGlcM0orE2WIbDaoJskD3D5HKPCb6MR
+C0XwhV6KGmB+H/rb77EnHEHTHQ6SwKfSaVSVrVkaGD4HYHAKiOqOzkInultUR04p
+jTJ3watfZyB+L9Xmfj+Bz/GvTCDdYOQfs9uXhWH+C7HQPe8uXD1C1tSDD9+XnUHo
+rScJkZkZpExsGvF8ngtjp+0SUmCTM7VejHtKWD2l4KO+TkjEM9PG0+Hf75iOq9eO
+UdA7iu/ozw7EbowpmABJmeVSiWD9S4/deBc=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/DSACACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/DSACACRL.pem
new file mode 100644
index 0000000000..7d1d13a767
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/DSACACRL.pem
@@ -0,0 +1,7 @@
+-----BEGIN X509 CRL-----
+MIHeMIGeAgEBMAkGByqGSM44BAMwPzELMAkGA1UEBhMCVVMxHzAdBgNVBAoTFlRl
+c3QgQ2VydGlmaWNhdGVzIDIwMTExDzANBgNVBAMTBkRTQSBDQRcNMTAwMTAxMDgz
+MDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUj5DGjHToewzIWcd9
+PFtUWWAlC7EwCgYDVR0UBAMCAQEwCQYHKoZIzjgEAwMwADAtAhQCMhWXnJJuf+2W
+pXCHP72o0SdqdAIVAMsLFa667x5ODKAkIlFPI/Ge57Hj
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/DSAParametersInheritedCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/DSAParametersInheritedCACRL.pem
new file mode 100644
index 0000000000..545293a0db
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/DSAParametersInheritedCACRL.pem
@@ -0,0 +1,8 @@
+-----BEGIN X509 CRL-----
+MIHyMIGzAgEBMAkGByqGSM44BAMwVDELMAkGA1UEBhMCVVMxHzAdBgNVBAoTFlRl
+c3QgQ2VydGlmaWNhdGVzIDIwMTExJDAiBgNVBAMTG0RTQSBQYXJhbWV0ZXJzIElu
+aGVyaXRlZCBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUZYGfcDqMrfZDHcjnj1WO6Evbh+IwCgYDVR0UBAMCAQEwCQYHKoZI
+zjgEAwMvADAsAhQ80F0tKnVM5ABE7rErqs6hgIc8gAIULN+1q3I9zEFZqSneZHjR
+yXC3FZQ=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/GeneralizedTimeCRLnextUpdateCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GeneralizedTimeCRLnextUpdateCACRL.pem
new file mode 100644
index 0000000000..cab3080a90
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GeneralizedTimeCRLnextUpdateCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEoMCYGA1UEAxMfR2VuZXJpemVkVGlt
+ZSBDUkwgbmV4dFVwZGF0ZSBDQRcNMTAwMTAxMDgzMDAwWhgPMjA1MDAxMDExMjAx
+MDBaoC8wLTAfBgNVHSMEGDAWgBR+KnXvDDbHS+cg2X9hSEeOEoMaLDAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOCAQEAkJf/F0AFe6ViIe9vaZwlRWs2cge1PnzK
+viLSchMF7AdYTAPq0hfWo34GTEw1e0k3KTIJlnj+fD3wpnhTA3qt3YzyS+wvdSZL
+e2Ogr4CvWKWbHi+5klCk5cJBkT5+SRZQErgATVyQYkcSYHYR8iPZ3izeSuoCPq8z
+KSBdZqgRqdJuPftmcbi4XI30zAJCDmMxuC++D3uTc8NHA6DrtAf4p2Iv0f33jtYo
+CsFBEVKpYd/0At1yxRDJ1MvKsiHZM3Pb2Ygoi5koy2gaNE34l128etEN6U0cZ7iy
+A5OYdxjNKkR1Xvk33eje3ixCOvsidtMSb7446sL6w2zQHQDJITAzcg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodCACRL.pem
new file mode 100644
index 0000000000..f482eae237
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIICADCB6QIBATANBgkqhkiG9w0BAQsFADBAMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEQMA4GA1UEAxMHR29vZCBDQRcNMTAw
+MTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjBEMCACAQ4XDTEwMDEwMTA4MzAwMFow
+DDAKBgNVHRUEAwoBATAgAgEPFw0xMDAxMDEwODMwMDFaMAwwCgYDVR0VBAMKAQGg
+LzAtMB8GA1UdIwQYMBaAFFgBhCQbvCtSlEo9pRByFFH1rzrJMAoGA1UdFAQDAgEB
+MA0GCSqGSIb3DQEBCwUAA4IBAQA9vPMLiinD8G7FaoTsu8T2jUrTi1OLPHxKnrlB
+rAP/eHa+VQV1HJfY5Gjq1dpNgzZqDIgQM5QHPm0aSgMN7Ultx+XzbxRswLnwgQrZ
+7f76Tlky1I+jz7/p3AEynrNR72v64SZt46UhpSuWBHoF1uEVtgirTZNfOEaGUJTN
+OaTA5U55/iw9BKjHN0e/Vd7OGnrk5h6FsgWOiasGn6/tym9teDt/L2hlOdsZsvX1
+KPc0ExUHVjJIUBYTooqyy/CuTzFHla6RYVYvJuRF5qYCxa0GTZK3ImCtJ3XfsGdf
+LEJDZ7T17xBQHucMvIVLm6vY44WUy7PqQhZJskhJMEvj01ZE
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodsubCACRL.pem
new file mode 100644
index 0000000000..04790063da
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBvTCBpgIBATANBgkqhkiG9w0BAQsFADBDMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTETMBEGA1UEAxMKR29vZCBzdWJDQRcN
+MTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUMgcs
+nnRdLV0pu7F6jTsVUrR9QngwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEB
+AEbJGAG0MzgAYBNHSm7qI/hQO0cVg2FSkzuKdKB4zp0Jl2hvgjJKAEnU1QMkCyW1
+7B1srXRhjyLp8lvBZPWtXtev7QSkNV9ysUiNDdg+FThP9WVsf+zPu2+UuYn57A0U
+0NeWGv0DeoZG1mzRq5DcvLk98o3ErZug8ABzaUlprx8yGvzqw5abyj7AgeXvp5fs
+0Jo+ya4e8aFrBx/8k2gPvGTv5AOaa2+tLFQsVOm4PUQk1ANklm+CIlOz5hvvZgTp
+UXaiY/BrYCSV+N7MFXNH/75HUm4PPLFr5LgI/whOgR6bFC3e/5kTdQpVBwGBNvNy
+OEp8bA7ViIqbseokJI3q29w=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodsubCAPanyPolicyMapping1to2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodsubCAPanyPolicyMapping1to2CACRL.pem
new file mode 100644
index 0000000000..ed9ac1744d
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/GoodsubCAPanyPolicyMapping1to2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1TCBvgIBATANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTErMCkGA1UEAxMiR29vZCBzdWJDQSBQ
+YW55UG9saWN5IE1hcHBpbmcgMXRvMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgz
+MDAwWqAvMC0wHwYDVR0jBBgwFoAUW3N5meOuBtOKpjNOFHjkoB2x5MkwCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAKKfTLLrhhr5sQTxYh0/59xGeCAPDiAb
+hZVIWXYrEy3HdaKVI786DjInVHDAHrpvO+pL52/unPqNZAFSpNpk8+4otR2/c9lu
+7EtForVhzkCVgO+bnGnLPqgYKq91tLD/NtB4OdfXlezP1LN4f4j8yHwmkJ9kv5bS
+op2gs30YZo4f5rgRFvDFzL0bYMzHcY/NVLqnHPp+8NqPsNAdyWl/90QjCG6Fj636
+8D7SQQpDY4Qrq0raGpsspyYkMeshUhLiEb8A2rnaen0dhrG8+5W2WP0zNoSQvKH8
+D2JLtZK+l75rRRZm5V9PNrza+ZfjbEABUmJjJ/LOkLiyNna789a2+9g=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/LongSerialNumberCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/LongSerialNumberCACRL.pem
new file mode 100644
index 0000000000..d0d3787427
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/LongSerialNumberCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB/zCB6AIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEeMBwGA1UEAxMVTG9uZyBTZXJpYWwg
+TnVtYmVyIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaMDUwMwIUfwEC
+AwQFBgcICQoLDA0ODxAREhMXDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaAv
+MC0wHwYDVR0jBBgwFoAUC2O3R67CBzIbf2/jOrjqC//XZKQwCgYDVR0UBAMCAQEw
+DQYJKoZIhvcNAQELBQADggEBAAT3AsJOgrvo4ohLomVgQey2sS6xh4bvK/qZmx4v
+czM1U9QpS7uO1QDgIkdxd7nGEtPqhzhjm5Uyw/M5FJwW0pOu5sRG9I/QvYgaTTbe
+u6CCwpL4fxJ42EjKicKdWvZ8+iQONDhcmHzIsvJJcg4vSkWc0S7CYwcrdbAn/KnW
+ru/Jnh4lGUxoj6GDYrroSCrPQqXk9rCTxq+wH5Ck8WQ3UyXLkVzuxWdBrNQ0Gwag
+dAh4u1o+3e+ta5V/WtQTZaSb71A0GvLqZpynu/pWDCQ8fkguvKbP55CuQLCnnukw
+nFs7zIlDlBQCYOgqvjswdzwZDSRliZD035oLDHPgSIeiWY0=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/Mapping1to2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/Mapping1to2CACRL.pem
new file mode 100644
index 0000000000..5aa18e1b89
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/Mapping1to2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwjCBqwIBATANBgkqhkiG9w0BAQsFADBIMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEYMBYGA1UEAxMPTWFwcGluZyAxdG8y
+IENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAW
+gBSZxXhpyz0zdsKZrETlsA7+ufTbxzAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsF
+AAOCAQEAHDBNYlKeVrvQoU9wdLhmD2iI+pNFkNB0O/BJXY59wp/DFV+gyygyE1sC
+qnwOPMiKR+u9zypXr3+YbG/L0YeZuzzaFbHrm4ZYPcCRzaz0YVm7ZhbI+ea+moVW
+R5BgVfFUkfCiGNYQ5nxKif7WeYcCK+Aiy1eQ7e4munvJ5jzDrRiiZiBPRfY29FPh
+0qkp9TRqPLpY4oYwaGxe9UMKqvVdohBYqUUfdB2tgjeVlDct+MokpYL7wpnrQBTy
+yzgYpZ+GELYzhhn1Oc6PkIrYxc1h3O+tIg85uII/qFOC9qOslH0qPiVqEzwckAhZ
+HX8PPcXxLhO62X4BdaMgJhgHdUrW0g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/MappingFromanyPolicyCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/MappingFromanyPolicyCACRL.pem
new file mode 100644
index 0000000000..4d6c9d0aaa
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/MappingFromanyPolicyCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZTWFwcGluZyBGcm9t
+IGFueVBvbGljeSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUaHMU4As0z3JA2pSW1hWreqRvLowwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAKZyiDbM1h05WJkyjY/Ri6vJfUyXeHPdkeLm2K+DuxVs
+VOreMcdvbKCDm+VjAud129+ou9CUFZUn2vPwhZ5+W6Z7ohzUoo8QeWGoWkvlY/yU
+/Hf4qR6QOxUATGr/f9u3ptsbVjBKEhD66Q/OvXgiBFNzOdZOqKuuI/x/rnXyOSo4
+pYJ/RecUb1m9WaVjO1eKQCGImMbrHTnIOziAg47/IdCztubxtWwtV8jmd/zi5E+0
+FO/lBnFyyghqNjPnML0LHQUM8Lr1EnFU9Lg2m/QFg2rWghrWadYKoa6lroPKhdMn
+hTL+BnTZkrwlJ7OtCI1wQD1NHIJmiL6lDBFT6TMH1P0=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/MappingToanyPolicyCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/MappingToanyPolicyCACRL.pem
new file mode 100644
index 0000000000..a4a369c179
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/MappingToanyPolicyCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXTWFwcGluZyBUbyBh
+bnlQb2xpY3kgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFBQs7ZPxHhpwFZSLLZO0mNK3BQisMAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQAMdZWbfYwoDdwrkj0e1LjvvPiIXbBMwxuNhXG1LAaqazMF
+B3SM4/6IQ5kqLD4mXL6VTe1W3Ovu5L8DjbkXHckkq585B2s73Mwl9Ymlx7/MFahd
+taFST1d8AEQqxgBjcQ6imlEPtgJNboJqcbNS3/R/xau8OMXmY/kuSyTiMqeVq0jl
+ePVLDFrrLYaovKT0nG+7mN/afE+kyQxXaRk722ypf+38K4HHUAZwadRKPa8exyKz
+KNS8wFYjlrrua93qbpkDzmZ02gjkUJByCeBTqvkEbabUqLGfFhPJ8w/LFJiubwlI
+CmoYEAKpfR4393Uizsg6T+mHAaJmeIocAsoZBWvR
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/MissingbasicConstraintsCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/MissingbasicConstraintsCACRL.pem
new file mode 100644
index 0000000000..e84c210970
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/MissingbasicConstraintsCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbTWlzc2luZyBiYXNp
+Y0NvbnN0cmFpbnRzIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBQwVrwVEY1PxibGtZyhcJLS+U8NeTAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEADdJ1BXt1/rZ+Je0fEAOWJOx/zAciiWeBWaa5WMnq
+H4fvy//4+r57ZLVCN87f0fnxBSGk2bs2qZA7tkLMtVyRU12cjYsTXzqIA7w+lMGx
+Tsel+hDHGdJjAL5X7xDMOX3kfX/I5lruE+nKCxaGXWV3peJkaVdfw/qzkR7/3Woz
+aa5B7soNJv8sGyflwJCMUgAfaHZa6LopIRZ2GpmDhDYiXtujZC4NoLhKaq3LgQgF
+Y8gjpJtW7dEs7HQo33OeC4s2u8Q6T0pJkG6Xi7rGArplXTklb0MFjrEN6quGlYNC
+00HSsvG4Pf+2IPKUf4P6I0QW2CAnZqfprIPGok3Sy6tfJw==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/NameOrderCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NameOrderCACRL.pem
new file mode 100644
index 0000000000..9aab5ae9dd
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NameOrderCACRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICDjCB9wIBATANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExIzAhBgNVBAsTGk9yZ2FuaXphdGlv
+bmFsIFVuaXQgTmFtZSAxMSMwIQYDVQQLExpPcmdhbml6YXRpb25hbCBVbml0IE5h
+bWUgMjEZMBcGA1UEAxMQTmFtZSBPcmRlcmluZyBDQRcNMTAwMTAxMDgzMDAwWhcN
+MzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUv0qLgZtNjBQxjFvpzN0v6HkS
+UVAwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBABkyacQyoBQE5YZL2K2Q
+0f637287irENIuJeWpv9MsXXsZZfN//UeOfwIdnhAMQCx1GeEbCdAPAKkBxI3Jn2
+AVtxqytV8F7xqUiUpYRw6g2B0jjsJoaFP4AoY+BGk5/4oLwj2MzNyNcYFb/KPPgc
+Pwq4T0IR7qMz60d2lZzLhWWz50jOmvwvyxFbOcYwh1RmLB7KKcwAaPeSwlCxThQS
+sugsqHuq3K+pi7KTShAV2UWRupDOGlVyPYAuo3n4G2LmwPmwmYmnG3+KS1Azyj8B
+ywYDiAPQyG10rufsDF3GEpJzIOPt7VHv8z2SthTPmVfDFrkwshOQsb+PrltGP9bC
+V/s=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/NegativeSerialNumberCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NegativeSerialNumberCACRL.pem
new file mode 100644
index 0000000000..62dbbc8db4
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NegativeSerialNumberCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB8DCB2QIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZTmVnYXRpdmUgU2Vy
+aWFsIE51bWJlciBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAiMCAC
+Af8XDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaAvMC0wHwYDVR0jBBgwFoAU
+YuQuNcYPxeiR0AvBjd62r9qI2T8wCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQAD
+ggEBABjkQVYJziJmvShgFK3XecyOCYDlSPShr+vgrGFBQpyi/FePWU0yot93064/
+lRSHgzS8B9yvXPJBygOGT/hbmNG/88Evu2Z1LoEOLTzq+Sbf6LahfqDpkvdf6SjM
+wy4udr0g7dVOjHQg9DM+HDij7tc150o6P0e9++0CgpXuRNQKYKRq3qn4KjBq9Yph
+S/MpUEY70hgZaL+XTbyvti83Y8nPqrVIz3VRcG7GLHAmYb3cGwf/8zNL8lpOhzOU
+MoTwN+TcRWvMlYWYoyfaaGxA+Ak3wcPsIHhHLxTyXucXGQPjrmiGqK9H6BOUZT4q
+HupHV4TbUwMoW+FXISGPVvz3ECA=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/NoPoliciesCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NoPoliciesCACRL.pem
new file mode 100644
index 0000000000..42ee928471
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NoPoliciesCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwTCBqgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEXMBUGA1UEAxMOTm8gUG9saWNpZXMg
+Q0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaA
+FEIkA+2lS3acl5hcdOoFOhv8NeScMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUA
+A4IBAQBuELGhtxMeER+HyzT997rCWtWbXV9HT6zgfU9AUTX2pDoNFn9iGfFkLaJm
+rSkQro17ogzl9xrF2EvdgMSSw6YxRU7MbMMmF2lXC+IbScdtAGgdURnGF/C3Omao
+dGbXXI+3gUM5YSlPqGToDB2j7tBAC+THt8Knxq1NLeRt9cXpztX/UF+B4u62ylHo
+q6jV4KLlWksRGwtEF9w/2iiQv08zz92ySgL4Z/CbBMQfX73iq6SjPFOJm1CpA0BR
+QFN33H1OC8WMHaoV8M7DBGpudcWzHZpuq9ikjLdlCmDuGEyJgceneOe6e7vsupe2
+DGRGvgwmJbJI/XbCbLnwSW3Xdsp2
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/NoissuingDistributionPointCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NoissuingDistributionPointCACRL.pem
new file mode 100644
index 0000000000..789099d061
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/NoissuingDistributionPointCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0TCBugIBATANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEnMCUGA1UECxMeTm8gaXNzdWluZ0Rp
+c3RyaWJ1dGlvblBvaW50IENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBa
+oC8wLTAfBgNVHSMEGDAWgBSzy1S/ap38n8cxDpIMp0drmQCfMTAKBgNVHRQEAwIB
+ATANBgkqhkiG9w0BAQsFAAOCAQEAqnXhjxLsCflfSGLvYk06S6AP9+nEuFtbqXDP
++T4URhv2PZ583f7hg0jEd1/SZqyNxrZk6cNNMR2DYPCX8XsP3c0lKf1wVoielyl1
+bSPCTifm0z8pJr9ORD7XHDZ4F8s/nv08f+GJmYUaE036Nw++wNMqi016tw+TrHa1
+s9jSwUvlzjg/om6n0EMTWnWTnEHngdrGkV63kuo+4yymlsEALlgmIUp41bOiWzFo
+aYxsFd2k+ZAGvv5mB1Qimcp8C1ssInLczcDQ5Un329OAz83nrgdCZcYkFBAR1A46
+p+16zuw55BiQp3gByK1NVTssEcBOkDm/M1DgS+CtE8xkfKnR6g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/OldCRLnextUpdateCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/OldCRLnextUpdateCACRL.pem
new file mode 100644
index 0000000000..d9591e5cf1
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/OldCRLnextUpdateCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByDCBsQIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEeMBwGA1UEAxMVT2xkIENSTCBuZXh0
+VXBkYXRlIENBFw0xMDAxMDEwODMwMDBaFw0xMDAxMDIwODMwMDBaoC8wLTAfBgNV
+HSMEGDAWgBTO2h/aWsyOl/ogFSlPrJaNKs14EzAKBgNVHRQEAwIBATANBgkqhkiG
+9w0BAQsFAAOCAQEANLTjtSL1Q3Ya29eHHAMhRdlEtcNF5CMpIUxvS3eQjTH0RxIR
+EWfDguJmX5gAeyHgegi0W4E1e5qArzpestM9nXMZypQ0GuOLEqQ8QfV4UTp5B3Ng
+gdgrxRTIdlpkEG43G93gZBmZ7u+HHbBtoBM270gFtluBXTnLbs6cHsZRn3p5jOCc
+Ll/YQBCO42iRjmww2mYKy5dB18geb0YZHlKL3FbZ1JhfZlvmHilBvBSx9uy5qZgZ
+HwlONqnePLkbK+0PyLaooa5NJXmusGVuZVC9x5gzwO+ZHun8fZ8aHIDDO9RtOv5U
+6r2J4kRp8Nw6zM4yWeQOD0GfRFlsq/OM3lHgPg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3CACRL.pem
new file mode 100644
index 0000000000..f590198a12
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxjCBrwIBATANBgkqhkiG9w0BAQsFADBMMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UEAxMTUDEyIE1hcHBpbmcg
+MXRvMyBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0j
+BBgwFoAU/PSNYTMygHx9NYfeX1L7afEdwRIwCgYDVR0UBAMCAQEwDQYJKoZIhvcN
+AQELBQADggEBADWFF9y8VCunmgrr/9sJCD19KF6FofJOEV4U6zjPju5N/4b3Txoc
+LiClRWHYyRqHjOlLvAOik0mopqcUhwGqQG3MpU56R8LEKScgQQiacPuSeRSflRRo
+nxGs/90yJrq9s59EN5oZH+AnhJ07R2kq1PFLMGR6MY6B4A4MZony01/BPG4EfpRn
+W270ehb6FEYIc514vHyJ65s8KfUx01BsMSTwS75LJFEmnM6pRLzZzbESQEo/5/BN
+ttRRwrNt7TlwY7zs+oSDjUEpQ4K7tbfuQtIqiGm2VsY1O8kZWYmg+eUTUplcLoEZ
+LuAkicZCYw+YPcorZ+m9nL8FbxnrPm2LjJM=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3subCACRL.pem
new file mode 100644
index 0000000000..acc5cde185
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWUDEyIE1hcHBpbmcg
+MXRvMyBzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUvnsTk6Hkm8UnPDBT16XJ5lqWejQwCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBALLR4At4E9ny2pPCIb4rLKvVRs10lszGrH8NVo1jhuugSyMS
+wMYPWuZbUw+rpN/YwFFkM5R256ITwtEttgHkWoa3CetBBRYF6UPIMyZp0KRDQAZC
+SwPU89QvP5H8KHuB3Zg4bg1wrXZTP9vjTjxf65UQhc2S3zj1M+TBv94h5J5cHSY+
+Q9Nz5iRoxEJv55/TWa7UQYBwaDbPxdb+twKEhdocjTZRYub2LhKRlY9nmTTiM/J5
+wE0RYNQsPiUkZuNELh7ZxPCp9Gk5KqbE0qUSO7KYiPEUj5mK4F+j2Mwb6nsoT9gt
+lrN/kqlyXJMhf1wRux12aUXN9Ia92lW6WrI7iH4=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3subsubCACRL.pem
new file mode 100644
index 0000000000..d000a06282
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P12Mapping1to3subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZUDEyIE1hcHBpbmcg
+MXRvMyBzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUAF05Pg/lqipeLfauaCqtM5s9m3MwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBABqrLgpbtj/1buUK3kRN35sQe3KtFggWeg1MO7BkQtue
+zRD3ajIwDOBbemqCmEj8w4TdlDzTiEVpaa4k4UqlcTINMdlc8AbSzs4IjZvg2Mxu
+RcGm6+Kr8YfltOSeJk1zdQve5V9ft76TSGOZqK0Q4rTYRuuTipe3EnwJUdvyTR0u
+gmPO5XTMHnyecCJoUAHFmqEy5EAjgANJ9t0DwPzK+BIPDn76PmjKd0zhd5rAhQzm
+FhgGSyUAZMLAnPrpYTJtTW+QM92qJPxOMWvDAMVTJxUrZmfaDSEOFUnoTi6yADaR
+Mu8MWB8W9CRmxNShdUht4CGu5R03u6DGBoT70fkbn2g=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1Mapping1to234CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1Mapping1to234CACRL.pem
new file mode 100644
index 0000000000..376de8c6e4
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1Mapping1to234CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUUDEgTWFwcGluZyAx
+dG8yMzQgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFJULAalJeKp22n8JDayIFPn190eSMAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQCqaCGQVcOhNGIvLyAEZ6u7CZSlusbOFE1T7cL10Z0XpNwHIU2e
+dzV4pmt0Y3tAJyR0FIXlqZbxq6fm/S5U4cWoM62jk4PzFGu9HaocJNNOIK0Opfuk
+TwwMOpYN/6IH74iy22lb2Wdgike7G9bCWl7nvMVZw5I7OIGyy/oqkhqjtWFLC9nD
+fYRIwfG3HPD8Kc2GMVc/iTalLDe3OUcsSGTrqCg0OwGckH+CdiXQk5MfV61bwICQ
+RxURNAqzCqYhNSrDH/qcGId/3mN/LzpoBr4SVRMZhMw0MpUWSTGwe1wnarhxaSoD
+VRHuoceqwHtU+s3AzFxHRXDbv/0xHECrkNjX
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1Mapping1to234subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1Mapping1to234subCACRL.pem
new file mode 100644
index 0000000000..316b5ba594
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1Mapping1to234subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXUDEgTWFwcGluZyAx
+dG8yMzQgc3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFAMX5ZUA/So5eK/LRvZAmGUKAu27MAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQDCUm9OtS/rVGX56aFpRteKjEE8VKLOCXIecUda5ewyHw6a
+JRpUhGBguzOjY60yM8isBHYefdfjM4usLfZniy6NtfJ2S7yProWY7P4IYUsWgrMn
+2tXBp0LnyyWarx1f2NSeBJbsQKiw8fXLsygMnd8ISb6eA1AGKfZfxmeC4PM2Hl4/
+KbKdvxs7UWT4jD0WolZyOpjr/Ffh/uAKZB/TVks8j7ZENODT2lUc5KxmDbMCHEUp
+pd5GyRrXKJjdMMMUK/VUxOr1K22eW1FgBmx1zUiT9Uhen/bS5WXtfhVGqm1q468F
+jrPVC+/FBoFjuHU5tcxtNup3cLH6Vm4Y/v5+u2u+
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1anyPolicyMapping1to2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1anyPolicyMapping1to2CACRL.pem
new file mode 100644
index 0000000000..709a1368ac
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/P1anyPolicyMapping1to2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbUDFhbnlQb2xpY3kg
+TWFwcGluZyAxdG8yIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBQfAigoMo5KhPi4i0HxXXvoJVJrhjAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEABhVsmwrFO9I1+fkjbJM7OfRp8BbNFRh0Mhb/ky6K
+g4U6YuwlEQP6KzM3QyOyQPIh7CAljCBxJpJkXrfm29RJY3OqS4THg+FfEmIcU+MV
+1TrRd8CI6ufBCdoG0SUUsS2W1CZFjbQNEl/xAfMUkuJi2T0lbCCsb1y0lpGrFW1l
+k2HLwq3qbikjZyWhoD/k6ho1yIEg4uT03GyJUm/n7Ij4DThK7mJP5vu9VD8rGwU3
+XXsoD62oMo2duCLrH4Uj5U+k/RbYb3zdbq+6xb4WLkt9MC3zWK3NtiVWIr9Q3XjV
+3uz8fErny04GW1dGGQQn+U50ZLjCA3bG78hbyCxv07zp6g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PanyPolicyMapping1to2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PanyPolicyMapping1to2CACRL.pem
new file mode 100644
index 0000000000..c039b47889
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PanyPolicyMapping1to2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMaUGFueVBvbGljeSBN
+YXBwaW5nIDF0bzIgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFEcDJy9DPcUv2ZKsx9J20DPG+Xe7MAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQBQVc02PPmQX4EhnPqxh12Tk5NseAryd0o8bmViilep
+uCpk+roAUOXLvKHg43alw0d+OsPA435KTBLKs5hR1lrEjEqE0AW56jqYbdCmei19
+XbaaGc7hrBbraDuFqAeobbZ2jwDxN2MQqIOT5omzfyyVLUzVKNyNsxvOVCoke+ya
+n29eMlOzv61ZesITDJlkrqTEyjwaRHUQtfthv4TB0sPIP5NmLq9ThYqhaVjsEtK5
+4bS6XP6xsVw4uyPrwStEgPPAbrYZyyRVNrNJigAyEKw59Kl5GQPefAm+mAo+x5D9
+aZDC+5MDbHU4CcjPPzbX5iocBgz3rEazHL1CJbIflrlh
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234CACRL.pem
new file mode 100644
index 0000000000..ef2c47424e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxDCBrQIBATANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEaMBgGA1UEAxMRUG9saWNpZXMgUDEy
+MzQgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQY
+MBaAFPb9qYwmLLTP1tPr1B6tkmoduyRQMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEB
+CwUAA4IBAQDVVwwWNj9cO5+4t4+7LgMKvD8IGEKTakoiouH5na732HehNDO/mHzA
+cEKjj5MgEdx2JLghyLAtDsD4LTzdCANAftXnGeZJVcATUbjSecgPg5wFLLp9/mg4
+Fb5mIQeTUkYcrswC6Wa/P3vLJfu7L0vJwg6tPwnkFHw9NqsuzFqmQvrlrRtzLaDQ
+zlvg6BZkDCXSK+7gqQ84F4WJZCV9laVkymfM1ih0wXWby0VWlvAZK8SoWc6W7rep
+6dePGKx1V/lgJkYbxvMROoRKmoXSoHdxPktChC9KL0LievdasDF5/HZ5UgKNcE3n
+65jwDBq9nnOQfhhPm2WeLNlVbzY1Mzjg
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234subCAP123CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234subCAP123CRL.pem
new file mode 100644
index 0000000000..5cb4f07fdf
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234subCAP123CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYUG9saWNpZXMgUDEy
+MzQgc3ViQ0FQMTIzFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBS5qlCBpjRmUWidQu4piGrsHMh89zAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAfV2uyHCfgiXrwk21BBpCMPiQmJ5erAU2QRfYd/IzoTgx
+sMGttr8QexaLY7rfY8K9Ju7t428gmoFYScIB8AITUCh+Z9l+wx3egQxCC9twjgRt
+zS/1ys8I2nK9CmA26ClY7TAL2ztIjFDcS+S1/tZlJxi26il6EpTjDkb4altMcwYD
+0dy7EW8Y/JAvFGBkziG9FiDThEdYK/hyDtceBEGDcWJP2s4CBOIigzdEkllFJe33
+ugx2AhLvGvHPzpyOzUPxlbKkkkoBjtU5WUl0v1PSiAa/OqXxXjOb1uuMUsHutbdM
+51I6VkQkncKEKN03OTkCgwthFM4GN5rurT02zD0KBw==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234subsubCAP123P12CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234subsubCAP123P12CRL.pem
new file mode 100644
index 0000000000..4f33bf88f8
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP1234subsubCAP123P12CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0TCBugIBATANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEnMCUGA1UEAxMeUG9saWNpZXMgUDEy
+MzQgc3Vic3ViQ0FQMTIzUDEyFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBa
+oC8wLTAfBgNVHSMEGDAWgBRO9F6h+Qgwe2WsksARCyzTtJYHHjAKBgNVHRQEAwIB
+ATANBgkqhkiG9w0BAQsFAAOCAQEAO3mUa/hz4u9id4j6HNSVrunOClJfxtxgVK//
+BhUHRP7DLt9PfridxGqVOENl4KKUp3Is8JDXhsQLfalp+SXUEjUNIW9tK1XGT8RM
+KuyPXfYNvK0ki8RLZBrOObwuz1bwCIr8suJnlbuO2PizZiYkd9JkPpmI4Ql7wvKQ
+qtZG/D9gMSKw8YYU0BBD38C1DBcx9zX8Juq1of2wA1bRO4+1r7d1caiauSNDICLM
+6K+5veVzXPbdi9AiCym0q2DafSijAO/tyVI7viGFriA1XXPyW4IgJTlYwj6C7bNE
+spPxDeHZOYGjSRYwnOVwl5FetLBZeXPnb+oCUueETTdCap53mg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123CACRL.pem
new file mode 100644
index 0000000000..9badaf1180
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwzCBrAIBATANBgkqhkiG9w0BAQsFADBJMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEZMBcGA1UEAxMQUG9saWNpZXMgUDEy
+MyBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgw
+FoAUjCgK2g0JFGLuPT2WuHGTEonq6GMwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQEL
+BQADggEBAF+cFlwOZpoC7aoNCsV8ISlb/o86hb45QuGdajlLv/vTDAstyF6123qR
+3dE5/YuJ4FTgjZqNt6iBOMIaauFE9nTeQ/G7WhB6yGOtna9QrTIIWQfi3kyuONC5
+1+YUr/dj9wBJgHXQhO1ugdweVdstePbTe0iRl1ZGG+Hs/xT5r7wji24hhtjyXoAJ
+J9A2NQoLt7wD4OBOKQUHarYY24xpnVcWryWxfS2HGdsiWfyrdVMSTzoZnIqI3kzW
+VvbVj99ShHKFmIQMqBuZZGQCrXlts5G6mknQK9TNCHCJZwX41S5Tw/dd5X+Ujdyz
+knTDjuehdwjtDecV5Dh0q0nORth5X+s=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subCAP12CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subCAP12CRL.pem
new file mode 100644
index 0000000000..bfa6e83f6c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subCAP12CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWUG9saWNpZXMgUDEy
+MyBzdWJDQVAxMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUzgDa/aqTQPjAoHmtwXjOHdcn9p4wCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBAEBeDNTliwQBVeWRQ3NDLEUH3xNSHfAr8itMFr1gMI8YaS7e
+qYMtIZnedQ7o1A10abrH6X4li/8UDL+7o98CTcd02D2Hrvc+QXT++nIJ5oFbt0qJ
+iOVXGQ5ZXVxSaNif729zjcAmgGKcHtVtxPvf9CgmnQ78hA6mx0ugFHs4QSmecsMt
+umd0V1AsscRGzTjvN0YCVBPpZPy/oxLU6pYp6XAmqC1UHPv8Ny1/unMz7cYoam/0
+83KZJHp8I4FSzkdhrFyLjKaaVxwWioLyQUTwrzR/qzaU1Eyk+KipzKVh470kuItM
+cDnV0OXOPuJR1XA3yhdLZU0aMtwd28WZ1Y4myPQ=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubCAP12P1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubCAP12P1CRL.pem
new file mode 100644
index 0000000000..f8a920a1be
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubCAP12P1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbUG9saWNpZXMgUDEy
+MyBzdWJzdWJDQVAxMlAxFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBTkGz5Gt+bIqdjt0TN/BeHxXRIkwjAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEAZg1qheMvRGkd/jBrdaoWnRb0iEuPZw9Ij5k64ZeI
+JUmMeWjKKFnLBsC0MIrEtR3NPqMU6tfZH3mmeCzJ6pjo0IozkN1OnMYFqwxrfn1T
++d/yM4fYBb12oesd7n1+c36hlHKd7dxi1xUAwCIABnX/17odaOCD9ikA2sq5XfqS
+p4Z7IUPd+i/8dF3Pkfm+cpPJaNdpdd2sxx4mmbsGcL9+2xIwhfiVavawZe0MZYxw
+kPhNVL8zL6kYUCRvB7J2hEwu1MWH3paED9MIkKyS0zVdzfg4DojApNP/nwL3JHIf
+DVscEQo6mY+6hhhOYApDNF6y81BRqasImFItcLp/fgE4tQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubCAP2P2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubCAP2P2CRL.pem
new file mode 100644
index 0000000000..cbbe9d03b1
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubCAP2P2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbUG9saWNpZXMgUDEy
+MyBzdWJzdWJDQVAxMlAyFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBTp/LZeVhROBh3RMv2IYGsQ+AUbaTAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEAYcCBk7Si8nv8UU/B0/YbctjIyBk8VOtKhIFbRunt
+alE+/Vc/c77r0Y1CfVII/DOAFcB872KtQuWyl5p8uVlVwmDlL1BKmz35mD2PS10i
+NsuofkZTp97xrRZbA1k+zqMshOzmEXReNrR/qliJpTPlH1YMNV5IN02HNYZ8+6mn
+BzAs4e8/xS2cO9ktya0ZwAqwH3ksD+etLL/MIj/3BAL9HRMOC+RcKktWkVZKqYq/
+AAzn3HlvnTUZi2OW81ABtFl2hYSJEyBcKjrSoDuZ4Utk5AuxOsLwa0hH4da+/4nx
+OreMrYjymG9FpLVq+RhVYMdJSzp8c2CU7rgN0Pap7sQY/A==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubsubCAP12P2P1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubsubCAP12P2P1CRL.pem
new file mode 100644
index 0000000000..2a6a21b33b
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP123subsubsubCAP12P2P1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0zCBvAIBATANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEpMCcGA1UEAxMgUG9saWNpZXMgUDEy
+MyBzdWJzdWJzdWJDQVAxMlAyUDEXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAw
+MFqgLzAtMB8GA1UdIwQYMBaAFIkgF4T7rLsJ195eXp5o9jlQH0CIMAoGA1UdFAQD
+AgEBMA0GCSqGSIb3DQEBCwUAA4IBAQAVS+qKdu5cTu1Y/7f1Yci/ULGAtX4oYox6
+0LYSSXpOl1BzTNMxUCp30N382djQEYODR8vROlVXDyEaHwMC8Dyn+YreG+1eHODk
+Mq/Hc59ckRW17LDJpyBew1535EVQa6LtC6bD72AQ1Fd+hzH90WNNQCMb4xQ6eOnF
+T1pSoKoopsA2NH3zTBVrtq1n6K7FOojGqKdO7oYqill+bRdMoYSNKQx1lskS9E1b
+lQftEmE8AAlU+Q1zV5IiiSpoEXe8/nbyTwSbYvaUHmmBgwCOdgnpJiG6TvwjcFh/
+zIQiGotG9zQszNrO7GPpvc9wQ+o2uN1Luilv1P0FRw0PBHMwmwUJ
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12CACRL.pem
new file mode 100644
index 0000000000..1af85735f5
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwjCBqwIBATANBgkqhkiG9w0BAQsFADBIMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEYMBYGA1UEAxMPUG9saWNpZXMgUDEy
+IENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAW
+gBTYXzXimsE3KibOg8xzDnAVKjriMTAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsF
+AAOCAQEAUiAHin1qZsRcAQcRXu9l1qnbsNYeC32w7Y8SR7o7SLMBjrLfpzTt3u31
+UGBH/9CfynTV2n3wVuJoCCFTdkgRn08X+Oc2sK/8g+oKvTwmoLQv0lktEsFvOFC0
+4/5wB94qkPysqGKKPj0ADujY5GBWb64Z9V6ehvxACTzKhPCNc7auvTLZEymtWW2H
+4C6nZGjUuuoZbd1Y20d0u5/18MySt5HCfKyoIfA75dsnuL7RJVFvrjcXxH40cXs8
++xizlf66wdIVeWCAr8RV4bPFmlC7fAF3UjC4MoE1RQqbWuYig79F7RS29s6XNWiq
+A0W7puTYGKoCpIUETmzBSDOsNpcfIg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12subCAP1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12subCAP1CRL.pem
new file mode 100644
index 0000000000..c96f12103b
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12subCAP1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUUG9saWNpZXMgUDEy
+IHN1YkNBUDEXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFCKe1w64SM4JDjpdvtZNWCNWjcvWMAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQCPniPRTYwvNO1eFZjaR7nnHYFDRh7cAd2EsYgmh9W7kjeafaZt
+vLCnzQv82LN47Ki1z/2KWraLSRduP8qnY4wGOdRsahnrl/ss2wjMB6UiFp+Un6IA
+AKEM5MLgZwvjsadAADqJXonGzB1Eh2xmHGqZloU5V5FDewbjem/scf3yufvahMvr
+ZSjBsSUMCBfIewJq7JRkwSgyip4K/t9UBJBbsfkOOR5/rEgaZyyfI86nGhg0GawS
+FHw1fAPcG6vEKnsyyHU9JhzjtQYUi3JiZO2BamFAXfJkDOhCWfkR4ywhRUP5bqAE
+q4GAriFrKPKYB3Fp4nAhbLi4bhV4kUS+lWoT
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12subsubCAP1P2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12subsubCAP1P2CRL.pem
new file mode 100644
index 0000000000..4dd0f2fca0
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP12subsubCAP1P2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZUG9saWNpZXMgUDEy
+IHN1YnN1YkNBUDFQMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUx6U3p9D6JOV839vyXWnb7sr2me4wCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAKWuXLxMM7H4MkbAsQLa1RgeuDYC5FLy5mzt/UsidYqx
+rSK7vX19l658Lz1NEcq25gXzJlfOG8ZIAUkO/SXwi1IwqOU2QVkn6nJnXYP0J0c8
+QEzxYlYEC/DHDTEUltH2ZoIuOoozIT6NHw8+2/XBBjatS1nL10bhwvzRXirGFKGN
+BtASLRZeHaU0y/n2KkBuusn3HFyErzRskNRLPOTk3Lt0/RB8nbrRxUUZJXAaZJIr
+4Kj4LcatDgdgXCZ2MEC/mCByKwFiwh5RgMQqPPLMhGBRSPfPD5hVKVL2iGu8qSxK
+kkLZkwrGL9U/1mXtcajUpz+r28iLP4uJnCxt9ZBVIcg=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP2subCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP2subCA2CRL.pem
new file mode 100644
index 0000000000..d2e6b8d3db
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP2subCA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxTCBrgIBATANBgkqhkiG9w0BAQsFADBLMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEbMBkGA1UEAxMSUG9saWNpZXMgUDIg
+c3ViQ0EyFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSME
+GDAWgBQXLOoDuAd3gT1lpb8zH8x60pj8vjAKBgNVHRQEAwIBATANBgkqhkiG9w0B
+AQsFAAOCAQEASUNpb/KK0iBuFV/Y7HRxjqNfJAhSRjOxNrEMtuql/YucrqQKFs2f
+AcbNwEWPPdW7KEd2bhyUBlJJ1g0mWCPu+bHNv9IND3bsioXiStlDblymVm/ShJ0i
+f3VWT47L0Lb6Ppye2r+A486Q468clSbDv2pj+vAPqFqUaSr5iN+Y/WTxUtAs34Dx
+qDRWP9lye1OzlLnMJSf/ZVYHdS/KmnsR9YIIeI7pNqtPf9ilDBe6Va51tpVfHnp3
+OLQersoyyDApH5KCQQv0/+4EPqZjmAcO+ALDg4Q92vfzbULImJW6rMD6dlEtITlu
+iful4K0ey6Jngy/6qFTtI/jJgzNmxsR6Zw==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP2subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP2subCACRL.pem
new file mode 100644
index 0000000000..02c8fa43d4
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP2subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxDCBrQIBATANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEaMBgGA1UEAxMRUG9saWNpZXMgUDIg
+c3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQY
+MBaAFF48hHOeMHBycZiugTYZ2yIOfK8DMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEB
+CwUAA4IBAQAIgjc4iT1LVOUqEO9SLZgx9MpR4Vt3gTa3JciJH+czDui7YgsT688m
+8/dqZXCxTkt9JYPQGABYYhwxsQC2oyjG2jercknnJ+XHk4JV2wN/XO9ItNhI+OvA
+rnKtzk6Rpf7pS3SSjeU3XR5UIOiMM2JoWGvtUhwq7b5RaLk36Z0gGp9x/3LaGDBA
+FTred1LnWgYQCO7jTGWfDT4xIJr0FqA1RNLb+xvkmA1lmhjZ20lw8HXHgFsfvb4L
+ADFkLzFQ6p/zuleXBDe8U5lusCqjls0cTaiNCdpPXuJ1I4hkPYu0raquxjC7VoM8
+LWcIpRna9gUu8sSD7k7N+NDdQSM+Op+P
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP3CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP3CACRL.pem
new file mode 100644
index 0000000000..0eac63d37a
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/PoliciesP3CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwTCBqgIBATANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEXMBUGA1UEAxMOUG9saWNpZXMgUDMg
+Q0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaA
+FNgFqyygi8OS3Mataj+/88aY5dz9MAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUA
+A4IBAQCwxaqJWjJraTqw0xo+dvcx3uD3LYUe9aJqKvZTbNqLT23k7U62qcWUz59N
+Rprnl0q9aemI80Mk/Vk4WAr9weTsOytXrNML4Rgk4Sb+WjU4OSlUZbBka1YS41Y4
+xiZzhQYrL391uyDD/FLsehWJmkO9JqeydLT1A1lAuX9m3f59PJ6waXJMMwySszDI
+T2e56JR6Vt3659YRpNScJmDKWc3wdHagNvmtn4Z/c+TtO+JN11doMwx/92uV+nic
+GVVPJQqKZDvNfK/hLxBo3nKBpXJUrU4AyYCbpe4idc6CxYMAy95UqUlFV72pnndm
+E5RRfI4x2a+BTvs8HNSX3LpruISg
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/RFC3280MandatoryAttributeTypesCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RFC3280MandatoryAttributeTypesCACRL.pem
new file mode 100644
index 0000000000..49582a3282
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RFC3280MandatoryAttributeTypesCACRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICDjCB9wIBATANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExEzARBgoJkiaJk/IsZAEZFgNnb3Yx
+IDAeBgoJkiaJk/IsZAEZFhB0ZXN0Y2VydGlmaWNhdGVzMREwDwYDVQQIEwhNYXJ5
+bGFuZDEMMAoGA1UEBRMDMzQ1MQswCQYDVQQuEwJDQRcNMTAwMTAxMDgzMDAwWhcN
+MzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAU8FEYYu/OQce3sGd0awK8Mgoz
+meswCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAFqTS/IzHJiqF28DiO+F
+v++AFZ/b8cYN6B5eoSoZYBg2C7pV+5UEL0+hQlper2e6TUIEkMpSU7Y6VWc2okpS
+YR+2bNCsIDX/RB2DYzyEGgqwoBmbeTCE/bIbcxjoSUOP7YlI4wD4XgOISwVOBZoK
+Mc+341k1iHhwI0OFHv3XVHqwegy5RVcgYhWcq/H9ARUvD3+a5HDdBGTCP4r8aCcD
+46zDEsBRYVJNPsyk4cnBsR/8nh8Bufy8PWuArb+s1ZSQ0PMgtwfrvqPCM+wnl/+Z
+gN3UiKvlBG2lSrTxhOelPGvoNZrr6Z8Uw8rl1EXcLvPTJsqR17snRwWCWLR6ewAc
+XbI=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/RFC3280OptionalAttributeTypesCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RFC3280OptionalAttributeTypesCACRL.pem
new file mode 100644
index 0000000000..106a0215db
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RFC3280OptionalAttributeTypesCACRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICGzCCAQMCAQEwDQYJKoZIhvcNAQELBQAwgZ8xCzAJBgNVBAYTAlVTMR8wHQYD
+VQQKExZUZXN0IENlcnRpZmljYXRlcyAyMDExMRUwEwYDVQQHEwxHYWl0aGVyc2J1
+cmcxDTALBgNVBCoTBEpvaG4xCjAIBgNVBCsTAVExEzARBgNVBEETCkZpY3RpdGlv
+dXMxCzAJBgNVBAQTAkNBMQwwCgYDVQQsEwNJSUkxDTALBgNVBAwTBE0uRC4XDTEw
+MDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaAFJtubz+K
+p/TntYwxW86ZS5EcfHy9MAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQBB
+32Yrko9n8ahvFVhspRmxscM7BMFLDBPKByEzJomnbztKvfw1bn4lsO39UIuBQgbS
+u+w1ZEnc3FcTvU0KjPNUA8e3eiuRzhct1XtqCPo7OmtFZDP7HQaCC0M7bxLiD56K
+00ww0RoiC8Vx0TI8+A+dZIQH1g19xShQ2WGquQLC26Wcf4FeXCTS/aaPeCGurbKD
+RBpShJHmZ2zFUZy0Wyu/FG+LMQpJf/ypy5dzYO94rHYMOdjfk4q17d9rLbtzyIZl
+GIOuZHdlBJi1uVKKOWFJHc1KIEbf2dc3AOfRAcZnvWZ9cBJpm51VC3FNPjqBtxVm
+OSHxymJkNoLCs4Rr1cCL
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/RevokedsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RevokedsubCACRL.pem
new file mode 100644
index 0000000000..f07d7b88bf
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RevokedsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwDCBqQIBATANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEWMBQGA1UEAxMNUmV2b2tlZCBzdWJD
+QRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAU
+lm+SmaDpdnS7X9T4+xnZzx0FoO8wCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQAD
+ggEBAB+FPq0gPzR/ldksUu2y1NFGBtliXqr8+2YkuC3znY6aUv+jZG4MgXN/m30I
+hs7lxydqbF2ubdw6Er9PhmvJcnH92BREyAAUHt3zzHbCK8WKmwdofIK/tFrXr0XO
+eGPfmfmm8oHJREcNQ2ftaCvq7eTy61KqVno+p4KNKLPxWvR2uahuhFxgIXZlJVQF
+lSIPCEPGT+t+tSxFQ7RevCv9jl9KFIf8hEWpLxjxY44uucZlQaLFV0oRiiuB7Cq3
+xYM0xa8uZ5/xuBu9MJ1TKg+LWqp6dwd3BRo4BxbBHOwNeUJ+PtaR23AAoiL7s5mt
+bsFxXB0TfszCLEmLmFFfkuB6m6k=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/RolloverfromPrintableStringtoUTF8StringCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RolloverfromPrintableStringtoUTF8StringCACRL.pem
new file mode 100644
index 0000000000..912b6c8b8f
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/RolloverfromPrintableStringtoUTF8StringCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB4TCBygIBATANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVUzEfMB0GA1UE
+CgwWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTE3MDUGA1UEAwwuUm9sbG92ZXIgZnJv
+bSBQcmludGFibGVTdHJpbmcgdG8gVVRGOFN0cmluZyBDQRcNMTAwMTAxMDgzMDAw
+WhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUtW1PKD/Hu7GYpKml0Khb
+Xkp0s+cwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAFPDLO8fJtAH7E7z
+iHWXjzFLzoHGbLXSioC2TDR+Fm3hAOwdSphltknYwSxA0SyKeru8c8RVOu0fd7dS
+CaXmFaYL9CE4HREg1zFtuSPsElkhuZgi5N2cijO4oXUgdJsssFe3O/jWTBixJONF
+ZoAu4pjxi1mcNYDK5jn45jB25RNnjvhTm84I0o5/RQOp9vzpT5V60F3npWI8m7PQ
+UswjVucpjvslv2rPZEN5DldNgg+/W/qElgRFa+loYjeJyYRftsknzt8F1g2fzC7i
+k7fJTv0ZgFOk3tdUZhFHC3DNcwb6uscyTEdodNzaPhqoNHgUBdCqbUq0zZQXsIz4
+Sfp0ZJk=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/SeparateCertificateandCRLKeysCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/SeparateCertificateandCRLKeysCA2CRL.pem
new file mode 100644
index 0000000000..e3b1f68960
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/SeparateCertificateandCRLKeysCA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2DCBwQIBATANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEuMCwGA1UEAxMlU2VwYXJhdGUgQ2Vy
+dGlmaWNhdGUgYW5kIENSTCBLZXlzIENBMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMx
+MDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUE4Q9hI8eqnyBd18x3c1g85eX2bEwCgYD
+VR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAKN55WtVRJBOZvbUAlZXukKilUzr
+4Z8lHcq4fiql8hc6UUhmYAc/7MdfDa3NqgbUoVg7aUngm52yLgXubmnMztA5Vqum
+CXiNSmJ5AVWh7GCs8pdMHFLpFqnh1y4RTpt4AjYFC+xc18gSrsyDKWv7YEYVyQG7
+GHA9JEMm3SpSgh3B872L+neVTTMrO/bHKl54QGGp1tasaLdTkRVB/002yGBraVvE
+zfC7szqOc5v0tl4e3VrUBcNfn4QTDvl5PfrovZdPJP3Ys7139K38+kT/2YwCJ6M4
+EOAhyfzVSTgvuFoB+UlYIt10c5GA7J7pDJr4PCGTzR1K7XesSFuZCbD5Ddo=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/SeparateCertificateandCRLKeysCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/SeparateCertificateandCRLKeysCRL.pem
new file mode 100644
index 0000000000..9e3ca350cc
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/SeparateCertificateandCRLKeysCRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB/DCB5QIBATANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEuMCwGA1UEAxMlU2VwYXJhdGUgQ2Vy
+dGlmaWNhdGUgYW5kIENSTCBLZXlzIENBMRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMx
+MDgzMDAwWjAiMCACAQIXDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaAvMC0w
+HwYDVR0jBBgwFoAUcopDCwRbPT3EVeGDxp/fkMrq914wCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBADQCnzJmc0jLQFb6EQ2iJDMcxrSuJftSikSCoKvuRTTH
++4cqd+xjh+kkZ1FCCmG6mY/hlnLTlKYqJlrJuu/vhHZP6XYwqkrtyx23ORmAOyq7
+SAuTvPBOPRo9HyvVWWHITgAKA90A0XUK+/zg1MRKgqqslTOaNXCqhu+nvshCtLx6
+MLsCYH5LVs3GimWfsT7wSpF4cqI4QyfZLJDtGz++9M7s03LvH6QNfQ0qrSaOdCfk
+hsdtNEzNFOOy34JejUZIDie83zj7Vgr1v6Gx+c5xkoDemggV/wzLYi7Si45JQBrJ
+trqjdLNOoS7QFadH/Vw7zL06Fahe2uUOOsXac76NQl4=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/TrustAnchorRootCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/TrustAnchorRootCRL.pem
new file mode 100644
index 0000000000..114e6e1cbf
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/TrustAnchorRootCRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB4zCBzAIBATANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEVMBMGA1UEAxMMVHJ1c3QgQW5jaG9y
+Fw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaMCIwIAIBaBcNMTAwMTAxMDgz
+MDAwWjAMMAoGA1UdFQQDCgEBoC8wLTAfBgNVHSMEGDAWgBTkfV/RXJWGCCwFrr51
+tmWn2V2oZjAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAqxkdtbsha7bh
+TM3wtzeelTjR1IGQgK4R8Psc2fw2NOydlq8PeSc3qitHV6m4dqHzchQlytYprOK4
+dRitEh+RYY4UKUNu+OQQ5VFLSvuC0Wv3xn2w29VqpQtavBFfJ8Lst9520pece6x8
+6fB9L6VP4YNGIrLc+7hEjEDALJs+ttPoxNNXGMApQQi5xyZEksXQAo60ZdH/r95l
+dVCa7U2OVXO1MCuZlWQRlql0Bi3CzE26cW1jccEdU6yQ0ONKNuROR+6NsXZ2Qm2C
+lHEGWFJAZ/CWB7NjQ9maNkoioZb4IB2AKPKBcb0mT3TYspgT8zcZSP5DLC8iVOrc
+x2SLSvd35g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/TwoCRLsCABadCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/TwoCRLsCABadCRL.pem
new file mode 100644
index 0000000000..526eb1f6e1
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/TwoCRLsCABadCRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB7jCB1wIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXQmFkIENSTCBmb3Ig
+VHdvIENSTHMgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFowIjAgAgEB
+Fw0xMDAxMDEwODMwMDBaMAwwCgYDVR0VBAMKAQGgLzAtMB8GA1UdIwQYMBaAFBCh
+AdaZnYDjbf3n7ndLX/FJ2TxTMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IB
+AQB+8PsN24d0Zz4YP749N8IiCoLpju5Z7O2yP6C4n3XwSRKExXK5ROwg9adTW556
+L44a0aChbR1b7Mnz/du0vx67O0D6hMRhS7ICuiI+pkpovJsVnT2QdObWBlls2Bic
+e+iSX+eIlXHcURQc0ZkhvKiiDYgxeSo4RvxknjaauHKdIA1DQC1G2IFU+Izjg7j0
+pS5yeLaGtz7azDmrChRrP+XRCDjsSuihtS9dtDRTyUwRYjhU6plkHjjwvXaFh3EW
+ZQWN0LVL7m7M2MtXUPlKYlEG8SpcrfBS25aBg4tRLRo8w/iWY0Z3HcRYYj9HiZhU
+3Yo0R0Z2apWmbVVmxNJQy+jA
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/TwoCRLsCAGoodCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/TwoCRLsCAGoodCRL.pem
new file mode 100644
index 0000000000..7bffa1d5cd
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/TwoCRLsCAGoodCRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBvjCBpwIBATANBgkqhkiG9w0BAQsFADBEMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEUMBIGA1UEAxMLVHdvIENSTHMgQ0EX
+DTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaAFBCh
+AdaZnYDjbf3n7ndLX/FJ2TxTMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IB
+AQAWgigQQEvB+tF9ELpYI007J23N+XwGsg5vz8wIxMsi5Sa3NDkUCZ8ByXClFLRp
+zIM650GcrIDpZCHPhfgT9bU2b2LX/4vVdSy/aI7tC+nd70UPKeH4SU7sVwAJmKQD
+NRnWLJp7VXl79yR51SEMKrwNpgoFmblJHKcLyNr8NrwmLmS/5mpGaeri0bEh53cy
+Zv9dvJI6Nvh30wbYtcEtURtCSHWYlIYs8cQML4IsYcQbWSX8uS4XqSnaUVwYKtFT
+HdUX46XIkuGdKeExJKbWXb9R9JJcCG85Qn+mfX+Z0XatgOxGpmuzJ/JbEqxPS+w0
+25GOIJTaYjoDxoOmVIpJZGcZ
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/UIDCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UIDCACRL.pem
new file mode 100644
index 0000000000..c94eb68a11
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UIDCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBuTCBogIBATANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEPMA0GA1UEAxMGVUlEIENBFw0xMDAx
+MDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAWgBQQP8UEMPHY
+QzaFeVyMjYud7i8cqTAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEARJT8
+6342NMtFGT+8uvbJJ26LNypeqnke2LqSnfunR258riLofJj2E5r1NS7Ew5YjWdZH
+3BiwowR/IRuFqlj1l7gDB6L9YFVbNuJrC41UxIBzGMa2zHtTXxe610TC987XcbbT
+O4ccPzvQ3MEfiY7odLNkOpKfOHUTgOvPfpo/8X/jofZp0kBTH7q31S4XKH1XHBab
+H2kyudXTJmNkSXOdXlclPdZ1wdtt5hi/i5mYMQYnwVgQoburqiAt1LurPrOi6zgK
+JmfT7ELdKocAa0nRCBMMTZLknEAVubFfI1ViKGMGwolmVIQjlJrI7h6RMh4bUEVI
+eDsOknaIs9a+DRxKNA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/UTF8StringCaseInsensitiveMatchCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UTF8StringCaseInsensitiveMatchCACRL.pem
new file mode 100644
index 0000000000..a6c2055e8e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UTF8StringCaseInsensitiveMatchCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1zCBwAIBATANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJVUzEfMB0GA1UE
+CgwWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEtMCsGA1UEAwwkVVRGOFN0cmluZyBD
+YXNlIEluc2Vuc2l0aXZlIE1hdGNoIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEw
+ODMwMDBaoC8wLTAfBgNVHSMEGDAWgBRg3xjRyqlQkhEXIUTSd/Vqraa+eDAKBgNV
+HRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAfnKj08ZVDYA3KZCzOUW4VvkN0rgV
+qYukj5p80KK3oRJtQjiMB7M+BrG/Nu2ReWIrB2vSyryurZD2QeTcJOr68b0I/VLV
+uz4/b1/AlXgvUywrMiaXKrW/dApifr70HDghgvyCwQ1SDST/jFNBmrC//H61A3NG
+PenyRN+GkvTzlOIoJcqZ4PRX7J28D9lesW4m8Z+k7o/mF0c2F2lBMG+yzTh9ZB5W
+eaqvmY63gKTu3GRUHET6/SE2HI1fgioVFPDutr5b1uh9ACA60X+Lkg6MBhPqPGdY
+UQXKBt92Nd1aHg18VydBY9+6yBEvlQfpZyaQ/Sx7TL0SSwzKlcGDwXvVXA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/UTF8StringEncodedNamesCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UTF8StringEncodedNamesCACRL.pem
new file mode 100644
index 0000000000..2bfdb97dcc
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UTF8StringEncodedNamesCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBwDCBqQIBATANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQGEwJVUzEfMB0GA1UE
+CgwWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEWMBQGA1UEAwwNVVRGOFN0cmluZyBD
+QRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAU
+O2dbRPINp0h9cymMk5/VJOMSYCYwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQAD
+ggEBAE2uI86u6pYfkenx+nHcN7B8ymkICJpPJlIqNfjteDVjwz9D2ra89nHKdXRE
+83ftELk0cXxN4qEuylBI+2V/WUNjll1VsTqvRSGDFu6KhjZHEjbdGHu2Z+tT7E9a
+72X3hxYJEDycSTlaR4OvFUWeKksPaKXt6HdhV7AQUHT9KbewgLDekpPKj1O1tjzs
+/NN2mt0mBqbm9dzi4oL2PezZLfEOpa1BXQR9r37HWKmDxO4SixOGNaOd+jplpzhy
+PDqftcMmgRZnKesEvKcXul1GRxreqhaF+dlvluKwzRgC9Z0x8iS8HyoqlCzdGy8x
+OuRJvqqfg0aPDn/waUA0pF7Qfwo=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/UnknownCRLEntryExtensionCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UnknownCRLEntryExtensionCACRL.pem
new file mode 100644
index 0000000000..dfee3b2056
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UnknownCRLEntryExtensionCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIICCjCB8wIBATANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEnMCUGA1UEAxMeVW5rbm93biBDUkwg
+RW50cnkgRXh0ZW5zaW9uIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBa
+MDcwNQIBARcNMTAwMTAxMDgzMDAwWjAhMAoGA1UdFQQDCgEBMBMGCWCGSAFlAgEM
+AgEB/wQDAgEAoC8wLTAfBgNVHSMEGDAWgBQAphnLoS1NKC8i89JMN8//TDDN6jAK
+BgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAIGIA0Yful35UcVgnqPFFJiLX
+VB8WXGbleSexbAb9EgxCCpffOaMuaq51McJ+Rjspyjmn0SEnbnpeKmNbmYtnQjn0
+OxNp/Yy5ZwjufitxKb9JgFLBhfpJ2BU9H5MgPEmXA+aZf5ojGPh/2afwJKE/9H22
+wemiZlYlpA5aN7PYqWHfEPE2bd4Ey7RHleuCRpfDHx2EgumLSRYjm9q++THgGOgu
+C59aDH3vvuAItfh9eVHTYxxjRm9kjIC/RCrCvQRclRGN/SoPDBys9RQxv1iklvN2
+rLH+Os+0BB3L67GMsAFQhWXCFU6U9Yubm/mErDVFOwsmuMNNKgojKkuqAhxZzQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/UnknownCRLExtensionCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UnknownCRLExtensionCACRL.pem
new file mode 100644
index 0000000000..8d7158e411
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/UnknownCRLExtensionCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYVW5rbm93biBDUkwg
+RXh0ZW5zaW9uIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaMCIwIAIB
+ARcNMTAwMTAxMDgzMDAwWjAMMAoGA1UdFQQDCgEBoEQwQjAfBgNVHSMEGDAWgBT9
+//4ZTdsMncWi2IJW67DZEGHjMTATBglghkgBZQIBDAIBAf8EAwIBADAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOCAQEAsguh6rQBEGU98+Fqtl5R79QDu51NuNZF
+H2otyBt8ZPFJkif8J/pquv09GgIMFsMbAtMGkVPNYEjnQ6MHSWYE2SxTYeIfOnQb
+JiED6NtncdUGsoXt2g+9gJTDdVPjl8z9p1j1QEdp6c/XEj2gEVGDkM2iAy/3QImN
+kqrG1n1QtiAOUQ1oZoIk6NnGfAvRQ5/eNZafTa7vm805Q11tE6mT8XwbUX9Cs/lL
+X5h3h7DATdVfDPYwac9NZ8rrof7FQ/jXB4p2P5PM/U2vqEM8YTuRhW2w+jGzBFY6
+ef7bd7LrSoWExjczcmVuIZDqrxYsdAc4TJbQUm8B28FkdM4NzVo2Bg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/WrongCRLCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/WrongCRLCACRL.pem
new file mode 100644
index 0000000000..114e6e1cbf
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/WrongCRLCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB4zCBzAIBATANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEVMBMGA1UEAxMMVHJ1c3QgQW5jaG9y
+Fw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaMCIwIAIBaBcNMTAwMTAxMDgz
+MDAwWjAMMAoGA1UdFQQDCgEBoC8wLTAfBgNVHSMEGDAWgBTkfV/RXJWGCCwFrr51
+tmWn2V2oZjAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAqxkdtbsha7bh
+TM3wtzeelTjR1IGQgK4R8Psc2fw2NOydlq8PeSc3qitHV6m4dqHzchQlytYprOK4
+dRitEh+RYY4UKUNu+OQQ5VFLSvuC0Wv3xn2w29VqpQtavBFfJ8Lst9520pece6x8
+6fB9L6VP4YNGIrLc+7hEjEDALJs+ttPoxNNXGMApQQi5xyZEksXQAo60ZdH/r95l
+dVCa7U2OVXO1MCuZlWQRlql0Bi3CzE26cW1jccEdU6yQ0ONKNuROR+6NsXZ2Qm2C
+lHEGWFJAZ/CWB7NjQ9maNkoioZb4IB2AKPKBcb0mT3TYspgT8zcZSP5DLC8iVOrc
+x2SLSvd35g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/anyPolicyCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/anyPolicyCACRL.pem
new file mode 100644
index 0000000000..d8cd6550ee
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/anyPolicyCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBvzCBqAIBATANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEVMBMGA1UEAxMMYW55UG9saWN5IENB
+Fw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAWgBS7
+yd7IHJXnQuKQoo6uA1yrJGB+hTAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOC
+AQEAW7i6zdMI6ytGpku8kYKf2WVx9tqIMFh+vvcagsWR/9oPNp1kXgdfv/tfRS9F
+JRQ3RVYaKY2bWDVc8ISsrwZpBMe3RjfDEdqAyuNcy4B/C+O7OAtyNinAvtsYASAU
+gfDoW3s1V53iLbLDfY1uRCq7F78dHwjuuIob+tpHFR9EVUx3MgkPAyq8oLrbDdaV
+FAsq2XTgry00qj82bR0rSY7UdNMOhDy32qeoH4ZEEh0XHdBEM3xuMjwn6x6J2SiV
+96FDpO+UNcTr/VeV9sx0xJAJOqmSU+e8nL8FKCGhm02fI9CIZBV4TOICDgacRgOn
++aSLkS+XcWlyrkZL2FakdOWiXQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsCriticalcAFalseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsCriticalcAFalseCACRL.pem
new file mode 100644
index 0000000000..b5726c158e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsCriticalcAFalseCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2DCBwQIBATANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEuMCwGA1UEAxMlYmFzaWNDb25zdHJh
+aW50cyBDcml0aWNhbCBjQSBGYWxzZSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMx
+MDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUcN9ELwOZHBdzGPI2PBQ00AnR8u0wCgYD
+VR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAFaK4KYhrGo/o9KPU/OnZGglN4vq
+uuAH6a9XjvSUA/de1oHyAxw6rgxrjBo1pgtdLgSqXuYXMeqyVjZV5ew58wd7f0vG
+u06a6f3TOX3ScNZYY9/u1VRsX8/y3kKUg2+EQdr7vYCjhSIc2SLqpAnku150OwB9
+GZG7y/NRjqX9AyecyCJm16G/w9fA4+tndtvBvvDIwYn+LGrse5cgka4iR+CWzsIj
+cA17nCnhg3n88NSXrIsre1LI1YBKEHrIqbTpDglDxtJcdTtF+5/new5L+vftj0Rv
+8bR8NQPo5DBNJ5C9GnCjQgVSyMnQNhD3+LUDDScGs0QVg981FI6tusPFZpE=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsNotCriticalCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsNotCriticalCACRL.pem
new file mode 100644
index 0000000000..3dfeb7ca4c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsNotCriticalCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0zCBvAIBATANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEpMCcGA1UEAxMgYmFzaWNDb25zdHJh
+aW50cyBOb3QgQ3JpdGljYWwgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAw
+MFqgLzAtMB8GA1UdIwQYMBaAFAqkuTBDrEPINAITz+9V6L9wn0avMAoGA1UdFAQD
+AgEBMA0GCSqGSIb3DQEBCwUAA4IBAQBY/ZWklRmCU6F7pRzO8mrG3iaF2gp4Qyse
+QLf/yzlYy5XdbwzhwiClQ7EwxA9jaGD8EKopJL9sMh53QBZFivrXUP+O09cHRlMI
+SCyonmbdvnOUDwoky9YY4KrC0YI+mhbOpe6LQJcRgj2ge5C1i+UsQmUZapOUvXaI
+f5rc1TlLg4mlxYSQT9jnLV3aAwt4i6cwitTkpbYPolvjsHqfRQ2/aLLd59SNnIlv
+pdso7IaAW3aoo38dJ8ZyJZBwNAwR3dmi4oIOivHX6FwDgxNdhVIN5X/VsMeNbRu/
+mD1HePYlexWjcMfsVRx9oVsIVoT0i8dAXEnefM7n1XOadWnaW8Di
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsNotCriticalcAFalseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsNotCriticalcAFalseCACRL.pem
new file mode 100644
index 0000000000..36b9df8549
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/basicConstraintsNotCriticalcAFalseCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB3DCBxQIBATANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEyMDAGA1UEAxMpYmFzaWNDb25zdHJh
+aW50cyBOb3QgQ3JpdGljYWwgY0EgRmFsc2UgQ0EXDTEwMDEwMTA4MzAwMFoXDTMw
+MTIzMTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaAFDnQm7dPKTe+07CKdupqns3vRr5Y
+MAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQB5jwS9LsJUqzevwbstTFfJ
+TrsCQBjg8kn30zn2Yi0+ff92y1zfpzK3MSFfq9olKCKSpoKdwgLTZVXiHsO44X4d
+cIzo03knrnXX6wAQH0b/GXlbvQ9fEZaylTxMV7mO38UgIs9cWXdqjlsgAy37qOBT
+L5Dn2xUp2u/+QcbwyLOGP7/shriabGHlepclCQI6BxIor8gJz2zCxtovV90j7WL0
+8nF8wMwVv89hu38b92uORIQDamYDRTigiOYS5FPTirqoReA9lUdQ+hd3KaS1S/YE
+w7fmNEbkdCMg4hHAYnR0xW54Bp9bea2ANRJmdwUCz930q3XqPS8OJt/PZgOAmdYa
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA1CRL.pem
new file mode 100644
index 0000000000..338d64cd37
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA1CRL.pem
@@ -0,0 +1,16 @@
+-----BEGIN X509 CRL-----
+MIIChDCCAWwCAQEwDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExFTATBgNVBAMTDGRlbHRhQ1JMIENB
+MRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjBmMCACAQIXDTEwMDEwMTA4
+MzAwMFowDDAKBgNVHRUEAwoBATAgAgEEFw0xMDAxMDEwODMwMDBaMAwwCgYDVR0V
+BAMKAQYwIAIBBRcNMTAwMTAxMDgzMDAwWjAMMAoGA1UdFQQDCgEGoIGKMIGHMB8G
+A1UdIwQYMBaAFHcYI+V2hMgUlD+C0IHqdLHgpC8zMFgGA1UdLgRRME8wTaBLoEmk
+RzBFMQswCQYDVQQGEwJVUzEfMB0GA1UEChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAx
+MTEVMBMGA1UEAxMMZGVsdGFDUkwgQ0ExMAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEB
+CwUAA4IBAQCEUqY7TzVnZWYlyrtBszCIhhTKhr7tH5UHvoZkNs8lzeBMqtUDZvd6
+o0mB7WSv5R+t8tGleNhn4isudltqLAWZxxZNnht04o3YZTwKS/NRNAinBoQfZnmw
+abMmledsFuF2JrA3XYOZ5NWdlah8/MPUAKRoI0Dw7qxmLL/exsz5OAKh3qjXlzwJ
+Bdm4CYCO3DH58BQk6oJKVlqCY3ZsCuvtvjNHnLpkXAKRQ+t/OsHWssYkEVX5FizE
+WE6G6XMMcQtb2gN0QwzO8o3xyFGYyy1gkEuB+yzmqHqLYTlRZd5IvRxYYoqHbrce
+x7ROIMJEsNFw5k+b7qWYLo703GOsCxD0
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA1deltaCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA1deltaCRL.pem
new file mode 100644
index 0000000000..4c306accba
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA1deltaCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICWjCCAUICAQEwDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExFTATBgNVBAMTDGRlbHRhQ1JMIENB
+MRcNMTEwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjCBiDAgAgEDFw0xMDA2MDEw
+ODMwMDBaMAwwCgYDVR0VBAMKAQEwIAIBBBcNMTAwNjAxMDgzMDAwWjAMMAoGA1Ud
+FQQDCgEIMCACAQUXDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBATAgAgEGFw0x
+MDA2MDEwODMwMDBaMAwwCgYDVR0VBAMKAQigPjA8MB8GA1UdIwQYMBaAFHcYI+V2
+hMgUlD+C0IHqdLHgpC8zMA0GA1UdGwEB/wQDAgEBMAoGA1UdFAQDAgEFMA0GCSqG
+SIb3DQEBCwUAA4IBAQAFVo99MjLWWcc8kdu/qveAAPZgvgHBAQqOygCNbu4J704l
+Ab9wHTJoNvghxK7iGsCGd2O7l1ODdooPWNcY3NVkY2soZmevk5F19MQX7fr4HrLp
+Dtcdfbby1PG2TX0MttfwpGDh8yfO1SFjkclmoP8f1f8mrmulJcy/sXK+H478JHO1
+lycEzMsvgGj2HCZvRziR+g3nH2AVMra4r6u+oo1ctwcWWGRkhfuyeBBJWDMh3T61
+gIbdB+Atjs3QBscvjPdU+F5XyuaBLbwEBYJOoTeSKTxfDVeYnPFghHyenItJsmII
+5IPocdTk/6/RB0wtDlMQwjNUXxe0/3WoHVy8bUQZ
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA2CRL.pem
new file mode 100644
index 0000000000..b4090dfee4
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA2CRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICQDCCASgCAQEwDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExFTATBgNVBAMTDGRlbHRhQ1JMIENB
+MhcNMTAwNjAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAiMCACAQIXDTEwMDEwMTA4
+MzAwMFowDDAKBgNVHRUEAwoBAaCBijCBhzAfBgNVHSMEGDAWgBR82Pa+A0zOz7c/
+oRm7M6u11437xDBYBgNVHS4EUTBPME2gS6BJpEcwRTELMAkGA1UEBhMCVVMxHzAd
+BgNVBAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExFTATBgNVBAMTDGRlbHRhQ1JM
+IENBMjAKBgNVHRQEAwIBAjANBgkqhkiG9w0BAQsFAAOCAQEA57Gy4XXEzOgR+KG2
+Yc4w8HgmX79ERY3s082LNYuSwFrA3D7hoCa+tX8tuXbF6Kgb+wocIFROzk7r+ZIp
+PegSzJQcKWoVCQiuHUfBt3MVZLojeM4n8ThfMbPOnf+Si+V4YgEcBGcgKt/pxEnZ
+d1dJu+rB+TSyUk4QuJ5X2DJn4ne+2Wf6mzoZKakJp61aDD5QxysbN/52R9QR/wdg
+awyL5mtu/8U342t+4sFbLm7X/pyDcPkp9on2ORsKGIBGGr3QoHItIAZn2ghPsT6a
+5YYcJOUm/pZwBeKoZyQ+s9Lhon5HOWs5aE3KwFdS5vo1zpB2Ps9Sv4ud2+O135oG
+tuFQTA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA2deltaCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA2deltaCRL.pem
new file mode 100644
index 0000000000..d305bae0ab
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA2deltaCRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB8jCB2wIBATANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEVMBMGA1UEAxMMZGVsdGFDUkwgQ0Ey
+Fw0xMTAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaMCIwIAIBAhcNMTAwMTAxMDgz
+MDAwWjAMMAoGA1UdFQQDCgEBoD4wPDAfBgNVHSMEGDAWgBR82Pa+A0zOz7c/oRm7
+M6u11437xDANBgNVHRsBAf8EAwIBATAKBgNVHRQEAwIBAzANBgkqhkiG9w0BAQsF
+AAOCAQEAWX5v6H6qmSiro3ZgYkvIi4WDhAzCpjMNElzQ7rs+mPh/1B/2CSAv+B9Q
+RXHJvMYS0XEwfvTy3N5vAhY6QMNhPKJcepJHVmng0NMOBn3DMJJ7nobJKAA95ls8
+/BP+nNjVHoq7RnLivTxvXOijGGCJACg3st64CByuwcbNcJdEJkI0usFnLEoA8W9Z
+G47VSzeORnf3EmA4IZERhS7NY3+91CDRb8R0CO0u8sVVPPWMltdN0WYSnQA9D4oV
+hOEunai3vsrn7DVSsoTrIWz7zxgIgxk+6sfaWhGIKVLW34lIdA2geMWt446/maWg
+E/O9OWirLi1qY7bp8BcCUe9UL/cfOQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA3CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA3CRL.pem
new file mode 100644
index 0000000000..084e49127f
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA3CRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICHDCCAQQCAQEwDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExFTATBgNVBAMTDGRlbHRhQ1JMIENB
+MxcNMTAwMTAxMDgzMDAwWhcNMTAwNjAxMDgzMDAwWqCBijCBhzAfBgNVHSMEGDAW
+gBTvY9OoTrH532HiDcMFo5gY0pOZ5zBYBgNVHS4EUTBPME2gS6BJpEcwRTELMAkG
+A1UEBhMCVVMxHzAdBgNVBAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExFTATBgNV
+BAMTDGRlbHRhQ1JMIENBMzAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEA
+XB3lEAs1DWFKrU3BzflSTtmiCa5KzMZrXpDmqHt7+kWNjEMUS17TsvkrfGWOcEFJ
+9MzmGUqAuD9Z0q5kxVVNRuZhG8K9U+biCmMVFtKzxFGbz/vJkcKaroB/ukiqNQlv
+DTSKebUJJm5g0rc06LVGic+YgK2pcCwm4BsdmcCEYV3mlIhUOUA48Ww0WemFKPTw
+9A1V3URGpOzrMJYJOJff0IOVjdyGwSc+xHCtbJG4xV+/Qe1/9yYn+RqHQXUo0C7D
+GJNSr+OcpXX8urZQp4ZVQRz3OTs4eb2xRK1ZPj9Xhiv98iZwo38GaFGvMhOHv7gv
+C13eDAq4KnlQgz/wpxmHog==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA3deltaCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA3deltaCRL.pem
new file mode 100644
index 0000000000..db02c94369
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLCA3deltaCRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEVMBMGA1UEAxMMZGVsdGFDUkwgQ0Ez
+Fw0xMDA2MDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoD4wPDAfBgNVHSMEGDAWgBTv
+Y9OoTrH532HiDcMFo5gY0pOZ5zANBgNVHRsBAf8EAwIBAjAKBgNVHRQEAwIBAzAN
+BgkqhkiG9w0BAQsFAAOCAQEAy7ylas55kqoznlqWS9cO6Q/EC7dPiZKF4Szp326L
+qCs4kd16Vbi3mhz7BP2iHSjO0AlaMnmGSYOlnzQEtuD6NlQB1RhuWH1kCWAaQPXU
+4K4nMJduHuGjopkIxnN8BGPfXGbeOJfl0FDQM84vkRCJ4Owq233JvEIDCEhdkYsO
+wQr+dUqPNkR1lz7fGtskqpe3aotkQ3DrS/1wuBRuTmXLKDZy63IdAe+TTp8yugnl
+9QEdYEXvMgLChLe57ZaOFVCE8349rkhikvnFWIfc1st2EsBrOaOwqFUrZReVg6qx
+wxDSf2FoINaLIX7ECkEBBmQh9SyEz8BXwaboI8z08ovRzg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLIndicatorNoBaseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLIndicatorNoBaseCACRL.pem
new file mode 100644
index 0000000000..781db0a18d
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/deltaCRLIndicatorNoBaseCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB3jCBxwIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMcZGVsdGFDUkxJbmRp
+Y2F0b3IgTm8gQmFzZSBDQRcNMTAwNTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqA+
+MDwwHwYDVR0jBBgwFoAU9Dh2Jauk4xzAyHWMjRNrYyO2ioEwDQYDVR0bAQH/BAMC
+AQEwCgYDVR0UBAMCAQUwDQYJKoZIhvcNAQELBQADggEBAJOY+1gmjxVv2D6HNyPt
+vKA7Gk7seNkgnSPoPR24Ao0znff3gjJGgz6r0TY7IIF+ddgjmu4l6BpkS2fN2Uow
+BCFEAD/0lK0RPtuyUCdbFiSHtNQlbpbxEK0iwDAw2YoYQZBP6qobz3IIjxIZjQou
+XlOIRoXE8Lg0QHFHQF58+Bs7Exk5kU8bwCalEL36OcGihMb9wXuuJTvSuXypU5v6
+kDwwrvxx06w9O2WYC8dqriObG8Uz04+Xt6alCmcj/sU2rop6BZMheZ8bKSHXCPWB
+FWIubsW25os4rHlxDz+DmXAcRCyIyrQxz9ERTDjPhKhAUPXz+baG38/oqA3bVMn4
+HKo=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/distributionPoint1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/distributionPoint1CACRL.pem
new file mode 100644
index 0000000000..dc27f6b6fd
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/distributionPoint1CACRL.pem
@@ -0,0 +1,16 @@
+-----BEGIN X509 CRL-----
+MIICfTCCAWUCAQEwDQYJKoZIhvcNAQELBQAwTjELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHjAcBgNVBAsTFWRpc3RyaWJ1dGlv
+blBvaW50MSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAiMCACAQIX
+DTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaCBvjCBuzAfBgNVHSMEGDAWgBQR
+MHO9jXAogtJvz9I37c3rI5Hb7zCBiwYDVR0cAQH/BIGAMH6gfKB6pHgwdjELMAkG
+A1UEBhMCVVMxHzAdBgNVBAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHjAcBgNV
+BAsTFWRpc3RyaWJ1dGlvblBvaW50MSBDQTEmMCQGA1UEAxMdQ1JMMSBvZiBkaXN0
+cmlidXRpb25Qb2ludDEgQ0EwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEB
+ACrxG+l579by89QJva16Yro3XPJ9lXu/l8cgQpoaHZifIG9TnaWxb4WFwSBIbOqp
+rbQW7N580RJBH2SqiiUmCu6Acg2ryKfywGULkFFd0ZYMBrhtHQe7T0SJq0NFtMlZ
+A9Vgia3Tqhiam3c1oJeZnETcn35b5qLAmr+EaRpXDT4Mflqwub0kgwal6p9wmuH5
+vs4dc98l/Ub+J+ve8yVmMVq/0YSGv5Z2IjX2V9iWdjcZPnAC3BaOMvm40zy5cOWJ
+FaXii7M41MgR4d8ZMQn/UQGb2CMypm207QW3yNbuI7+/0y0vxJDo2k84ktw6sAda
+dQBSIAUmYp0Rsdtg9TwZE00=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/distributionPoint2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/distributionPoint2CACRL.pem
new file mode 100644
index 0000000000..1ebde75c29
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/distributionPoint2CACRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICJTCCAQ0CAQEwDQYJKoZIhvcNAQELBQAwTjELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHjAcBgNVBAsTFWRpc3RyaWJ1dGlv
+blBvaW50MiBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAiMCACAQIX
+DTEwMDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaBnMGUwHwYDVR0jBBgwFoAURGzu
+229/605Jf3j+zeUYoOy7YGswNgYDVR0cAQH/BCwwKqAooSYwJAYDVQQDEx1DUkwx
+IG9mIGRpc3RyaWJ1dGlvblBvaW50MiBDQTAKBgNVHRQEAwIBATANBgkqhkiG9w0B
+AQsFAAOCAQEAD560RltKzGwM+LefEKN9n+UE6uNAoPwiNSYPGe9Qcu9WXsG11CqZ
+O1saNKTu0+bMx11WU3qRDyGpWZidaW0/x60RcSMR/X/RGoZw2hlixluvHpIBQwYf
+H2V2PE+OjNIeXBF9uEAV5KuBRb/Yre7GlCoXJM1j9WZRCHKwVYZ2xNog9R8STNs5
+fw4kynvydxQ6U8KjUxJeBmb6PiAf64Mcf9AXUCjakwAKJgw2zptKV75QrEEwpnVj
+sv7A5HqoMS7mLwPV2dznH+rHn/0IJp1FuS9YNs4L7oTyKZYlriy7U5pmsHHajGIc
+6g5+w/GiX51Emsi7RXjAvfpu/9MisG29PQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA1CRL.pem
new file mode 100644
index 0000000000..c9de28ecb9
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA1CRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB9zCB4AIBATANBgkqhkiG9w0BAQsFADBIMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEYMBYGA1UEAxMPaW5kaXJlY3RDUkwg
+Q0ExFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaMCIwIAIBAhcNMTAwMTAx
+MDgzMDAwWjAMMAoGA1UdFQQDCgEBoEAwPjAfBgNVHSMEGDAWgBQl+K/8r7apGht5
+S9vLZCyLS7EVzTAPBgNVHRwBAf8EBTADhAH/MAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQALqiVAlWG4BlkRVLdCVDqUtfpcaK8JLzEqoQUm4fS+Y+mdf9uA
+Q8+l8aQmcGeh/Gkufzp4bwsxkkxL81qTvuvDm4UV5q4TYz3aaWtzE/ewNWzLyLjA
+FQafw0u0ZTdXs5Z7R03DlwrGH27ZmMqjue8uV060HNTVUzWJjnSwxZ2FZ1gY6Rbe
+F0cmOk3ym2/1h61sWgBZRLG5vIGZkJe/An/pJyGL68bKTnyaPeYdKm0knt/yGGbo
+24bdwhzVLbzPIq6n8JCNWhO5r9pcmhR+XdrgddIpS341f9S41j82WGfwLCnc0pBX
+6PxVxMdDQ1qLQAbzCU3OCE98HtTv7IpDCUdi
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA3CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA3CRL.pem
new file mode 100644
index 0000000000..607f7bf989
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA3CRL.pem
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICMjCCARoCAQEwDQYJKoZIhvcNAQELBQAwSDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExGDAWBgNVBAsTD2luZGlyZWN0Q1JM
+IENBMxcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqCBnTCBmjAfBgNVHSME
+GDAWgBRIk1R9xG0w/y1XRXEk30wFn0oALTBrBgNVHRwBAf8EYTBfoF2gW6RZMFcx
+CzAJBgNVBAYTAlVTMR8wHQYDVQQKExZUZXN0IENlcnRpZmljYXRlcyAyMDExMRgw
+FgYDVQQLEw9pbmRpcmVjdENSTCBDQTMxDTALBgNVBAMTBENSTDEwCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBACvzWPSm982N1bxs5RW+yTNbWoZ1NBGEvAUX
+B80kE0PTfchM1HbkPh4SkkVarj2/alnN4E7cMWzlq1qhc76WR4ApjPZmCW4zlw1e
+a229Eh3s15IX+CZcBEza5mQIHc5mnn2v80MPJCS7W53lvPlrD3T85bv3w3uX8UZi
+AkR4wCC12Rbnm4fEtgkIxuB7FrKb0SWf6ygBn+Tcv27CGSF9YBhVsXEyGAA8qt9N
+1eBJrRGBu1xG6rYEuW5OQgGhZgV3QhxEqUxhatPtYT8bcR07S3PrGx9Y+Mh+o9Mw
+LuHM6OiDiRdd2nRUmWWpZGOgdTKEJ0eFrqOnxHPPF3bhhiJs0hE=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA3cRLIssuerCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA3cRLIssuerCRL.pem
new file mode 100644
index 0000000000..a366a243ba
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA3cRLIssuerCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICajCCAVICAQEwDQYJKoZIhvcNAQELBQAwUjELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExIjAgBgNVBAsTGWluZGlyZWN0Q1JM
+IENBMyBjUkxJc3N1ZXIXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqggcsw
+gcgwHwYDVR0jBBgwFoAUkdE5mMnvT1RlihhSLXwSEgpsd40wgZgGA1UdHAEB/wSB
+jTCBiqCBhKCBgaR/MH0xCzAJBgNVBAYTAlVTMR8wHQYDVQQKExZUZXN0IENlcnRp
+ZmljYXRlcyAyMDExMSIwIAYDVQQLExlpbmRpcmVjdENSTCBDQTMgY1JMSXNzdWVy
+MSkwJwYDVQQDEyBpbmRpcmVjdCBDUkwgZm9yIGluZGlyZWN0Q1JMIENBM4QB/zAK
+BgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEANA7Z476bqcNnf7wWi2LE7Gws
+3Nz3U+G05Yp4xMLc4gYoKj/W+mjvsbXzJ2sjU8D2e3qHu3p0lIsFP+ZXXhvi4CEv
+3lIMQQE8/pPGxtqGDSnKRstdZPq2JvqisZFieChKH469G7yrHNMKD6C4MkQs27gj
+3cybk3G5fEGmpE5xVwHb1m2P/wD3vzkQVU6+T+RD8FPlZbqJRZEdIg/RSBQNXjbY
+ZIvKCkfl6w63f39NgMYSsfUM2g4jiv8PAoAR/RmDHgvylCoc8E2KDWiTFss/502e
+hhNTwMhEGS+Aze381vRThygIpqw29m4My844a8XVX2jZ8y6GGoiwqdby8U4wwg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA4cRLIssuerCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA4cRLIssuerCRL.pem
new file mode 100644
index 0000000000..596762cdbb
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA4cRLIssuerCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICajCCAVICAQEwDQYJKoZIhvcNAQELBQAwUjELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExIjAgBgNVBAsTGWluZGlyZWN0Q1JM
+IENBNCBjUkxJc3N1ZXIXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqggcsw
+gcgwHwYDVR0jBBgwFoAU8wjrbbnFoBCk2gRF/696R68RwLkwgZgGA1UdHAEB/wSB
+jTCBiqCBhKCBgaR/MH0xCzAJBgNVBAYTAlVTMR8wHQYDVQQKExZUZXN0IENlcnRp
+ZmljYXRlcyAyMDExMSIwIAYDVQQLExlpbmRpcmVjdENSTCBDQTQgY1JMSXNzdWVy
+MSkwJwYDVQQDEyBpbmRpcmVjdCBDUkwgZm9yIGluZGlyZWN0Q1JMIENBNIQB/zAK
+BgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAKRPyrIpC9HqbA9TytL4xuspW
+lO0Ihz0TyIs8bWEMPSanD0tdGsO8v1QQrv/XSVeAPiDcPvwFtX47TpbPJxJQBV5/
+AfGEAJ/o5Jl9ah2yuA3Qd1UZkL85V/XJgnqxpqJeLRQoQ3PeT0rlnQUM2fru3LrF
+AZn9lpxyqfqPsNbcDwwf0dbtGOvwUC2KTkXueizW0VEFgxRmRcielTglQXSV+Y1Y
+/MLqly+BHpWOko7BnfR6Ukfod6O8vyPwhUm0VW7AxPNH/qbqcpJjMnwCN8Bzp5LL
+UfQ6pkmCRWESbba14wXPuhoPM3OhzBzpGrBMeRpml96Tf3Q6xho0V/QmOaAs8g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA5CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA5CRL.pem
new file mode 100644
index 0000000000..fdab0bd2f1
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/indirectCRLCA5CRL.pem
@@ -0,0 +1,35 @@
+-----BEGIN X509 CRL-----
+MIIGJTCCBQ0CAQEwDQYJKoZIhvcNAQELBQAwSDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExGDAWBgNVBAsTD2luZGlyZWN0Q1JM
+IENBNRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjCCAt4wIAIBARcNMTAw
+MTAxMDgzMDAwWjAMMAoGA1UdFQQDCgEBMHoCAQIXDTEwMDEwMTA4MzAwMFowZjAK
+BgNVHRUEAwoBATBYBgNVHR0BAf8ETjBMpEowSDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExGDAWBgNVBAMTD2luZGlyZWN0Q1JM
+IENBNjAgAgEDFw0xMDAxMDEwODMwMDBaMAwwCgYDVR0VBAMKAQEwIAIBBBcNMTAw
+MTAxMDgzMDAwWjAMMAoGA1UdFQQDCgEBMHoCAQUXDTEwMDEwMTA4MzAwMFowZjAK
+BgNVHRUEAwoBATBYBgNVHR0BAf8ETjBMpEowSDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExGDAWBgNVBAMTD2luZGlyZWN0Q1JM
+IENBNzAgAgEGFw0xMDAxMDEwODMwMDBaMAwwCgYDVR0VBAMKAQEwIAIBBxcNMTAw
+MTAxMDgzMDAwWjAMMAoGA1UdFQQDCgEBMHoCAQgXDTEwMDEwMTA4MzAwMFowZjAK
+BgNVHRUEAwoBATBYBgNVHR0BAf8ETjBMpEowSDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExGDAWBgNVBAMTD2luZGlyZWN0Q1JM
+IENBNjAgAgEJFw0xMDAxMDEwODMwMDBaMAwwCgYDVR0VBAMKAQEwegIBChcNMTAw
+MTAxMDgzMDAwWjBmMAoGA1UdFQQDCgEBMFgGA1UdHQEB/wROMEykSjBIMQswCQYD
+VQQGEwJVUzEfMB0GA1UEChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEYMBYGA1UE
+AxMPaW5kaXJlY3RDUkwgQ0E1MCACAQsXDTEwMDEwMTA4MzAwMFowDDAKBgNVHRUE
+AwoBAaCCAa0wggGpMB8GA1UdIwQYMBaAFIH3qr1IdVmAsM/fIxid2JNGghazMIIB
+eAYDVR0cAQH/BIIBbDCCAWigggFhoIIBXaR1MHMxCzAJBgNVBAYTAlVTMR8wHQYD
+VQQKExZUZXN0IENlcnRpZmljYXRlcyAyMDExMRgwFgYDVQQLEw9pbmRpcmVjdENS
+TCBDQTUxKTAnBgNVBAMTIGluZGlyZWN0IENSTCBmb3IgaW5kaXJlY3RDUkwgQ0E2
+pHUwczELMAkGA1UEBhMCVVMxHzAdBgNVBAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIw
+MTExGDAWBgNVBAsTD2luZGlyZWN0Q1JMIENBNTEpMCcGA1UEAxMgaW5kaXJlY3Qg
+Q1JMIGZvciBpbmRpcmVjdENSTCBDQTekbTBrMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEYMBYGA1UECxMPaW5kaXJlY3RDUkwg
+Q0E1MSEwHwYDVQQDExhDUkwxIGZvciBpbmRpcmVjdENSTCBDQTWEAf8wCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAD511WYLf3F/LVZg+HVRImOIHZrYvfUb
+QGXr1qzVVk86bLrZqrPNXo6+dCj/pZJrP35VxvrcapftonBK2FucTiMzWyg5WXI0
+lh3i/7BOlopDezS1m0T/vPhEYJM4ymyhbEY7vjLQWeTWEvcQIW0QGfVRpFzMzkwe
+FcIq6QleFY3hfOWT72oAdZHiweeNPc3/XMPFFkZ/3Tp52Mt1OOq49Xk8HneV/F06
+tZGefG3DrvQbkqBHF3p2qjWrwtNUHlqxJ5uCYf0UKMtwKp3KLTJgphrCOApaPapD
+Dixk3loTgU9P/PO5XAP8s+tTdwjYlYPDan/Uxi1PpwdxUZ/ghuFaW9Q=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy0CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy0CACRL.pem
new file mode 100644
index 0000000000..f6f50228e7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy0CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUaW5oaWJpdEFueVBv
+bGljeTAgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFBigoHpq/2qdhYIkzcMmhfi/ijcGMAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQB+ePMn32XQoMZZJrXrnElaigAgYnqRtRguHjnlJXmaftw3lk++
+PSQPSKUxKtuvbuczbt+jMJhTngohIIfbPfEYrSEe6kolUODSJK4Vdp+ja2jfD9ba
+VrmoHNH5JOLCm4HqaV6Cba3rKH8F+0rlw49q6YTS7otMBaaPgfVPMtketW2okiNK
+YBVOVSdC4XuxuZQZE3rz8u+T9QcOm12eMNJU/pXhFjOaagtqU1xtqEBO3LOsbMym
+uTRGJO8VoWdYNxe/jedXiAMASJlx4BQo0hJDm16wlubz4S0Ac9gHYNrFD6laVDph
+B5eNCGxHDSJkxhNtbW9ztHgQcT18pxOV4mHy
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1CACRL.pem
new file mode 100644
index 0000000000..ad1941263c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUaW5oaWJpdEFueVBv
+bGljeTEgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFNimnieXEcOO1Bkh1yC8nO2he/LTMAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQBM2rRjH0dKX4Ay7xIJONSV1tyQoFaznksb2FKUgatoMTtF/Tbx
+WqANV/RsKCYjHc7wAlyn0LCfxyIvIGSLQTUk3+Dyk0yESy/Cz0R93eCeI2y+MZ7j
+BHz+jCEgOeV4ilL0Y2hTmHOQGBkrFfa/tWA2tAejAZmnozFhgQcfenUMXWc5uU3N
+CMS7n67+hUUE3kQ5qw5L3GtxUytXOdG4CUa96yPcMKJgJ1W4fk7FkAAGt2IM4lDM
++c3gS0+TfewBtGFPfu0kDt+0gLX/SdGGJhBnYCuoAicXhshNmhOjchP3Auo6pZHP
+0uto4/XnOnHKUanX+Cg7D++JqCa1FzShSjUn
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCA1CRL.pem
new file mode 100644
index 0000000000..cc49e37c54
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCA1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYaW5oaWJpdEFueVBv
+bGljeTEgc3ViQ0ExFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBR0oNVY2StT0iuwzV1xxqG/Q6fIFTAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAcdszKmraUaBp3w473eShNoALBZ1aj31fBfibxZPvtlwG
+BECryi8bmOwXZwKUE8Pr1MeQVtHYgDJhBscq9F8scmBwbmp/kRnBdN9Dgq7fe9Yd
+lke45ULwXOLkX+MdbWcNMX0OILkySpw+zpIDX1HCNeL0QKz+bXwouqgAnpj1IIFL
+yx56Vl/AGQ7S0jkR1emdZJudenGiCKkDqImjORjteSO852f04/83n6iNYDLcDzki
+uxyd+n00PMhqjiG44a5o+rAfOiJBbxv3eDMNQo7mhnTHUZnAq+3bSSQcJqCQBTNC
+zLna0kwa38h1WeQWbekOJGO2kiFd1pTss+mPmvpCBA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCA2CRL.pem
new file mode 100644
index 0000000000..846500d7af
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYaW5oaWJpdEFueVBv
+bGljeTEgc3ViQ0EyFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBSMBdzffmTbYr7bS1FkjGpm2FyjozAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAsrP3R/bTvBLXn8NE+Qcr0Cr7ETparxT+Grm80Py+H77E
+UR6eT9/tvIJYTNYzpw7zEUB4vYeVqMJCZoPtP26Lkv30BLAkWEQ/kaM9720aG1pH
+sGUCpSwpnZkZeEhUW//IvCb9Ubf/aMAE+NpvLnYHBB2hQdckW8hCrMubc6jfQL2K
+DTEhwuFs8p81I2OXuA//qk9PrQlnI0dsFenmRCbSpZj3CzIjwuPbv4J2JKthNgb9
+xuFT97kzKFYa77JP+Skcicva4o0A94WVkCtcAv8FrHPNNapflzcE6edP5Y5R97SK
+yflBco+Kk8eEzkWleh3wLh04+CEoj9JYMEA+1ICv8w==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCAIAP5CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCAIAP5CRL.pem
new file mode 100644
index 0000000000..7ebae31c23
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subCAIAP5CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbaW5oaWJpdEFueVBv
+bGljeTEgc3ViQ0FJQVA1Fw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBSJBFR0BmCz9wBuoGGOFfu+UgIGJjAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEAGOaiustpHjlRoLea0ROpIk9v5o+dhhyD281DHP68
+cahcHEEDBsFZ+08KXnho7vLW55E2mnOZpjD+YAw5M1UpuZmKHgHTg14FfZhrZjco
+LjkcUC8hlCOc2ZfIpv23+Sh4dtR/iglXo5KqDiBbii0VPndtZ0M0XgTfLe+3vp1l
+ofMF2I3jkMfQSgyFMihCzguRCgjr2g8TAcX1KxaRyQD5NtelpY3f7juQo7RD3AdF
+hiZdjnCY6qtgQ/9ju/6dkWl2vNOVWQBLJ1aieo2o1UT5PiJXoMlKBbuYZpecyNRa
+bdRFkCoSybqi+qAZ0S39CBZQGuU7Une7xne9cXK+M05J8w==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subsubCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subsubCA2CRL.pem
new file mode 100644
index 0000000000..669df318fe
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy1subsubCA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbaW5oaWJpdEFueVBv
+bGljeTEgc3Vic3ViQ0EyFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBQRfcCcinb5STP3pIFLjjB1lTvoiDAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEArE0ESZ1xjjGSyPpJ2Ru9aEVl6UtjKC1vctLfDCZD
+eLTLipnD0R6vsDscUna4h22okIeP9AEeLEOvpX5Oi0bVNhU0w6O2xP0Tc/Cfuole
+HgH4ZUJcKob6/2DpXLSayUNNL1zY8I/OS+lfsetIqOhp78xLiR0ghyeOagnkH99r
+a9eT9iCCUe/XO/N0gMOjsPkh5qOGC6gg9/XwsECc1BYf3HGzU10IC/C4rrxgrwQx
+YmpA+WDMQpEmDFXxect/9gARsgny4irJ0++2rFI1WdWKFEmMkO/l9B6GRYCjNQJX
+cS0JH8PWhv3DjvUoEeBIFDDJJwquskVZWwP6TbkfEqut+A==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5CACRL.pem
new file mode 100644
index 0000000000..7c053d1c8a
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBxzCBsAIBATANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEdMBsGA1UEAxMUaW5oaWJpdEFueVBv
+bGljeTUgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8GA1Ud
+IwQYMBaAFMAmgedp1p188L3VnapTDmX5nMsKMAoGA1UdFAQDAgEBMA0GCSqGSIb3
+DQEBCwUAA4IBAQCXIcfQLBFOcgt5m7Q9laH1FvfjTwZ1s2tC3d3NzBGRJRqo4lFB
+sb3PvwFL96EwopImZofRByNNmtdA1E6FS5dyiaDjOD8u9f02ZnL3PpAkuTTMyA+l
+iGSo7ZEvwYMPjWdtiN0SGLlpoVbTbAcUx4zjHOby1H6TiZcexSrf6ndRtYzR9I/0
+3jzFnqPcSIVQeB/gSrSWMj9j1gYO/UQGf6H8/YXadnYzoh7+C2lbwk27mpb0d8sc
+EkGJPa0iimLbKCmprPG5iHE0y6yUltjSia8fsubGfzNkMaJWsFepd/HMoXWC68hS
+0fI5vvDTIzHqFMAF6cZ8ddHMNbFA4XDD24FW
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5subCACRL.pem
new file mode 100644
index 0000000000..5c6e19906c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXaW5oaWJpdEFueVBv
+bGljeTUgc3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFGyZqbYF675wSTZMWJoi6BSIhS/bMAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQCfcJ8e+tup8Fr+n+Wg9FB/0V86blpBUsRvV6juNBKzuyuz
+b4iY4BZM1flYt9OF043DVHi7xN7BcQ7YGBal/day/v9GisD3Ia8qYdtyRCb0y70V
+6jiVJ1FVolO5New51aMcNAzmdCvmqvsj2KBm5y1zJmBwF+MeKrOk23kL4jOpX06y
+Yjfbs1xCbub01wBmE/t+rL/FZdFamC+uh3XfBUw6vCrDNvdtN31n522EV8I3ifru
+ByIJ7RgtjgeIDfCOND3TZ3i+OTEcn4XrMW+Y3BYiRKhLEpxrHkxNdgOK1ouC0HuI
+QlE/DkaDnw9rj6NnI9wlZTMCbmsSkn28VrkArw7y
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5subsubCACRL.pem
new file mode 100644
index 0000000000..793cf1291a
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitAnyPolicy5subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMaaW5oaWJpdEFueVBv
+bGljeTUgc3Vic3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFDHhP/xiboBlzal5EAArbola6AXDMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQBBNQhxoz5IzMcomKNxeSnmWdgwCCbynAR5YVIt4vqS
+zbN+H6DPt7UbaqhpgJTAedphGYOiVm+LYOehKXMYp6ZF2iHFC7yZ4/tbozh3hqY5
+5G1Zf2c2cXsCI9cI+uXB3jk0h1RgxaBRoAST6PS8HQJvUXM0T3QyApj2ELLjlvHx
++OrJ7XfsmOzliH8pfVdnKGzp2piSiJhdiiV/egX23AXvvQq5k3Tb0oUWo54BAso3
+2eXyypSbPTbxQXVqq4bjsVs/F7h0xgFRlwK4YPbmcpZqM1TXl0f8l/KqnFV+ZOmL
+aXghz7oTvQoFmJodMyzgWtvR4LRWnVj2v53K6AO/Jvrx
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping0CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping0CACRL.pem
new file mode 100644
index 0000000000..c709a56df7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping0CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYaW5oaWJpdFBvbGlj
+eU1hcHBpbmcwIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBRYNyYHkYRgrO72QD6lK/z/lx2d2zAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAvS17Fvl0x0lQNKsr9O7mk57ThTYOMkhSLLVLYCrox6vO
+B/wLW2wLJKrJ//n/VFqEGncKHNgwyF0tiBNhm9qEGp+LSbKwN/NT/ZffUmuer74d
+iUIQr7fvQYATGGY8f8a3GlQ451Wnw4LTOpfTfIOdH611ql5bQg9zsZsoamXa0WZ+
+Q9WLA9rT2AAQDWE+6jhD6PfhMZlfrOwfQ0oZJX+EDkiQ0N1BAhURxMxzflrWeedF
+nRHOyZrlIzqZ9rqaIaTcPkn3Q90fxREys2AgX59Fyp76iT3lsYpPWUytnt7e0NpY
+sZTGdW5W8/vh1jYAMhuBJNzTfk0Ilf71Le+qxQVFQA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping0subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping0subCACRL.pem
new file mode 100644
index 0000000000..50f92f4a14
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping0subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbaW5oaWJpdFBvbGlj
+eU1hcHBpbmcwIHN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBT/tHNiUo1cljpakK4avLg8eYFjHjAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEArr+kgBiRhrD9A0eGhC60oEuT+oe4x7jNWNet8W+g
+U6eESV36XCGgh37RfZtL6k40uiXm+WNM5Tir3iLaoUVR675FIWTn8deelq410jkk
+RTbEz8ikqYH/MGilEhLEfaYteQu8kqGETlDmFbmcjriRWulMGVOc7yKMIrKGRKWY
+oZXN+MB4zjkepwlJtef6ZtwNa+QkYENfLSu0fNu+MU+aqnwyLqsqNqV6paPViltB
+c47TqfXNtm18NtKDYjXdPgiLfmk0qZ+WSQK9mz2v2NSsHq7G8IeOYJ5BuaXDs3df
+fyZrzQxOFaaRNLor0m5T8HKIM4HtHVuLGioqQRGLyX5zUA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12CACRL.pem
new file mode 100644
index 0000000000..ec32a575b2
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzzCBuAIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMcaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxMiBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAv
+MC0wHwYDVR0jBBgwFoAUTWd+jd05Ga/oJt4OATR4sXUQ2qQwCgYDVR0UBAMCAQEw
+DQYJKoZIhvcNAQELBQADggEBAOTAmNbgjGjQ7urj0qwWnSMCHeyF9To1md3H2IWh
+CNZaepq/e7ALmIDr7viy2FfyNnmBi0SWz4b/3ddI+NhylyuhBX7b+hHIBcAbyuym
+ZprJeuNjk53T2KoUGrOUnRGAoUKY8I1mNrXb2oQ5+keKUevF1G4OYsjoH2i/YU/p
+xf9xMwd4fKjRZuIS62MMJBXOQgWPXu3q1K2U12M1EHJ+Uzm0vgYf54vL35Zczo1T
+42ue5Wkt2tFgiQlN5betiQhuXPSNoEcX54l3oRfo/QS2cFKzaQEYFrS4Khdy590X
+16eGQeXouMpeCARjGbBeUoVWa/qFm+40nOXtBftQOtUuGJc=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subCACRL.pem
new file mode 100644
index 0000000000..8313d770c7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0jCBuwIBATANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEoMCYGA1UEAxMfaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxMiBzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAw
+WqAvMC0wHwYDVR0jBBgwFoAUqiaUHWQPfgW8XWCNB1f8cJVmbOcwCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBAGhzR1y9MeY8/io6ssFZCHWXI8r8OoPogUgA
++Zmv2YJAGwg2FY/ID9nYmyntsT1bsAfzPubQJJGsg6+izEwcjNGaq9S8W2doUJ/5
+LQVpPBYydzpRm9CkW+YlpxTdYxlXLJOlZOxQbAob7dUdViUgbu3bVQq0oMlgjz3z
+uMwHv4yp4xOD45CQbwALHVAoVkayZ6ESltquwQBSOaRATkbTRl7BdNcssrh9TTMS
+YYhcnWHQd4e1KWdJLb8ZSgYpAAoLLV+4QSR3B64O4vy95xwcG71puEs/RLDgW7MY
+pEnbOsL1TDq7ZjYfAHyxFXZKe7XEFknnu7A5cNjoSr65szamIn0=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subCAIPM5CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subCAIPM5CRL.pem
new file mode 100644
index 0000000000..3d86355fa7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subCAIPM5CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEsMCoGA1UEAxMjaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxMiBzdWJDQUlQTTUXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4
+MzAwMFqgLzAtMB8GA1UdIwQYMBaAFB0Ez3YnB48iO8L0gi7u5t0TgHtTMAoGA1Ud
+FAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQCT97ZZ9/3xeVKS7ylodjmyfxLqZ+7V
+iezI4cQFmH7cWThgfMefgj1664LrHOuiY/4bhvk1LHQj1c5pFbUYLc5hprEiv3dn
+OJejWo7PxTY47hkXIntlElUyYb/mxUPxiklQ7FEbE7RFSOTi5MZNrHgd+JITUa6x
+jPfDI0z/GO/Jo4RPZos2Iu1hVLN++sU8iMVMe7/sIoOrNw/lwudUfo+cZEKWi7xv
++1ICLtnK0XoPBTxNzb/i8cOZrjggiKole9mFEAZrs5P5dfytRTVFje+d4Aj6lYr6
+4smUCABSDWhLcyI2OLIt5taw1BigwfOsGvjMsRVgRuF/3U3LRHf+8o1M
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCACRL.pem
new file mode 100644
index 0000000000..4c8450f3b7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1TCBvgIBATANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTErMCkGA1UEAxMiaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxMiBzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgz
+MDAwWqAvMC0wHwYDVR0jBBgwFoAU14BcE4uOQXa6CrVzceijQIB0DtEwCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAB8d26fH9sOi6DPVWkJSNU1UltmljVsq
+Z9FBaQQxT+XSQDuAxW3VxeL55+/62jWO/O8/xvfw4egnAoTjtDfOrHFCEk7AlIgX
+vdGeXe7l4sHgbaq6l/z4EDsQU7SoukhtrjUVUTz7ksLjJwraVbBc8Kun/Umpj2sc
+ZEFrn/PMyibfXkeJ5aWTosLuEyKBag/Ln7hhl4nN6LDnafj+sxvhIlPGKKE1B66S
+h+wbhxZ6QvqOGfdYlcjRwXpdRPiF2/DJApIjF3eV7CkMM8tMo0myD+xQWwjPkNPw
+29n2FmWxfSmGBhbRkJ/nPGid50jCG/1UOrtN9+pQpRS3Tpky/zFtkvo=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.pem
new file mode 100644
index 0000000000..2ed760a1e5
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2TCBwgIBATANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEvMC0GA1UEAxMmaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxMiBzdWJzdWJDQUlQTTUXDTEwMDEwMTA4MzAwMFoXDTMwMTIz
+MTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaAFBKHGzVn8LyhoDa6FagpGe0am1twMAoG
+A1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQBRQeh+mh86ONreRF9oNGE+z0lr
+y1ZYBiri/f8kk7y1GbwNB6LG+M8Fve7pe8pvtawSMfGnEbaHqdOf1jzSeOQXvSBb
+htuZ+DO9kOVDRyysBLNDWTSgA7BC/MI0JwrHnUMq6twutmQ0aPe0hHZu3DdydeRt
+ncUQ6qa+dNiZ2RJCpcXwKcGPLJnafDpICui8VPRJKgj4bcdtpFICoCmnB3iqbLKe
+9s2XyNtHxfJPOW4HSASB82rWcTzNA6Px0FwXm+8TKpkopS1dlZ6cd/nYhJCj1i26
+wxRDAx634CAzhWoGaYtrE2P5epcOEnh4G49ybfPmua8RWxTyi5CvhBhtrtXp
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1CACRL.pem
new file mode 100644
index 0000000000..f231fe784a
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBS+tp29KX8aodmL4aSAaIMorUrwATAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEAUv+vJlKK7TKlyO/T/yrf26BwpHa6dJHReqjLh6e/
+iXSXPSDXvuDrj+uNAIL4o8s8X5y7h5+ivYEDyZi2lnrCsj75+IuJIBfeHnfdeCo5
+rsa2Hml6bhJX0OuZRkMlg1qDMYlN3EEqcpobXWd/TfL3RB+vw/V7WwC/F5vx5UkT
+mH0jpI0glDOOIaQIDhgXerdEMuZ4FpSdAiUtj6icPYmbaGMY+We8X07ztyv2RQsK
+frTxkyAHRM8fC79LlQzzCvTPcV9wkwKteKMY6ZzWsOfp1B9DAyK6wq2Lp+TqbJqh
+pyL/lPhKASzGVegUqAOczdo0rvNDCVIPu0gCk5PgjcpieA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subCACRL.pem
new file mode 100644
index 0000000000..3730e7c738
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0TCBugIBATANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEnMCUGA1UEAxMeaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxIHN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBa
+oC8wLTAfBgNVHSMEGDAWgBTzzQc/gzDTxwJi2ubKbAGlsbaAyzAKBgNVHRQEAwIB
+ATANBgkqhkiG9w0BAQsFAAOCAQEAAuGpcOqakKHpoO5Y+E7QAQnB1fmAm4smN7eu
+RNXIdrZaVd24C1BbFzYAnjdewBVYT4adCdnslaNe4tqpq3Chh/YtmUe152/GTiXF
+MVbo5FRZhjSvK8VTVEzvSZ21b3oiqIv5d4P47XmhVfo0GtTv7Rg+x+ay8dGUgni1
+D153LEBh9beouesqqxn/8uFfxYpqmxFrS8vLdL9kxpeaFX32bM0eSOhA3lg4oCfm
+j28x6yL57beJMHjFZMN5vAXTZHZKeJS1QXak2Dt21G3VKPyq3v7iY0GDgLqQGsIp
+vPsv+nuvwdTjcQPwsMIQjZBrq2woAYvlF5hx8ofqoLNW6/oV1g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subsubCACRL.pem
new file mode 100644
index 0000000000..6bb1b2a960
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping1P1subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEqMCgGA1UEAxMhaW5oaWJpdFBvbGlj
+eU1hcHBpbmcxIFAxIHN1YnN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMw
+MDBaoC8wLTAfBgNVHSMEGDAWgBQ+RXSii9LxVoxGAWZ4cCTGIsEDnjAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOCAQEAdMziQBhDzdFRF40rOtd55OD5MPOXWPRb
+5i6KUQcwxrHZ6xZibEhM/eHGtHW89pL4Jjzrwbp+SXz/OzJ6yU9Cf3PQsP3a7l87
+J/EY+KL++6g5V58wlaXZYOvO8v5WTSFGP6NUvg8Nq2SChq3KqVvKxp/MrFSckP74
+gd2jepabJyTeXajSMManT+wxxTKG8WKMQtiQdXclZmEgaVYgxKVgIJudF46yLEh6
+gVwhKAR8xdIBr/mztrcM+aQKvdxtz3aHuKNwm+lo0tSjxB7UojZvIMdd7fuc0V1E
+PEVJDd2+Eej5s071zlgMeaahFbVeBNgaQy5rURdHxtyMZukFdCW5aQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5CACRL.pem
new file mode 100644
index 0000000000..68d33d924f
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYaW5oaWJpdFBvbGlj
+eU1hcHBpbmc1IENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBTbgAe5YizFw/3zQ+JmUSW72/QczTAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEANZI64pJVPbGyUy9hrPD2bO0EkxlY3aJHxDko6PaPdQ86
+dFjmX8tTCD0vmm8Hox4bI8fZHbjMDqhWxLU8NtjNJLSZX5IY7SJaaacDGaRd6laP
+05hB5MTLcEKBxH5FIetoK93e8mf+rMVRG4kCmn/UX4notzBcX0x0qKoWd2v9v2QH
+Gx7Gr6Ouae8wubYiu7aR9fCYRIcllEZVFRQ9f0bB5o4NANAUM4uq7ZrrqSRauqN/
+iNxCEeKSVnItuZnAZXpazNmXwSCdWPiRSl/77tThqoBhGKsgOvNbwJaTKJIuJ8HX
+5HgiQiSaz6Y5GySbA6rFemmW6X6o49/CiJr8cI+fKA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subCACRL.pem
new file mode 100644
index 0000000000..7925d0d1f2
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzjCBtwIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEkMCIGA1UEAxMbaW5oaWJpdFBvbGlj
+eU1hcHBpbmc1IHN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8w
+LTAfBgNVHSMEGDAWgBTY7G2+t2/KE2PKJ8ycW6JpNrbyaDAKBgNVHRQEAwIBATAN
+BgkqhkiG9w0BAQsFAAOCAQEAOYCNoa/mt1m/IQNy9kCVeCItblOzMyiCcng/IMCd
+RQ9q7kAa/nPj/zINqGAM4GUY4yB5wHm5zVKPL/AxC4adae2Xg5o2XqJ9rRI9bSgJ
+s48iHWbFp8mU2H5Wbn/hVKSWWCi6XzP1N9QwsFJa/5nsgRDzp73VHarqIPUBahtA
+mYLPo0bIg77oHPsXYmEI+aufY88+IMtVr4iFIW3ifEQu/XbmfwNjQLopIHBn3E0+
+gyD5XDJeF5f5C3FG9vQ/3DSgrdN2DLzWHr3/dWNIkRWhVxqimffMjYUkuxi4bKQ0
++30q3zclNs0lOr240CPBkg6Y39n0Zo7ihxBoS5INvbTi4g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubCACRL.pem
new file mode 100644
index 0000000000..2fb83ef408
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0TCBugIBATANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEnMCUGA1UEAxMeaW5oaWJpdFBvbGlj
+eU1hcHBpbmc1IHN1YnN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBa
+oC8wLTAfBgNVHSMEGDAWgBQ1p9ThS3ROVahxtEJ/Mv4EGskBuDAKBgNVHRQEAwIB
+ATANBgkqhkiG9w0BAQsFAAOCAQEAbayhlH01G0sqNxiiUyC8qPsdhUF3mHVEhoqz
+2SOwTTDzqCTLyqftFnZPAJ9fbG/FN3Denqr2ouh1Rl2mPEG3KmBA/w6gRrTzxmS0
+pC8UsBWdRvRebGZ29WJEjgslUz/r9BbSlwabF1dsAssvmv9xPxFBql4uNrLOEfap
+M9Ldo4y1eiBWd5xNTYp2zu+oBOAgywJggc7xepoUhwcPCTSrcAqmsQNLBoMYcf84
+nzm8rJ89cTqyPvpLxKjjgLdquVevhCcIG9HSCmAbb1z8SKhWaaBjRSoLmAo7845M
+VoDabAd0zNq9DEwb9WHB0zZldJ+u4LJtAAEpdl1nc2KqMADUnA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubsubCACRL.pem
new file mode 100644
index 0000000000..ade3f19453
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/inhibitPolicyMapping5subsubsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEqMCgGA1UEAxMhaW5oaWJpdFBvbGlj
+eU1hcHBpbmc1IHN1YnN1YnN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMw
+MDBaoC8wLTAfBgNVHSMEGDAWgBSuY8vX4sNx4/TObvw19JvSTT7cFzAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOCAQEAj0qjzBDkME3FgINy8gUWHlUGBpgreUMF
+1IqXG918JUeFy1vfkDdhwmg9ln2GjMquqb6J26L5mgH0EN4qUsfRZtcLHTEnMXt+
+MSKI8xOWJrid//uFlitbPPNdppvovBNSAZroq+uZLd+jDxKfiPOVlrIkbbTQvv44
+YAGrkkdsmrxSxWwrtXdLIURmW/D9J5uRkRqpMVvikD5aMLGQEangg5MO7ZLsGUBL
++mdA7YDq+RMG5F0TVoKOOlhOZhAxcgs+RMCZdJKWxJd6/gu5opHeEuOy5KShVzUW
+ABXNyqZXT4tjAjYW0Z26urTv8FeBoRoJC2Kyozm7+IR4m/H4/GaJMQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalcRLSignFalseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalcRLSignFalseCACRL.pem
new file mode 100644
index 0000000000..4993db248d
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalcRLSignFalseCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1TCBvgIBATANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTErMCkGA1UEAxMia2V5VXNhZ2UgQ3Jp
+dGljYWwgY1JMU2lnbiBGYWxzZSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgz
+MDAwWqAvMC0wHwYDVR0jBBgwFoAUwspp9bSvEy30nPIRVcsqMLPSWkkwCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAJk/UxyWvcm6kbidRgW52BKoSxXcHpfW
+896BFKl4iGUzmYA8GanMvM9EkEoeqjrHdTABcPE1Mv0lREGRYZv9H+gD6iAnKctc
+8G74C8eYkvcdocWAixuvDMyZ+D+TxSCOo04ppe+HraHgEQRy2sgobIYdqEY6XcyS
+X0areuyMQPjqbTdOMFsTrvtSew034Q0zSoKsPZhxfMQ6zcx7JKqna8HzCO9LCZag
+r5+47Bk470ve2Xy5FrPk6sWJQal0/YHOAKKnnXoXitqst2A3cYiWgRAqpDMz2yMH
+zdtJKbBsIieZGgQiedwXDs7aKWzN5o5sh0ALyj17bbHyMrs7gvyiGvA=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalkeyCertSignFalseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalkeyCertSignFalseCACRL.pem
new file mode 100644
index 0000000000..8a9a50b563
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageCriticalkeyCertSignFalseCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2TCBwgIBATANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEvMC0GA1UEAxMma2V5VXNhZ2UgQ3Jp
+dGljYWwga2V5Q2VydFNpZ24gRmFsc2UgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIz
+MTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaAFDRVC2f8HLHcwnIKFPBj6dSb8GP5MAoG
+A1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQB3bfisM1UBugxKYYdxZkYgpRvs
+rh8UEjPVD8z0t29+yeyiPm4bFmTZI64VNvQlcl/Jj0YdcqkWGEKdH7RS79lSQhBs
+piAcYQcdS9WzaZ1tFNG/Fvxo+MkksrQ+Z95rb0vvB+7YuTIVWqbHcJamCgZ4h+Pl
+XTUQgHedNzpPKisiLF9y32JbDJ/nnrec9wEpMn7z2Yhb2vDWhdtQoYMTk4LrMOSk
+74Cqfpuy6JEaymDfdmrIIx4JZOfmo9mQcgeN2WoV/4YYaGGL3T3Sk8FqUaTTdM9Z
+iRiqzBSTOfl4VF4e3S1ZTDv5JH0U/HrJexLhgdi3xEpE4EQIZvXVsZX6I8rn
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalCACRL.pem
new file mode 100644
index 0000000000..844a745e39
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYa2V5VXNhZ2UgTm90
+IENyaXRpY2FsIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBTBkBFK2bQrxXB+zow7Yljlu5crczAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAgK5IxkJ3u7pRpg/BKAlwCJPgj4SrjTrLeu875hsUvEfv
+mMzLN50lGQpwuuH2oaQ15Da+PGpzng6Ao5MhMt3vTqU+Yp5VQEnBIsGED0lTJDHj
+pDyQpS2d4nhdYyPrHQHJWwLoGaTBPglYqc/vASXq862RiNKywdVX4QFj9IXXUrwI
+wQ7d5uKirZUEkInjJCdVH8ryJfo9fLRD4kb3OkbO62e/HHSJO2DstQadNweLoLCM
+hhJlw5KkDXIBfQvq5pPrI76dHY9VatsnqKRkt1CUE4MVk0fOIqci2Nz77LdTsFre
+Pfe0WNoqSJpoGv4SfIr7v8Uw83bmO3Yy/enh3p9J9g==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalcRLSignFalseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalcRLSignFalseCACRL.pem
new file mode 100644
index 0000000000..e0fd7bfd8f
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalcRLSignFalseCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2TCBwgIBATANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEvMC0GA1UEAxMma2V5VXNhZ2UgTm90
+IENyaXRpY2FsIGNSTFNpZ24gRmFsc2UgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIz
+MTA4MzAwMFqgLzAtMB8GA1UdIwQYMBaAFPl+UqB5ZgQIRAhleRAO3ZDmQ/HYMAoG
+A1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQCa3FLqxtdS2NeSwWMvuticdJwe
+M+xS0ZRf30G+WsPtmoRnb753WkhlJZZcglilAExrCN9BIMSEpO/UgyXpjDj7GUri
+F9QHfTdIT8QGKcZMbx/nq29ge/fdjOIkhXnBktQy5BfB8lGkYwNs20NuFpL3FaUx
+IvruMRR2AyivlndK+xcz6s2j2v1WYXlvZlFNAAHVmXR8+67zbU7t0WIN7VlkTyTa
+0mxanuASRP5FmlT+Czr6N6OERlBTp1wnvlq9BHeTGDXQp1oXu8B8sTsQHTMbuGWH
+FqGDZpZJL1BsCMuXkBk40b6b57/C5CvIy7SfX9xnvKmJs81C6910qBITMcZI
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.pem
new file mode 100644
index 0000000000..d7877a9b68
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB3TCBxgIBATANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEzMDEGA1UEAxMqa2V5VXNhZ2UgTm90
+IENyaXRpY2FsIGtleUNlcnRTaWduIEZhbHNlIENBFw0xMDAxMDEwODMwMDBaFw0z
+MDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAWgBSyJdIoMNBVaG5MtcJI88qbFfJA
+RTAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAtIeKFZV9BB4OBq63soXU
+rgYDlsozbj5cYoU86vXpmHddbTowwaGtFlqbfg9deTqT6r9IpdIClfZtJVT3s3Lm
+PFb/areGyQblwYuOD6Mldtdty0FH5A9uMMMCEk1iZD0Z8WApxo1bomtY/EI+ZHAF
+N9+xTE7DZtHIOSZ0nyz64fHMPDYQPDGtkK2QQ6nFNX+ljnPOCRBfwwAsndlumWRP
+SlthF8gU3A8008ytHdpkNEsUhf81ntUy4o2pftmjQOnMJT0C97CXykxZBc8f49A9
+QKsI6ql/dt1XO9hNmVp7qamXA7+yhBwfWAKnhXRQn5D64/ZqVxE9lYL7PvJrr1tM
++w==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1CACRL.pem
new file mode 100644
index 0000000000..c999bf8b23
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWbmFtZUNvbnN0cmFp
+bnRzIEROMSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUQXhCRs1OqILn4Tnf96kWwAr874YwCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBAFtcX7FztYXgApU6J1ska8lB9xinzLv+LkatWBtqZuRZ8yYU
+LLgGDlzgHX8d51lkdXrlTe3iW6aNmKTFznTRqxPGLNA8VikBmBhNLYGgk0u3HTQD
+hZzWtyLOa4FB26lrREAgvEC7P5TB0Xd1p72E4IwKf1ZV7KOiTpw7EmHLsSWYGcDr
+96mwtkUK6g//vxJnIa+k7C9jjQboCmOyH0HSluB0KQYqislhXHO3BSBxiXVhHec5
+3ToVLhmo/v+3fgl8wkEO2RH9MRcx29+JiRrqLr5xYZy3sKKBX/7e5jT0PQsKFOqI
+CKt6oFNRwz2qzEcbHFMyoDR2+5R8zA8OHCDYf54=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA1CRL.pem
new file mode 100644
index 0000000000..3884626320
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA1CRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB6TCB0gIBATANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEaMBgGA1UECxMRcGVybWl0dGVkU3Vi
+dHJlZTExIzAhBgNVBAMTGm5hbWVDb25zdHJhaW50cyBETjEgc3ViQ0ExFw0xMDAx
+MDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAWgBThOA4UGBRD
+XM7nS2LHGsGS9maC6jAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAL1Mn
+Ok+7QkFamOzoQfdBznGodtPDmg30Cgk3VHY7mAwg0VzRhhTaUHjMrmZzpyKuNNU5
+of9K/maIKludVfLuV9NPmt4pTZWW8l02umkRg/vbAIfPGWpUhev5X3V6f+Bn5bbg
+UQvEiuFQvJzutxukSCkNzijr698Qa5qEu1HzILhO1gQxPhufrfjHqQ5qxAnJiVkm
+uOFSP/OBfuuDg7HS8kCAkzfHrtweRwrrtGf6AYzVZO/+pc7OMOyUW+kh0oXHY60n
+snh7NPi/PNGb4RANJBcQhNKHMVY23eCcwylCnfp7FfuNLSAj55aRvxvG3Pn+WQ+t
+UqzAs79/UBMKcj1IWg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA2CRL.pem
new file mode 100644
index 0000000000..a39dd31a35
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA2CRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB6TCB0gIBATANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEaMBgGA1UECxMRcGVybWl0dGVkU3Vi
+dHJlZTExIzAhBgNVBAMTGm5hbWVDb25zdHJhaW50cyBETjEgc3ViQ0EyFw0xMDAx
+MDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAWgBSiL1iDW0yV
+l7fu9oe0lw7gf+CXFTAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAyDcs
+pkncHaUX9Ebs68OGd6Vbz7PAjZ/cnQXN6ZzCf1HVx8vtldilw0xP7L6LA1z4/sKe
+5AglNKS18TrC9jvMcs5MPI8g9jNPpmzn4tVGJiISlft8SqKPL9dvgUCODtIj+Vqv
+x5ELHuMRwAsj7vXY6FrgTwM4eTwEbRhYCxM1r05VPj8t/fl5XoNR/4vaCmDYR9uf
+JscXoSlBsXJkPrkxHnrreTiSNtP1iAiX6CXOBctSfPzhrZknzWq76UYq4LnQrqNo
+gyZ1pc46+f7RqxgGOgn/Nb6AqBy+N2vpYXabMKmNpIBmpOGq/qonbtPF/zJbj+fc
+Bafk7fSWIrCNZg0pFw==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA3CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA3CRL.pem
new file mode 100644
index 0000000000..7dc7ee7fd4
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN1subCA3CRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB6TCB0gIBATANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEaMBgGA1UECxMRcGVybWl0dGVkU3Vi
+dHJlZTExIzAhBgNVBAMTGm5hbWVDb25zdHJhaW50cyBETjEgc3ViQ0EzFw0xMDAx
+MDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNVHSMEGDAWgBQnSeQE2UX6
+bJiUbPztDcMkUm1VRDAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAuEeu
+G7nwSvVr9BxS9bMPB12xdegiBpg5U2K0vTD1JSSOR+RQ2LvwpJlkNy2oFt8+sbAi
+oTCOgifKXzi0tszHRH8vYcKy+DJ/RE8mX214KIg5Lj3DEpOlzPE19/z+eUl41Pbw
+sgnQTE+ccm2h4GlUefprR8PSZdOIcqxbDbapLHC9vz1Dy1YdM5iySa7YJ7Xk4uDe
+NtysCgwKtANPKF/qtbYQgcZxGPYArrWprgK2xyMBeux7WTQp+9xaSOU2gUmAKwzj
+bt0iV6KEkoU08FmUwzXTxX1bBsjLyIeRFPm58XbJ0MxgGdJPmMn7m2W4PPeMJpGD
+vH1qhNYwy4NsWosCfQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN2CACRL.pem
new file mode 100644
index 0000000000..d32449cf89
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWbmFtZUNvbnN0cmFp
+bnRzIEROMiBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUo1fZW10Rs2D2AGuJUSuCwwlzqHswCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBAAky6btWTahA//H8vhr8u8hbW8h/OWD8skXuVJHLv0LdS2cI
+zzk3f1u8vwWaohmjsIdNllFU2hd3GH62mJdoXJflLxxVDm47FWdzmmlyUsxFXojL
+HI+tjwBFmSzzzd/t7GeF5mKc11PrUz9oqoSJEZVCcYQX2px2xJIzmqOkc4VWGrGo
+rIvTE8SETRWTYcE/IDOxc1lSs4KyH/MGIwMeN6Mu3p3d/H8ygXKEzf7gYR0riFW7
+ps5wlQRxDC7ICktp4f2bN8l7pw5TwjCfNmzqDbW9IlDFaRr1VUV6hpPwORT9qWVQ
+7ZbDXVLZwaWxGmp8vYh7weNKgrmfibuz/DcHqPg=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3CACRL.pem
new file mode 100644
index 0000000000..a72350793c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWbmFtZUNvbnN0cmFp
+bnRzIEROMyBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUBtxbvscSN1mkikB0fAmdRTxKodswCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBAItPJiJOtxXyscdSk4LVnHx2Ge6LLKaoPE6qXi5JRs2t4LjU
+DJAh0bKPehBDlbvqpV6/e8pqaJP3T1DH28vZTr2gGY/Ar4BcVSzrKO0jH7j2PJU1
+Kzq68kP2/tr90XnUOuz5589ORJ9aryewWxJ5g1w5GqD4dC8NV5aDWPWAdnxVw0Dn
+DVvJl11dzlFqaZSwuDIj0IjzssosDmCrPDUjLDLn37f35XRIX7/GB3ghSrUJLsId
+TrU+ROvpQ4iO9zAVMDfQOePSnUeNpO4Sr/as3lHaFptwj0tY1PIeLcyfv8ZNZYN5
+7Q8+aKRQMPg2ZHGeF0d9ADvGLZTZ2vMCK/hHfL4=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA1CRL.pem
new file mode 100644
index 0000000000..c179e730e0
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMabmFtZUNvbnN0cmFp
+bnRzIEROMyBzdWJDQTEXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFIC8xy73jhp/8Th79DXr3elYxjxQMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQDKBu+BE4WjUUs1+SbDPdTUvtI61Eo5D0f55tSFFzqY
+3mjQN51xcisMQIFvf9dPdD7/MOUjS2GeSG7CgPObXBVkhjsNzNhgUdk7obAAuQNo
+7pj0c+Kp36GKHgSzMmOvzXOpe0OcS0iEJTqOss/+GD+a0kPUQBTQptEFJwPyDdKZ
+yIpuXbmhEtaXJVEq/fIkQLtHDv6VqsOCPDyyca/NP1J2Ed4zEHcP7w4wTcxhCkq1
+duWazm3Bnc3Qu4lIOHUP1VGum+Q4cLzFzNlWCOIaWqCVwQvywAADhy4E/mxHtGAF
+8s55z3PAJfeRKySqkJJtPI5qRgllB+n9b/HxD7DskHy/
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA2CRL.pem
new file mode 100644
index 0000000000..4f416b3ab6
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN3subCA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMabmFtZUNvbnN0cmFp
+bnRzIEROMyBzdWJDQTIXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFMwE7WooHX7eZOoAiCrsdRG/pS5nMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQBSQba9PCeM3gDcJ5/15bCZXzS1J88gi1mSM00AHLmm
+cvaM3zC1dupZ3+nUGrGuJeSy9gJvKmRvCGQJVVScbWaJSBCLsE2OTLQZosIbktpA
+SMDnJNCgEQMqL3S8I0U71qD4gw/f8DoxBloqVyzuwIynWZl+V9agP5UCWweDpo3n
+zqfqm4zYF2gZYgVz53l9/zYpxr8e0d6o/Y2sqk6ykbzR1e+Yw8Jr5AKs8awilABf
+Lu5pl0DO/pFtT1cX7MEtd1aoxZqQxssOS0JlosEF66VMeOKgUw4uvovkbjP9zfUr
+GfwYbvUJZ4XSDy6p68jsQKRpG7/v6V6Xy4LcZ+4I+ATD
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN4CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN4CACRL.pem
new file mode 100644
index 0000000000..bd4472556c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN4CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWbmFtZUNvbnN0cmFp
+bnRzIERONCBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUbEk2rS5YiRI2UUE7VFImJADTynUwCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBAH6NXW4G6VFh6lalxV0HfwwV4W70J+q058P1U/nVsOOg7s46
+v+bhzKwJrIovS+fGE+WmDCMbeeIzvmMnkF7ZSGmZarmGDzNGsxghmiNHW9eP2Wk2
+7QjyePG/cAff8ILOqzCHw1WZMtIgyVM3tQY492xqKPRTBac5P5DN6COtBGzKsk7O
+mtOvhcqtwMt5ejXil9ibRhAKHcgoNtzOoZoaQOvTajOP0vdFYnHHkF+bFDd+lxUE
+IHgX9IOmk1xGFgdEcSpQL+6mvV0aKk9iavdbVBQCeWzul24GRr21EVO2emR3oceI
+vBeEL509yRgDMZoosPcUPzU3MCre4KHexkxNGKg=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN5CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN5CACRL.pem
new file mode 100644
index 0000000000..bdb12dbf59
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDN5CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByTCBsgIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWbmFtZUNvbnN0cmFp
+bnRzIERONSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0wHwYD
+VR0jBBgwFoAUup8JypA5nE53Wuv7EJWs06dKXScwCgYDVR0UBAMCAQEwDQYJKoZI
+hvcNAQELBQADggEBAITmZi9ly086wq/MHAGjaUYsma31grAeyveTU+oJ7olEb42/
+ALSN0DXoO4UjV1bj/wiIPtErg0EjHWqVW4M9ID8ZdfDuXBLNBQ2NP14gJLjVTk2H
+6iHx4QK9QiB1gVdfKbj5+lTCt+7YWZtOWovr5SIlPtbNqszR1gpTLaLyIkT1FRg0
+txRaU4qTZmOIYCuWGEWeh0F9xHAZ4d30j1KcBSdHzOL28ibTjgDsYQF1680ChYu6
+TMUWY6q/ufziFDezkXkrLrtNWAwYZvS4sRynpbrhKUL+CldFK/u96ZZwL6T9Nkkn
+aY1gGgepUvLKlQt20+jmOu/L8Va7xcXK+AtuQQI=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS1CACRL.pem
new file mode 100644
index 0000000000..33e2aa1407
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS1CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXbmFtZUNvbnN0cmFp
+bnRzIEROUzEgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFLGqF/Djz8zSp4mmgwfd/27aB+NJMAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQA16Gsjfh0eCk00xbqXxGjwPJCTmNcQ5BQRATn1KHZNDm0l
+HSuZNQELk9z/M1jw8rEArioWWkLQEKdVQ8WtjFYYYcj7VTo8aho763/UhY1WBQQF
+ISHqASE4ygCUcwSKus12Ksk+NXvvARlv5EG/UqoSAMx+6t0VLuPteV5JtXaAgABC
+xXScnAJvH0BZJWDXh8x9TCocXxmH9SsZhgXM4WEZxRch1Z3bxLd3NrxztPXe8h7H
+9Lvp/TOEvTdjtbBn0kwomw1DCVeJd9DBNXFO5YvXyDBU3usNmHNMk0wri1roJzUg
+UrnYLYox1O/52yeQdQiSAkQ3grctmcBcJW8WaIWu
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS2CACRL.pem
new file mode 100644
index 0000000000..02b8226a6d
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsDNS2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXbmFtZUNvbnN0cmFp
+bnRzIEROUzIgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFEZInEIJjl1TcNgWHuDByRgVNQoGMAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQAmhkWLOOzNQKAS8uW774Ig/r2A1dpM2sBujFbCeg9blw2k
+/qRHoInFtwM22vgIBInC6EZW8qPqzPeJpjIluu02T25EjxRFGiameUbHQ02XAejf
+thhUnDw6lWF+N/sIKYXCkN6TuiKC9m4LPvlmI1JC1RqGWmZIsl59ae4zV1G0iyMy
+ol7WhsPhzsQj8pRACFdznwq0ehd3L8UO43BHl8+rXVzS6f++filZ2WZHPFCR5Nq8
+l9KaNhNCE7VeBQv7dElPeknvANPEGomeXFIIPwCx7Ra2mc3mjG5qYwmX1JYjPxe4
+siLRqgKc8s5vwYGwwPqtoInJckVUxfkZ8YAu5vTI
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA1CRL.pem
new file mode 100644
index 0000000000..4b594be896
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMabmFtZUNvbnN0cmFp
+bnRzIFJGQzgyMiBDQTEXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFMhqjrEPS6qliLinj5Hb6jNK6NXiMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQAEHhqk9qr1vH2Svec33ko0nUKpbgipddl8h6FtsAXi
+ewGnaaUK55/3Eu4FsbORjB+jSKWvYyaXnMPecX8zseOKgDWEiPZY6i+0/16Dz/NI
+2aOEVA3hxBmSToyka2FOki/KzcWfeKpebdihmZ/pyKk2qo5ygfASyV+/3fyroafe
+0FwfIRz0EHXamVhpTBVK/nsmtk2KxccIP0QjPkCu95nAAzeXJVTbzOUAbz9ZDpnM
+puACGthyjzpNfQmx1LHF1juFUdywoQSm/c/FOoPnU2KH2Ae/x0Z+tKQ3O36c72EV
+IU8WWZP82htw8qMDi5U5gymAIdQJjsyKbg53DpbkEwom
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA2CRL.pem
new file mode 100644
index 0000000000..6aa93849c0
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMabmFtZUNvbnN0cmFp
+bnRzIFJGQzgyMiBDQTIXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFFGAzfpJckg87Q5OC87OH0BlEnCgMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQAw8GlFDmo7lahPoMQ4ha8PN7CTyiVN52wVziP3qO0H
+uFi2H7EZV3VuYHNfJlzeeRtXGjpxBDiYkJJIg/n4ibxdyNtRnCjWTDb0BKbnQuUb
+QxoDRWuzc6G2pJ29H3Dp6DHQ7TLZwCfPfayn3AfOJBtYQpLk6c7ejrgXWv0T1ZSv
+H871UQpCF57JNU3zco9nXYN+I2IVnfgG08JXxGJsw3PMg1xa4v3awSYQ00/8v66G
+lBekAv9no926ub3Hp2DwYwcfE7iLaOdLtnBFPjdFLuZTPIGGJeeIve6NaEAwPqWO
+ZNUKSZipydOKeYsvEVEFUxVApV4TZbcSREvjGXQlYuH9
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA3CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA3CRL.pem
new file mode 100644
index 0000000000..b2cec3d3fa
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsRFC822CA3CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMabmFtZUNvbnN0cmFp
+bnRzIFJGQzgyMiBDQTMXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFJq6OU3aIXWv6kHDPGxR2KhFqX+jMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQAAhq4g3DB1Yb6DUVC11zrj0kzA3Lbth5HDupuy0okk
+5Do0LQZeiwCI37JhQceiRGxtD5riXbo3LyL2g+XqV1OCTXAbJrRAe+5sHmwrH8pO
+PZobXV32KSzzqzPbUNn4QmQDxfQLZgGAz/aPtMDuBIm22oI5iP93csW6p0lHcu34
+Z78RF06bdhO5nd8PbU8BQ+weHoWq8h8iykRzkvxL2d+vk0rS9AbEu0Hs/tqnw/pD
+1l+cuy9gmD5MFpfoMDZ9seQAKJOt5VkKW4rphhX9b3rm2cxceIqlvqQgJip+RM/I
+v3o2PYMSOePzWfRA63LYY8B5sY79W0v/miCl08vsjte9
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI1CACRL.pem
new file mode 100644
index 0000000000..67688e4aa4
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI1CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXbmFtZUNvbnN0cmFp
+bnRzIFVSSTEgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFPoorUEW3ipoF8gPHCM/JgPeAhQCMAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQAr3EikSVaRZA2v0/ARpi/8rC3nZprCYF4pOzM5aC96Hooz
+oEfd6+gFBJWGGPyyQuztWCg4AYXJqqotuSL0rGteXeA7S09i58Vi0rMZEYiaw1HV
+EYvt4LDShzMpeTXstjWCfMlhWnBVII+6ga0LwGD1SWtci91T6zgYlXczH33esi9i
+ras/1f4p1SQDAyo1gHulaaBRJvqQrjE/MaL8q3Ts0kQMM57aI6UeqpydIttGUcl3
+pwNujq4V8yChxN9nB1wQauRsi9xCaqTJwLDqxouZIxdUeFWEQvRAIur8NHdhZrE0
+gvLGaebETdYzvDYEkFdVMsYNWPEmd2fZ+F8dJKYB
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI2CACRL.pem
new file mode 100644
index 0000000000..fa5a247617
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/nameConstraintsURI2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByjCBswIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEgMB4GA1UEAxMXbmFtZUNvbnN0cmFp
+bnRzIFVSSTIgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAtMB8G
+A1UdIwQYMBaAFE3riXHf8AQBsvp2OlixumDdjNPDMAoGA1UdFAQDAgEBMA0GCSqG
+SIb3DQEBCwUAA4IBAQBk9OEGWwvZ0lgWzqgJL4OZ9j0+fjAMdi78QuVFSmvPPOi3
+kLfoOrPjMNmwi42SIz4BEyDt0iVxlq+eYqrIN5q/NqFdjl1w0UvNivcuPMjYtkdg
+4XPJXcfGCfnKbZ1voHnuDlmj6+lpUsXRA0YjgRhmGz4T26ReJO1FQy6+DDqO27+V
+CZ3JM83sNDNlcMeZZk9f46HtFq/kwvqFpTHmqWvvti1hLal0aRetSyckf01vmHQa
+14FbJwEqs6hrwxhLN6Fwd/b6lN3+vLbgucxKkFvRL0JUbPuY2VtFlJk8WOllxXMc
+MYhV7lqBnaFyCO+gWQaEIE5dDbKQTNVpmVRqbT+8
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsAttributeCertsCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsAttributeCertsCACRL.pem
new file mode 100644
index 0000000000..0c5aa4a18c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsAttributeCertsCACRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB4TCBygIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEmMCQGA1UEAxMdb25seUNvbnRhaW5z
+QXR0cmlidXRlQ2VydHMgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqg
+QDA+MB8GA1UdIwQYMBaAFE0H/vYtvLUZGlBN35kEem0zcJBOMA8GA1UdHAEB/wQF
+MAOFAf8wCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAILLUDuBlm16hFFX
+7mKimuJxRJIqqqi7YTYNnUkkt1ZjNwD+Zb+YdPhJrJJMboHIGRErVjSDGwHJs0HF
+HveDuGTcBDgqyJeG0C55xjRlSkPABS4jtWVVROYX/GkccJOjCGEs8A0vMVWUrsP9
+Otao6UOKDtn4wNkaItZ1Mv8Bbk1han+DsqJIdjCc3T8RV6xZcyQ9o0uO7THeyATG
+mPT6keQhjiAbT7NtvSL7pdd+F3U+68etzFFxjwqFr7/wSJxVWzF4vtrwW6tqPcCF
+SXNG3adV0JgEG4luWVHRC2GODHTh8DeygWMtEkKtkRouQMFoZGv7MvgoqlewMTfB
+1YnOC+M=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsCACertsCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsCACertsCACRL.pem
new file mode 100644
index 0000000000..23ab0ba052
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsCACertsCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2jCBwwIBATANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEfMB0GA1UEAxMWb25seUNvbnRhaW5z
+Q0FDZXJ0cyBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqBAMD4wHwYD
+VR0jBBgwFoAUJTjDrsotdXpbTdTAA5KIEyLHbFQwDwYDVR0cAQH/BAUwA4IB/zAK
+BgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAMHmB5cF8VCL97/Gfo/Dpi3SC
+hi1rnJSgDEUQFwICI2Jlyewhfxs6F/EC7F0YYnPPfiA8ajXpGp5ccAvVUIoQUBgX
+iUdjp/RBmalZoyzPw8ZkGQMyy6ehymfyMnH/wKrivmAnxtPm8SGuWVJouu0T5+7n
+8G/vJg4q42RHYQQ7ripuh6wiI+Lf9wNHAzmmGsT6vG0Yrpg0hAcQzhof9xOK88h1
+xyJPReiXKjJx8Uvp/jIRjarGdjh19va1ysYLfMypqeF3C3Lb3J9vuxLS31FdX93s
+wLY919ormQApL+COmVhzilgTKI6ZfgxFhlF3nRNMQDdGc/r3tdezNoMznqBbBA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsUserCertsCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsUserCertsCACRL.pem
new file mode 100644
index 0000000000..e99752a506
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlyContainsUserCertsCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB3DCBxQIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYb25seUNvbnRhaW5z
+VXNlckNlcnRzIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoEAwPjAf
+BgNVHSMEGDAWgBSdvACp3AHN/h2WiH21nk+Z3iTSBTAPBgNVHRwBAf8EBTADgQH/
+MAoGA1UdFAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQCHCFuxTPvpn0fp83f2Az3x
+GKcDG6BSg4w2lISlNPpcuzAOfsNrNNvWBc8jiwdsgKpMr2rFH7HdpvG9k+A5EqT4
+B978vmdJe6d+HJ0a6RINKrDeQ3BWUeZVyzXzKJvJNEtP6+l67BA/PV1O7t93prcA
+sUdgfm074/h81yKVQJKfsE+H9yCXo4XxlvN9/37Du9lNWtlU13tvD1Hc7FjO3pB2
++YJQwmKhlXrt+7K96k9DdPJMXGzJmpICBFxHz8KkC3f0vmYau2h8FzDZV3P0trhO
+azIpQl9N2nqKsYQ57hLeTBRQ3B9tlKm8MH3lzfYUf8Iktufhg/HGuFg35gfeZWUd
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1compromiseCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1compromiseCRL.pem
new file mode 100644
index 0000000000..8aeb421af8
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1compromiseCRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB/DCB5QIBATANBgkqhkiG9w0BAQsFADBMMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UEAxMTb25seVNvbWVSZWFz
+b25zIENBMRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWjAiMCACAQEXDTEw
+MDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBAaBBMD8wHwYDVR0jBBgwFoAUUGjRCUEn
+h+cKTrd4VvsXju4EB3EwEAYDVR0cAQH/BAYwBIMCBWAwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAGGC6QC55Xv0YiF5ILhvWpoLo4gexHND0T8vTNw6fKSa
+g9Re5ty4c1tDwJkRQ3RRY36O82BLImIyx+NltDfnu21/0zLv9XbZxHUraT+5Ch2v
+smfGOTG/zm7a0Ht0QtM6q/br1RJPbxG0c7RUyV4hooP9WDV2UIz/9ba6XfbIf6Ts
+SaDhRmu6P2hbGTuAvKwsMR+DgDRvCQ8OUdc639W2hiVXaf5+kHyQz25BDTDEOptA
+cwgpFmaZiGKgltA63nn4Fl797/VmQbQYg8pmRPsEPeF5kw6n5lbXEo7wLXG4dc4N
+GiqeRO8oi8zU8rI/ddx+zr9jUeJZQldzM9VBsOq2c8c=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1otherreasonsCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1otherreasonsCRL.pem
new file mode 100644
index 0000000000..49f7456ffa
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA1otherreasonsCRL.pem
@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIIB/TCB5gIBATANBgkqhkiG9w0BAQsFADBMMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UEAxMTb25seVNvbWVSZWFz
+b25zIENBMRcNMTAwMTAxMDgzMDAxWhcNMzAxMjMxMDgzMDAwWjAiMCACAQIXDTEw
+MDEwMTA4MzAwMFowDDAKBgNVHRUEAwoBBqBCMEAwHwYDVR0jBBgwFoAUUGjRCUEn
+h+cKTrd4VvsXju4EB3EwEQYDVR0cAQH/BAcwBYMDB5+AMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQASB9/TxIVbi32C3VcEK5Q9oKUrzWbOmzDBEI3G1S0k
+Y451pdZaFfBVzikVlcBVTw5gikTy4TUK6sEoysiEvRlpTzYuBxqKQgXwacRlVNUG
+mzZqYmHQycTyrlZfv4PyVPrz6E9ToTvz9/DymSkswVyBm/GKZ3Rq31G8niu4xHT2
+EBz0BEW3/GN9sUC/Y4dGPcTNJc3OkcrL7t1YKfz9H+dFdXqpTW9wdt6DkyEI/Ync
+3pxo6Qnj8Wwk8U2aiDvKqQh6z/b8Mlt1CullIhKM3SqGzTqGnv7SntdZwTv/1oeY
+dbpJ6VGFTMqXxUkgDnR4ba+Tn9iMkAUakQvbjnN5/mgW
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL1.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL1.pem
new file mode 100644
index 0000000000..2d585f4780
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL1.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2DCBwQIBATANBgkqhkiG9w0BAQsFADBMMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UEAxMTb25seVNvbWVSZWFz
+b25zIENBMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqBBMD8wHwYDVR0j
+BBgwFoAUYGPf0iOkKdZBpKzKhnmYpmUBSK4wEAYDVR0cAQH/BAYwBIMCAxgwCgYD
+VR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAE7Yv0ls2R1n277KQK1TR+2NXC1y
+pY4ZorshYnrshNO+Uy23PtVCJzy0390E1CsDzIZdmz+/rXEDsQOSwCYDWrCSo6hK
+BCyTlWBfqZcNTQJnRgYV95e3yHaqY0mEgY6l+az1gDR7hC5UBwFPnFGNnY0s9JSD
+bu4LOdl+bT8QmTw02+hfMA4Q/I+ytJOkWkLs+5pLg6vyQreprf8MjJDdGxG0oKk5
+Q+vPpYQQmsyBosaz7mNSuZ799BAqRAl0ATMmT5FGldFo7whlDhyYwCnT6djdR3nd
+nsBhSdbf3LXqnKk6i79U1H+Yzx0XagnJA7wGGmHf5oIRRVDaMmQOzaf/sl0=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL2.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL2.pem
new file mode 100644
index 0000000000..657f0999fa
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA2CRL2.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2DCBwQIBATANBgkqhkiG9w0BAQsFADBMMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UEAxMTb25seVNvbWVSZWFz
+b25zIENBMhcNMTAwMTAxMDgzMDAxWhcNMzAxMjMxMDgzMDAwWqBBMD8wHwYDVR0j
+BBgwFoAUYGPf0iOkKdZBpKzKhnmYpmUBSK4wEAYDVR0cAQH/BAYwBIMCAQYwCgYD
+VR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAI78t4QP3CIEpYKHa9TIyjr1Z+lq
+HE7UgiKd4HbsKK5gPDAme9A/DK/klDZoufxmSUnjJ+KO5yE5YiQITW9k2CvZL17g
+Wo8miQcf7HFp9dEEnwd6yHE10ZmqqIJrujTaa9P76KhaovCCoWlJUAyCOSF9DDyj
+5fJyJYUKxXo4FwkcViwsJgp4NK3m+YB3BYFRy/p4PQKPFYYrDMI1yx8B/lOp16UH
+rhYzMC5sohfnCpryHxNTgBu1Cy9XzITBvUniXOtMO+hY/axGojkm/IOQSlzYAahL
+AOc1qr6BEK/tkWxUJanBWTpPh5d5Rojto/uu4fOG4XbQLS4PllRZlCKQTyY=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3compromiseCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3compromiseCRL.pem
new file mode 100644
index 0000000000..acac31a59e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3compromiseCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICPTCCASUCAQEwDQYJKoZIhvcNAQELBQAwTDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHDAaBgNVBAsTE29ubHlTb21lUmVh
+c29ucyBDQTMXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqggaQwgaEwHwYD
+VR0jBBgwFoAULSS3l4cs7tocvt6XhBuvoBUWvmswcgYDVR0cAQH/BGgwZqBgoF6k
+XDBaMQswCQYDVQQGEwJVUzEfMB0GA1UEChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAx
+MTEcMBoGA1UECxMTb25seVNvbWVSZWFzb25zIENBMzEMMAoGA1UEAxMDQ1JMgwIF
+YDAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOCAQEAdQRa9rY2kA/f5hPXwMzB
+IiCNKdlFB5gAcrElHOAFq8MP3BQ6LtE0dH+RoAudtqh92aydcFza5EsMVAQq99AM
+jBjlm535dj9hxo79uqC2ZReofJBNgLL5H8cktqZPCsnyeGgDWDxHGtSE7PThveN3
+4VD9Kstk04qFpJ/8TK3BPca6zEtTb0k8LkpRojumPy+KGNs936HEkGwRBQaFkn4v
+i0gosO557Q4wXMI4AQfuY5jGCavXjUkXoR1BlS0CrQqMFC69J8hOrpK7tOdDPefa
+NpCf+3pMgASPMhuc3W9/bQIQTQL/dFwdfQZCmJUrxu3e04URw13J+rDXaZKgYXb9
+cg==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3otherreasonsCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3otherreasonsCRL.pem
new file mode 100644
index 0000000000..3d20df2931
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA3otherreasonsCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICPjCCASYCAQEwDQYJKoZIhvcNAQELBQAwTDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHDAaBgNVBAsTE29ubHlTb21lUmVh
+c29ucyBDQTMXDTEwMDEwMTA4MzAwMVoXDTMwMTIzMTA4MzAwMFqggaUwgaIwHwYD
+VR0jBBgwFoAULSS3l4cs7tocvt6XhBuvoBUWvmswcwYDVR0cAQH/BGkwZ6BgoF6k
+XDBaMQswCQYDVQQGEwJVUzEfMB0GA1UEChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAx
+MTEcMBoGA1UECxMTb25seVNvbWVSZWFzb25zIENBMzEMMAoGA1UEAxMDQ1JMgwMH
+n4AwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAE32bsFUkG2yqjakiO6C
+h4PUu/ZdW+ec4ZPUt/0Aw5pN/yGw2DJp2nBjHbLEn8qoxZbVX7CM4Kl44520B2Mm
+rn/e/dmOMzfKLV5SxreIg2gzl0Y/mg4JqmGza4sTA8nDExWiRyqQbf7wIgK6pQEU
+sEjvc2RsJrzvIt6QryEMYAJaAe9FaMP++SnKSKisBKzcirBgTz0nrPrNkUcI2o6P
+GHW3ZwPfyDsUhx1z2sbtT3y/svye0Ksgh+2wZc3tU5zsvRAKN6fokw4ADhlporgF
+3WZLQJcywJElK3w7mPc8YL9JKieuAiul/E1dbpnm8dA9Sj5oDyooynxUav/o4HCl
+WDw=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4compromiseCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4compromiseCRL.pem
new file mode 100644
index 0000000000..3b60898d4d
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4compromiseCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICYjCCAUoCAQEwDQYJKoZIhvcNAQELBQAwTDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHDAaBgNVBAsTE29ubHlTb21lUmVh
+c29ucyBDQTQXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFowIjAgAgECFw0x
+MDAxMDEwODMwMDBaMAwwCgYDVR0VBAMKAQGggaUwgaIwHwYDVR0jBBgwFoAUvmbc
+HgwGO/bTiDSRUyaBDWgXbskwcwYDVR0cAQH/BGkwZ6BhoF+kXTBbMQswCQYDVQQG
+EwJVUzEfMB0GA1UEChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UECxMT
+b25seVNvbWVSZWFzb25zIENBNDENMAsGA1UEAxMEQ1JMMYMCBWAwCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBAAJIN0tHbsczxcPvHunvZEwHCJR0fVLav9lF
+XrsjWM5Qsaj0eOddNDav/I/ELvHUL2JCVu0UKLtwlNZlAIPgOKi3wEhf6qSV2WY8
+NW+zQ8Zdk+zuIsE/to9477C7VJfd95fqPhxFRzrfo3R1TCwEskmOVhvwIcsuYOfM
+fNl1ObbutpSkauLcUTJaHkdo0/QO6vSMEEVbmVbqXUOVq/Bbv4QFypTl9tEGCAeS
+SXhy9KG1XxdDJRL8nExHIqzvaBxRg0IJAHGi1ERrL3mlUyq/0AkHnT2kqrNaVzxL
+aDF48Wb41H/JPZjU73gRqAm4HHQcEIR/ZMgCQy2ZqMFxubBzw6U=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4otherreasonsCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4otherreasonsCRL.pem
new file mode 100644
index 0000000000..189002c25d
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/onlySomeReasonsCA4otherreasonsCRL.pem
@@ -0,0 +1,15 @@
+-----BEGIN X509 CRL-----
+MIICYzCCAUsCAQEwDQYJKoZIhvcNAQELBQAwTDELMAkGA1UEBhMCVVMxHzAdBgNV
+BAoTFlRlc3QgQ2VydGlmaWNhdGVzIDIwMTExHDAaBgNVBAsTE29ubHlTb21lUmVh
+c29ucyBDQTQXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFowIjAgAgEDFw0x
+MDAxMDEwODMwMDBaMAwwCgYDVR0VBAMKAQOggaYwgaMwHwYDVR0jBBgwFoAUvmbc
+HgwGO/bTiDSRUyaBDWgXbskwdAYDVR0cAQH/BGowaKBhoF+kXTBbMQswCQYDVQQG
+EwJVUzEfMB0GA1UEChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEcMBoGA1UECxMT
+b25seVNvbWVSZWFzb25zIENBNDENMAsGA1UEAxMEQ1JMMoMDB5+AMAoGA1UdFAQD
+AgEBMA0GCSqGSIb3DQEBCwUAA4IBAQA6VO6zbrPramIZ5tc+d2wb1qV2eX230xjC
+Z+k9zK/PWUvG47ZOYUDccUWhVUgH99nRvoqdhVZrF69HIqdJx8a1+kvi45meJsHN
+faOVtyb2cXnYduYiSrcVZtimnSItAc9LIKt5NvRKVbsD/ZX4Nf+fnCaQEmd1Vx89
+dWq+5Pt3iqORg89D6HzU1GFVE/ES60t7rUbYkxKdfnZhsauX6Mm7ZBIDZK6I14LD
+6qm0UicAFZzpn15jKZWD6h3s3ZGgpFBIR1CkQH5pyTLQK/jPma1mq6ktz3hHjAfR
++BFDWpDxlfjcvBm8TPB8kmPYF9zl7fj8VkpDW/g2jwvDYNwyuYq9
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0CACRL.pem
new file mode 100644
index 0000000000..c1142fd5f2
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByDCBsQIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEeMBwGA1UEAxMVcGF0aExlbkNvbnN0
+cmFpbnQwIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNV
+HSMEGDAWgBSbK7JKPJDFblABySK9Y84J8Yw9+jAKBgNVHRQEAwIBATANBgkqhkiG
+9w0BAQsFAAOCAQEACbNqHOyNhLoyqsp302Qhh2DQ5xn50BIJt8FHPQoxzjgcSxkV
+vSWc3F7o93x2Gy3t90APobAPMq7lgkvI9rUyIdg3jn+mkAyaGOaZNoocBVIGwEmI
+ITL2DEhUSGag4wZgXgxAqkcvasDMihLpVudYujuqQ3sU4FLxr1jwXtdtwmXrYHSx
+W3CFNk07BfXdrjETCFJVP2fmElf1s3xOJJaw82NqWBAU7OGk/CTI0XQwxPHAqnao
+Pywh9giLL8cjIqi77qOQk3qSmPvygMXfsMQv1LkdL1UpSNta0D4NurcyLXUojN9p
+qwk5NGs5KwY5CNr3lncwUfuSkuySGB+KmoSzQA==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCA2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCA2CRL.pem
new file mode 100644
index 0000000000..34b51bd784
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCA2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcGF0aExlbkNvbnN0
+cmFpbnQwIHN1YkNBMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUxgkqG/u46T5oYHrHl86zWFF7dt4wCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAJqExyZTBoPDB2CCe0jcRtIcGgoQJSMase7HfvYA2gVB
+zQ+2yRT8qyeoK/ybY8kBRGQ8pSfv7R4ARlwK2vvAfx70U512ssjSDWpmAXK3EuDU
+JVvVfrmHO66z6LhZ1BUx3ngzk1tnEZnvfCWqMGkRFh3dXT142l/0uWGdEBpr/lyy
+zhhJZ+AvGuhEWpeuAI5GL4Gw7p/YBaMoioEvVVMJ16Jp9k7dwaFF7hSPLf31GCtn
+Rm/6rENr/P+vdFLRET/FG84eGMBsLtlW4y6q2boQImMqZZ6uC5hIfK1Ke4vLfEZS
+/6Qs392dyBadvH2ifTb/L95kG7zGC7fHAx2e+tECzCo=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCACRL.pem
new file mode 100644
index 0000000000..1c2c371782
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint0subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYcGF0aExlbkNvbnN0
+cmFpbnQwIHN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBQUYmcQfdI3xXIG0N5/tRYdyqNzXjAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAFpwGZEbWR35NljL/Cqg+hxRkUXPsz9aZL5+OrEpCBF/F
+AvtTISr5emDzeNbc+DWdsPAIYIOZ/1kx31aA+0e9Hc5Bac7O246yIwM/kyODPfM+
+36CTCsUCHdIlEm2tDNOhn7gHV9y+tJkT49rRp952zeTwloKyMADiR5amnqhcoOXp
++uY55zW2wQLkADXqukppj4bP13g/R9fIZvhkTFLD1FGArjGt9HH1Hfe3n3MjI0TV
+AaD5TOm4Jogz8RsrFDz3EFMUxCb06jcGz+B3Oe5etjJ0aSpbG8d5ETgGAW3ucXbP
+eVlTs9xMJlm4s34hxYOI3Xnu2ksQ3YiHccWpFcNo8Q==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1CACRL.pem
new file mode 100644
index 0000000000..c0dedb88c7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByDCBsQIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEeMBwGA1UEAxMVcGF0aExlbkNvbnN0
+cmFpbnQxIENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNV
+HSMEGDAWgBTz5HFg/xcU3o0mhTN+HPzBR2f6wTAKBgNVHRQEAwIBATANBgkqhkiG
+9w0BAQsFAAOCAQEAYUHA3NQZQRmqjqAh2cWof7Fkl+YK2qY4pF/Yo6L2+ASqcQaE
+6+YCwPVUcjJsNzrF76KKHib7UbodnAH9cBBig1d5a00OFN9n4B81Ha7C0UxKtphU
+gm7wVEBlsHY8KAcV9y+VX11UX9qJ2GEAN1pa/Kio6w42wMcW/oDrAO7UKZtzJv3M
+peqQexGUQYQMbyIh2TTz4TOk2uZovikXa2+1FiUqFPNZfHkZ4eRnQBUQBxFJT1pj
+m0QtotM8+yChkTGrP52ilV/GI3kaLuyIbZVl7adUHiIxUkrEmmkOl7OHhsKwrrTU
+9RkZtL1XF075smmMW8iNRRVEDA3HqJxv2GN0iQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1subCACRL.pem
new file mode 100644
index 0000000000..fd43b9187b
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint1subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADBRMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEhMB8GA1UEAxMYcGF0aExlbkNvbnN0
+cmFpbnQxIHN1YkNBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAf
+BgNVHSMEGDAWgBTlmZa1x31VQq2Bjscl9hjNrJ2QeTAKBgNVHRQEAwIBATANBgkq
+hkiG9w0BAQsFAAOCAQEAE0X1RyeBmz4sK6l9ognWRz3YK1XFln2WRcvR6Rnj5+hD
+paYtOhh2FRMNL11CqqpiG2IC1JPGKA36hx7UcF6LyhcqtDS0YEI9kXz/C5Hk60bc
+wKuIyVOZYgXOnNvsewa2LvGhi8ZUCI4L6DGdV7+OcJ/7PX3Jth+01Np7T15jo/gv
+cCCkFx3fmd9ysx2xcO2Cyd5vtqiEOK7DIoNZ6WguHlYdZb9/kDoRoWf5Qq7rmKXQ
+agJhrU6jWsCfQqY6e1oYlafSRPemgJj4kD1vtTW1D8OZc+iUFy0Fd3EZ6HT8xOAP
+9e0WFDsqL0+K31KZk5tFm3KZOrjJIxvcmLu+a1mELw==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6CACRL.pem
new file mode 100644
index 0000000000..a4bb7e3ab2
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIByDCBsQIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEeMBwGA1UEAxMVcGF0aExlbkNvbnN0
+cmFpbnQ2IENBFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMwMDBaoC8wLTAfBgNV
+HSMEGDAWgBSvvIWu/kyu4Y2XI4jIpbFgC7pO2DAKBgNVHRQEAwIBATANBgkqhkiG
+9w0BAQsFAAOCAQEAmHcSluSxj/t6JAD/aFB0G2KneIGVwM+c+dhxzVgL8/onCq0v
+KLB3BafsI5LQYRb5peAT1mCROTnVIHW0n6bE0RCQIxGty7Zh/kcjRtdL9cv5JX91
+ovjJVm7snc3XR5wUe4+8pRO3HeWurcXj/NvUOmaZg+hEnv8zgICjxndiqtPlQPjq
+/BIIDOT7FSuYwFIB5bcPBvyEjRSR7hi2UDzR9bxjiHBULC8nCbNhk5Qff0815fLK
+TQozMgMeB3D9psl8cDfO2owL77bsQx0um2QjJWW/ByMnYndkzGRt/9SkxRGHKtmV
+2rp5wMZKEQcVOm8v6KmfkdWtMBf5GCXLvjf0RQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA0CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA0CRL.pem
new file mode 100644
index 0000000000..a06b0839cf
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA0CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YkNBMBcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUz3Z2g3OQJMeNo21nfOtSwNTU7UgwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAFyoC4W//fvuVDNbyQCjkcD+eWvMUc48a7gacH/9yFzM
+auBjPEdjd4HWqUjEH7AH75ZgRXnf1n1pL9wh9mIJmVV4hLHfnDcryOMH71gfDrft
+d72DZcCBNZv7jXSMuIjCDn4TtlF8DgldJHQ5uA1f/a+qt1nOV7OCgHStr8PsP45+
+Cf/UGN/hqLWdlvaMB7PF7Qbfm639AE4UWs5NyKQC9PaDpFw12fAUJSO6PRXnSEMT
+9xx74LAC4aZIO5CtnUE/MPIvGgJFdUneXVkGDmsg/jsXbCVhKH7fUWun9IPvehE/
+OW6kYzC+6v943J3NelQUzcWzzF0CH8DwMGEY/GcmIwI=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA1CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA1CRL.pem
new file mode 100644
index 0000000000..5aff3ab9e6
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA1CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YkNBMRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUPJqVnpNeVmLpWziQbJo6bpLb9wswCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAJEL4fmSZTA+fF23RGynu2YEOWQ+YFNJzfYPg8EdimTL
+8AAXERJlbKKh+51nygXhYhUEonLIVmJyK83n7rIbEaOlrfXu2M4CtSi0zPZyTNL6
+hntIw1oK90JumjJhqxc0T9viI+cCoKz5b1Y0VZ5UNrno5fHmhw784TwN8bKxTig1
+DC4mjrk38QAAEV/5xQdS0i4nXP7Tz1PO81ueqMz8kgdp+QHjFKxDOoadq1gt+7Ly
+GRuY2SlF7pKZ6e4SdGF3rJ/sSzmO0wMLkMU4074RRg0BOo7J8ow/WuMVmwi+alQJ
+l5xRRlX1d4F30oa5AuJWrOSDw87HKTfRwPvCF/U6hPY=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA4CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA4CRL.pem
new file mode 100644
index 0000000000..1cc5a4506e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subCA4CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YkNBNBcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUSYXbS/sRY9mZAii0C3qeExdaFXcwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBALcHlK8kwUx4MZCo/sdlhk02Cf/n4mMvGAzXzjTDFoO1
++Nvo1HL5xmZ9KKCTSYmfBHc/qhMAmH31I6UJAVlOdtUcq2VCRRej8OlOGLImThkt
+oClLD6mmtW1YuB6bJtsuFj+GIPvLZfkpOgKg0fDmcQRVL5DO5ajMN/BH/xJtHuiV
+n5DjNZPhJls11DOd57TzFhGVq17PhOrMvL+8nCMs4Zl7DtNKw3EJuTDGTGAB+OYx
+5FJBmick+Mnkf2ElfidE3yBiOlg0Oj/fXjb5cqCa4uR+sAqYOl9BBjM6RfVbOrhJ
+7FuBGqYEmCr0D/FT8EusGdWFDBqfDsWtXVV7LHxcm6c=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA00CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA00CRL.pem
new file mode 100644
index 0000000000..6b19bdf4f3
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA00CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0DCBuQIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEmMCQGA1UEAxMdcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YnN1YkNBMDAXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqg
+LzAtMB8GA1UdIwQYMBaAFLq54oj31FkliuMp30+gBjjdcXSCMAoGA1UdFAQDAgEB
+MA0GCSqGSIb3DQEBCwUAA4IBAQC9tjk91ybiFjv2eYZsjGMKc+y1kd1xc1xIXSdD
+dM5JR+GglRm79uK4gDZ3gTLIQpDVgYPXV+ereJ9Kg9DOl79O3h/nxtS45azUxvdb
+uk/DW7PpSZSOK4d6hW/VgZG2Giv+ZucWNnUGjsXCs4/Hhi+IZvAI/Fhtcbi5cwHQ
+RG1hqJYGsqzQ1V4iBshQnZeyjp0KFz95dIifHNsL1YJJy7ODiCE6RLGaXs064DII
+g3XyZdz7hZOFbGTR7GwkYtSyIHLm4iD/xJeCU6cA6FNd+Xb5Fs4SSteCUd0lurH1
+JQLnUF/Xjt2IowuQFnfQ7z2jq+8BRrIgkvCQp5lzteSqPE1i
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA11CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA11CRL.pem
new file mode 100644
index 0000000000..f85921377f
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA11CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0DCBuQIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEmMCQGA1UEAxMdcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YnN1YkNBMTEXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqg
+LzAtMB8GA1UdIwQYMBaAFNOmRV4CnWcWfZSAD3O5hMZbtTG+MAoGA1UdFAQDAgEB
+MA0GCSqGSIb3DQEBCwUAA4IBAQChBEJUKVtETDiFUgxBvxOrmaOjI5NxDTsqyM7m
+HrkP330mh+ij8w4DJ/kOhHxC0c4EBgD7m4oUbkClmqY0LVRNaUlFHdNvftGJMg8k
+Z6Vveak9+Z3q5J7QlE8hdLCGsnQXL3gWoOjH28j3I72fW5tabTdyq7qPjNKkt0xh
+6Sv9jLxHbAWimSvj6xQ3JxO4UweFvDl72eQb+tFhrJpouhlUv13eF6eaQoVKf4to
+KRjRXWEErBEkb1fEXzUISEvQH8gbzVi8raKG/CWbUfFCkBWiqd3Ahr+w0xtmVV9W
+wk0SlM+XlKRQZ4chc+93RMQQBCC6LwN2rBmyaLUPAtzUOTA2
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA41CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA41CRL.pem
new file mode 100644
index 0000000000..744befe8d2
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubCA41CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0DCBuQIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEmMCQGA1UEAxMdcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YnN1YkNBNDEXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqg
+LzAtMB8GA1UdIwQYMBaAFERapgfP9vPIx0bvZKH1W8E/grxXMAoGA1UdFAQDAgEB
+MA0GCSqGSIb3DQEBCwUAA4IBAQBC2N5Gdl473M+niHqbKh49ObjDXcF0Vbam4NyC
+e5V+1D6PZLlZQDNh0ORk/MnIOYWxchUhXpUnpNfcqReFdP/kIhwlc/Nm3xveO86n
+zWuRP3NrN0N8SRz9YmLkoZvDNL5gagKCwLzeGTTi6lMKqhZnmcDH3ko7k3TOlCO7
+I7f6jEp6ECAHUbDE7UyJC93lYu98YpaM5SV4L8i58/GBpCwGsGirSxws7Xhrgr4L
+Q5UUt5v3GDNW5YiRBEuG1kMlBC4T4gX/TNsdu/8G4RT2hO+SIDOtMNfA4D4TIiY0
+OzDtVVto9DYarCyKlQKHzb6RrFL8sYZJc213B/1O4qRNeJCj
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA11XCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA11XCRL.pem
new file mode 100644
index 0000000000..20392a29a6
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA11XCRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEqMCgGA1UEAxMhcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YnN1YnN1YkNBMTFYFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMw
+MDBaoC8wLTAfBgNVHSMEGDAWgBSD2ri1xp3Iiwh8iz/tGnIl4q8b6jAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOCAQEAmKydWhVC5ytcp4DjzRPCIZ1myP9MGW97
+diaTIZaFdYYz52k2GD6uHBEL1rALDG6e2DiU+YbmfVJHE5RbehxwtimoWsHOtGLO
+NPTMBPwGoGHIUyR2Ex40oozOrprl5tY3y8uticLLyQQ4meUTrquM7aAEaHHYGwU/
+FziX56TGzO9Tm6ci+jlTrOwHy/uj/AVkkQS9RHk1ytgrG54WSwh/diP9qJrNGvBe
+a8Ditg8ijMjGU9J7NeDJn33G0U8/R08ZOfo0kNqD6mG8Np5meREfiCt5UGfwBOV1
+EVMpK/Liv20yc7PcJT2lKGl1eXZmiZ7TLGV0KJWUWRNy1o4cv6a1ng==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA41XCRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA41XCRL.pem
new file mode 100644
index 0000000000..8674072d00
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pathLenConstraint6subsubsubCA41XCRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEqMCgGA1UEAxMhcGF0aExlbkNvbnN0
+cmFpbnQ2IHN1YnN1YnN1YkNBNDFYFw0xMDAxMDEwODMwMDBaFw0zMDEyMzEwODMw
+MDBaoC8wLTAfBgNVHSMEGDAWgBSh7aLzNVSln7xj5kdqUyRsSgxyLDAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOCAQEAB9m9d1A5cqTJSbdKDkv4KfjAJDsKOqyf
+l1QLXj28Mq43YlLbcoaivW0yL+44zumb02ZKr4v1qd7tP5QLPvv+Ew1pQwC3I8cp
+Hq33iO6VX/ZLVT+vD8wguU/Lwq+oZGFDHMatgq2CGtZ2lJbZ8/I11wR/otTBa9Ne
+krQ+n79avPaAagJoyz+1HKSerOyuyFQ9GP/v64sS3YKy5LJZ/VXC9PlpzU523ENu
+ncwldAgVmNTgxa+kPmdIzUkWLHuuggVltFtRbVsiKyJINgNcmooZhDIHCk6LsXYY
+fBMmxX4xFLGzi1p4sobgJgBkY8YBDiB2xEslOFkwKIgpRfX01T4IZQ==
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/pre2000CRLnextUpdateCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pre2000CRLnextUpdateCACRL.pem
new file mode 100644
index 0000000000..57afdac2b5
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/pre2000CRLnextUpdateCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcHJlMjAwMCBDUkwg
+bmV4dFVwZGF0ZSBDQRcNOTgwMTAxMTIwMTAwWhcNOTkwMTAxMTIwMTAwWqAvMC0w
+HwYDVR0jBBgwFoAUHqhHnGGAaCixQpopjOYoAymSA8wwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAF6aXbwxymxr0Q8xGFXYqmr5vzuVUREiNHYZMX6N6pqI
+noDmGZN1FgX3FSkcKlsiVYWPRp8VygdNPt2sctjy5OV3J8kAKXzoll7/cHVPWj3b
+uGP8B0Y3sk7oCupwlI/lPwu4Yf5hHcUofyGV4yeOCNn0BHGtOzcfStxbO/K2sG10
+ny8KKkH/+horhqSur2p6z02jq1hcHsQLt293tPfaG6skObtvWgrajbE8rPKYLHiS
+mkh+9Lxtzv/+WOR7YeBgjfg7Eu+gLC+2rrA4C/UiQT27baIzEJkaz3qarL8p4qWR
+BctCVbNVbcrgSA7pT3kavp4Te5NHLg1vRfmkHka1ESk=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0CACRL.pem
new file mode 100644
index 0000000000..faecb30bdc
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MCBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUuezfulIiuLi+aveiEtUnINZnBDUwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAErZavnEyTgHh/ez0LB7FgIfWGuiJB+NDDOQBT31adQW
+nPq1ylOQnG5ALE9askbusXrsw8VHIffm8bBd6JRdFXD9p7S2SzFE5skbRHVs71qr
+ytTzQhoQgYMaWRIYBx5Yg9J0+HSp7rip8FPRoPA34LRoPFmtvGyESnFQCZQMj6Ar
+DrRhaj9MFsicWAObMlIWNOsISnNkDd1s4XeRTMbZ6NgvyZ9Oo6K4S9YsPJypmaWD
+rAtkwSqyyH9yT/Ip7jNFdYfin5oE2i+dN4FCWzQXyr+z0l6dWdw/sjiDWRHVQTkA
+G/F4Ro+qR6bVtq9wt/H1qbauMxOqI+OILjfZARtV/mY=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subCACRL.pem
new file mode 100644
index 0000000000..6aa182da50
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzzCBuAIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMccmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MCBzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAv
+MC0wHwYDVR0jBBgwFoAUvmJ4/Tu9bpwLM/I7MqpBCPPliVowCgYDVR0UBAMCAQEw
+DQYJKoZIhvcNAQELBQADggEBABmiY4GL9Z4TINu3A3r2ReqPCf6NBrK838gjCy5y
+yomt33rwH0sDWcdU1YtKMk1iAWpBBon3nBrfylsFDAacz9oqvHBnCSYnO/b3WWLv
+rv80IaJoV6IeZC1CF7vXFcUWt0VnUgVxNzhLWOn0GEu/R/W3HIPUUvpg/0+RVG6c
+WSPwCUAidFY88P195evwDEXaKykQw6LzAlnWMvrL0lviPl4Px/GDUOBp+aZaDz+t
+ktuljb5StVBqdQ4XzemwS12ZkAGw//synft8xDg7c1Pq7csftQ1SFuEvkRaobXYp
+mSWUqhhm5pkRQBxPySvpDiYCOiQbsiTyAAnYkydIeAkX1Ps=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubCACRL.pem
new file mode 100644
index 0000000000..58a10374de
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0jCBuwIBATANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEoMCYGA1UEAxMfcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MCBzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAw
+WqAvMC0wHwYDVR0jBBgwFoAU69iXen96IzUZ5M+XJCcizGenVkkwCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBADaIskgZjnU/+X04sIHx4MxEDo7nCtfaRe6U
+sgYqAEr8u9JCuba3tJgEud2meu8XRkQjagttBmG52vxS4rMiu6Xq79DPWLrdKc3x
++1Tx/wF0iACCp7B0aNfFnrF+Cg/XCQqeVlthn8EP51HmFl+Fu/0szwhHS3N4Nh67
+C7QGGL61vSUqK3V9tRSn7ubAJBJp+BFbG0uLvOlEUbs4iil1f+VlWlXr7WFfKw0F
+k9prVeYBcnyV7X4uLEpQZGk26Qo1X63H+aMUhSehqg9v+M5A8/pq5MKCRwD6S3Ej
+h8DoK5dmqjOrjfBGsS8Z1az1WsVDlC7EO/BFgTXM349j406Rpe4=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubsubCACRL.pem
new file mode 100644
index 0000000000..34265b943c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy0subsubsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1TCBvgIBATANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTErMCkGA1UEAxMicmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MCBzdWJzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgz
+MDAwWqAvMC0wHwYDVR0jBBgwFoAUtdsE1sggCC9aQcd4o0SJ2s4ua7owCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAChXnVu5rzda6+f2NZ1nWf5qyFfBR3qb
+IwWmBIAATlpil8e/RfSjzkNP2SrKhGi7KDseMn7F6MsHlGp8McNb7ryQcd0+PSUV
+m9hELQcBosZrU/XTdctfTx2/k5mfixlK+UYqz3k7rFfG7RhdkhUexaCQFSCgBgxQ
+RhHlXyP8xpSytC0T6w8gIXxUQjK5jEBwr8uVYhadcCsQnx4I35MXmNUb52BohF3s
+p3pOdgGiCn5CmgcqBa1ybBK5qtKKHav8H6dBzNLeuG9giZC/ALpFhzB0fgkGXXFr
+52zZxy2Z8dN7OWAMTski7B2c363+TwXI7Y/Vuq3qIYLxdcFWix3zefY=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10CACRL.pem
new file mode 100644
index 0000000000..efb8976e4e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzTCBtgIBATANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEjMCEGA1UEAxMacmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MTAgQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqgLzAt
+MB8GA1UdIwQYMBaAFBnzTATRX9WAR/P4NCwRgeSYz2ufMAoGA1UdFAQDAgEBMA0G
+CSqGSIb3DQEBCwUAA4IBAQALMOPr5blCX12/wmoUiyjhE3KtwudCyjTFeRfWdh1y
+i74p1lKaCtLS2Ccqelr0fuD98PSUvKa37UrWDtj9fXTCgbe0dB2upF/hfkaCEq9b
+vO5HAuBB/hBwR/F1IsQ7qHwDkQA8WhXRfYsrneWfygUtQUzrji/nz0yF5l+GnWWX
+iMID56whZjh/ch6Uvb9qYJO2p4R1KMFJ7G+xKJQm+TsTx6iYIDP2Q8uedSstLasu
++d68KWDFkf8pAXDDgpp4ldUflWbW7Wa7tSHodxE9D9cee4Db7jmXyV7BqQUxYUwF
+9qj1mjdivXtpeTsNKhX0ASsm4jHKmSjKOYvkEALiALq/
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subCACRL.pem
new file mode 100644
index 0000000000..125c24847c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0DCBuQIBATANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEmMCQGA1UEAxMdcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MTAgc3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAwMFqg
+LzAtMB8GA1UdIwQYMBaAFG4YpmEkD2jbLgYRliY3r8l4KVYGMAoGA1UdFAQDAgEB
+MA0GCSqGSIb3DQEBCwUAA4IBAQCZ/4QYxzZaC5BIcXVOv0Pa0KrQdGUx6Ae7knJP
+df/x+IrPcwEHZeD8dQUYnWT7EOvcJBRS3HaI8xD0+n3IFR1+ayaQuV2UCQSu2WbA
+FXx+HRApe5lWOVZsG9vg7V2ccF+8u4qIaLxxTlfOGL3m1FyK8/YXhDfNeOwRukNG
+JxHdfhaqHFtofV3Spa2HcUwKbNAEtu4SAcW55ZV0q/W1tbOBeYwBMNoNMKEVPf8B
+FhJh0ID0xyoFdFIDsj0uNkvNRazAjnUGtz0m7/PZE22qvPH2Bt9gII5UEIbWY4Nv
++Kz6TiXfjZZkl5vR4DHy6qOfQxVDbEuehfRxsBLngKLXzW3r
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubCACRL.pem
new file mode 100644
index 0000000000..7754862b2e
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0zCBvAIBATANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEpMCcGA1UEAxMgcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MTAgc3Vic3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4MzAw
+MFqgLzAtMB8GA1UdIwQYMBaAFFhQTw7y/nIkpNB3P6CWLHe1JOghMAoGA1UdFAQD
+AgEBMA0GCSqGSIb3DQEBCwUAA4IBAQBc9QUsQJu8eEkhD/bB2k137z1Tw2E+SOGM
+InCgU/5FjqgVS8frk2POJXSyTdZonYpJvj3fEuXLp/eViZ0+V3oe31vnFtzeQ9qv
+//rOvJd0b3yOtLFAB58oF5yms/4Zj2ekeWU38HUrQ8lVrT3p0nj7V49ENlaiXwVD
+vhsaTShUxHnVPb5W4nX/uvl6PUWXZLwzWvr3foaAbf0rgV3eWhpjspPlE0ajF0Tk
+ButtK76M4AJocWeWr1AupATbtGU+vvi+I5D7YrBGn7qxF9BvzMiq65H4YHnNfiiF
+iVtgU+GXZxft7+hmVYgX5eQKcDhSQdKKB05U8r2Q5ZRFq8o+b/Vr
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubsubCACRL.pem
new file mode 100644
index 0000000000..caac766953
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy10subsubsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEsMCoGA1UEAxMjcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MTAgc3Vic3Vic3ViQ0EXDTEwMDEwMTA4MzAwMFoXDTMwMTIzMTA4
+MzAwMFqgLzAtMB8GA1UdIwQYMBaAFJaMcfwVqDvO2cT4w9BfaXF86ABLMAoGA1Ud
+FAQDAgEBMA0GCSqGSIb3DQEBCwUAA4IBAQBzlq+27lis3jgVun42HmkOAJ9zzdIt
+iyptjiWBCLV5lLA3gbiuroQbr6cKYWhP/qQ91g7MgSzvq/cVwCudSeqIOCJZUwRu
+Kpu6AKkK77GfWA2/GC4ZtIhsHIyA0P0MTa2ygmtxIn0ufluNzgEognWxF4Kdd0F6
+g1sJL547W8byiNlD6KtZ8Oe9PQOr1tevTWvWgSRj2bitAfcwrEBSsyG1eu/Yyeun
+opopG2H28TuBcitgZA7mjicFqzibabUUA+hqZ/X5cL+JiR+84VWc3o5fPFwpdAWr
+09gYI6qG+5O4q7tIyb8d8dIVO+FcKV+mkbZDpFu+3VWRFY4GkBjq98uJ
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2CACRL.pem
new file mode 100644
index 0000000000..acf0e69c78
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MiBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUNqnZ+6o4L6D3TDvZhZ2aFaMtqccwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAD8YETFOSpFWhTbHdjwH+oNciH7CRTbs6UkICQVsnIN4
+xt8m4Pvho9VeU9KNeIvmcaKaJk8HrxbhKlluWFUS/IMk+U6SQ3QSdnxLtJdvC0JT
+iARR9dKR5YX/G0JHJaAO3ULSu8Gaj093TFfQPs2ALcfg5G6BbQmxJ6qCwp/IZ61T
+x71148Lqbb0k2JVZgnnPkhe1k/7no2rjmvu4Zp0BuFkQIwceN908LGSZmuVf09R9
+6FUkYhY5s6tM0rHLLS0JGgCuYyl6RTeD/OemNh4QfA6z6N+WmvAUwzbRWtm/gDOx
+hQq+8Qcc+HErYcZfSg9cgJqRGb1J8KGGd+92uK1wHmo=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2subCACRL.pem
new file mode 100644
index 0000000000..426415e452
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy2subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzzCBuAIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMccmVxdWlyZUV4cGxp
+Y2l0UG9saWN5MiBzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAv
+MC0wHwYDVR0jBBgwFoAUIHf+TDCN4rNRHY+w9xx/HYOYDkcwCgYDVR0UBAMCAQEw
+DQYJKoZIhvcNAQELBQADggEBAHnk7z+QEkfo+N/q7+bAHDhYCm1ax7Vg1PSs/3WE
+OvoTOp65ghyIX7UdKdmUTpefa89C2PRORNB06xIYzQSeCkCoq7bpTW0hzMfPweY3
+MwlEqnllWldcWgczSOxsomOjJ6os81onh9ZyICGbIZLPL+HZtfPpXKdyw7riGAm3
+h3V0pHznhgcm4XEpe6iHovoFbdmWs73G0vSjLnTyDmSBVjAiEVnZLut10BGyjCRq
+ZQjLcXfXtF1aFymk1p/eN5QLMaNZ59uoGNgsjRQmod7H1Lezp0r53yA1bg9P7yXU
+RsY/pvoiI9j5t3svgZWKC5wuTmJ7nMTwlqaZDS2nWAw3/TE=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4CACRL.pem
new file mode 100644
index 0000000000..c96cbf6314
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NCBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUzdHczNQxYwcsXTaxD42edb5LXmMwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBACOdVMcZUqu3gJlw13ZK7/NcOtSAuvEOVHfjChSXRFkp
+gVhiUJqPQYg0fs6eORxMRc/EyKUTNeKQE/08Q0pN69TSShhHJgrbI0qL+z+1l+OA
+615L/Z658Nv7uKLt0nk/RkguMQw2xIlUEKvC1S/MQAcJAiBKPnSA7fCb93ph053o
+ZOVorML758OWTjvXGykpiJMbxgdS1MQpSRrU3FGST+auQhI4Qet5QpMlA9nfHwgB
+l4lUkF73iHwV8LNHI8t/Pnd5LkKd6XWiDrQRAzhrh/UhmcspUJyFlLIxthO2Az6n
+/FIQMAHm0mvyrgmmZSsw8HCseOgTNCnQEEnWLodqabI=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subCACRL.pem
new file mode 100644
index 0000000000..332b2ec9e5
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzzCBuAIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMccmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NCBzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAv
+MC0wHwYDVR0jBBgwFoAUfe8OlBe79qeX5tgiSENIrLPuuo0wCgYDVR0UBAMCAQEw
+DQYJKoZIhvcNAQELBQADggEBALIg2yo0C0OaDGoUWWB1PeKkFzO29Zrz7os0w6Ta
+c4W0ufJ/V7W6GTWtNjN2zoVhWe1DJzAivJejwI89ES8kpKJvQ0FIqSmeKk6v7qM6
+gZuhVsvemsw7mb2LVd7t6ismBYCbYTBnoHc/dW+zgHLXNsjHA7aIq3zEzeiJPxgy
+qf4a48BXm8WKQVFLAJv28l/B3nanW2+rYMnEMUBlI7ytGE/gcZ5WB3x8i/NxQAa1
+mBBrHVFyNLJX1pxCmg1myP9dXj1ljlSwRHVgxfYhVcfl5H72cJg/zTQNELpqjlqO
+kM8wXuKpxsFsJpGBOfl3zjeCeFmjOyucmB/CZT3L9h+H9sY=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubCACRL.pem
new file mode 100644
index 0000000000..ab40c50e73
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0jCBuwIBATANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEoMCYGA1UEAxMfcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NCBzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAw
+WqAvMC0wHwYDVR0jBBgwFoAUqerm056wCZev5/4eLhAyoRBnTIYwCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBAD08KCdOiCGTM5PYyFE+HRlYaBd1VnGIFiAb
+fCdTAlEmK+/NxqlrBGqz1zx6O09X4u/XsmvwI5Pi9ujsyxN/aHR16/JBWfUEPKDg
+2a7XOoAyKWO623Z78xWD4DbfQo32vsyDpe2ydCnYiX7qPf3muC7KNROeHMt1QwK0
+/T89l2NJmPBE5+sSCMMZ+8tY1GQgVTeNczO8zzoYcG5XZrKs503sfLvISvcCpre+
+l/LeByAhkJpr+/wlR8+eTrUMpZIhnB8x9uk9hi0YBBbdKmAR8Sqc4U/2yUPFp6ue
+FyF/txO3HXmTNYLFSYo0+G8uEkQCOFQn7BHJOybYH6ertxgKhdQ=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubsubCACRL.pem
new file mode 100644
index 0000000000..986abff429
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy4subsubsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1TCBvgIBATANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTErMCkGA1UEAxMicmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NCBzdWJzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgz
+MDAwWqAvMC0wHwYDVR0jBBgwFoAUFLvRJvSegTyLDhLP2XsVsizcoyEwCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAC0JNUPn/JJeMGuu1cv0PUV36H5zZk3z
+KXq6TT6CRatXHsIRl7bwvsJ2wnkkT4QUM0xeVl8Q50Thm/P81vxVb48w3ahA/mm8
+QtxJwkPK9VPV+jkfAW5vcTVzJZlr9EWhuYgfqC0KdUUiE2omtydtinQhGdI0ooey
+U5XP6voQwf8BKCYOgXxQNJtRE1+W96SifSUQr07fN7gXUp2MgZYwp8QPjFZrX5dH
+FqgmhSv6rdjO9knE/guw21FzA0F5rM6HjNuxre3qont7vlzpI9sx7VzrR4J87meb
+DhRujiMvn1Ge6qwNPGgSnd8P/LsA8kltmewk93W94u74GqfwQCtFtxk=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5CACRL.pem
new file mode 100644
index 0000000000..6b45ed261f
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NSBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUu5GDq66u3lzY4PKQPFz6ny7hOWgwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMz51cm+tJdOQUKRaISFOoTqH2PSV3W1i/VLNoo60huI
+wSIOg0YNxG2wXxFH5UdH+SdRacD3qHlAKKyTsWgvhqZgdgbgieS4Nc1CpGnyxeXk
+FCdGt4OJ6mEToXFqJayWwR25ckoJp8k7gpseERoqgDCTPvKjp+1yrznlX8VWTKya
+dgVr+LgSLzCHY8HYekoKcQRbFWbnMBw5K7VE06CLJJIx9kHgDOU+Zqxjy+cilIIb
+HxMmsrxCwKW+ARA/LBiLpn26m9SC/fHstIopRML+1zkbXCoad2VwB9GyvLwzAoqn
+MwJuDzT0G/MZCB4n/s5J/urXFkYBVCQpivlfX9tNUU0=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subCACRL.pem
new file mode 100644
index 0000000000..29a2c67261
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzzCBuAIBATANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTElMCMGA1UEAxMccmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NSBzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAv
+MC0wHwYDVR0jBBgwFoAUN9O/3txQx6/IiuiSsMRIYfA6BAEwCgYDVR0UBAMCAQEw
+DQYJKoZIhvcNAQELBQADggEBANAIgl9rVP+LLEYRL1+oori60bQTlB1+1LBFItkp
+7BfodwaAGRmWO4GV6phJzxjpi1aKVGuCg7vlwzS+/ns0mlAaghPxpelwd/KACsv1
+AnrbnVR7AW9z6/ipRID0K1V+8EJmjUdD05BjXoyDKP5Jg2v1joSB306Lv7EDGqBh
+babIXd9ZVrMJBFhW8Zp9A/c/P72LrfRkDBi5rhxI8lJeDUPTfQVUGn0nh2MHx2LQ
+vDd++QtcVY+4tPwkiNJiVNBu5dec8DBuGwNcxcZ2FnpExVglJuFf9AXlXPlXs1Ri
+6+WLqQ6sFjS8R0NhYyILqm/JtXO9mKzXAwa53nCXPytwtPk=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubCACRL.pem
new file mode 100644
index 0000000000..9370cde1bf
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0jCBuwIBATANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEoMCYGA1UEAxMfcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NSBzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAw
+WqAvMC0wHwYDVR0jBBgwFoAU+IIvef+0fggC21uvMp3kNWG1bBswCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBABWp0q1/e5b14+ebJrBOiLc2iTt8KlT0ycPq
+EjyoPsQAO6krSC8L+PdSOSv4if2Udf9Xrgrk5zvDIBkVrv7+QlR0A/5kBRukZimS
+L0Q5lCJjpBmvgZRu/c5bYm32iIfJtwwEgXN4fNh3QESi+KGB+IopD9+/TxV8nAWn
+bTqJ3YPGM/tlmkpLHQD7lt7PAHe/ofrkJc8L6ircKUzmZ4vce3HQtQ79rlbyOLxW
+bN7O9mfUymz4SN/gsnll4HpJKrSBTeINssUcCUwpZ6p1IJ0/tmZHpF39HZo1W0ts
+ZB6DWqnOL5lWsw3x/QiKVgvfPjKA1mvqsXVhy/xvNFGT3kyNcC8=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubsubCACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubsubCACRL.pem
new file mode 100644
index 0000000000..db6c01924b
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy5subsubsubCACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB1TCBvgIBATANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTErMCkGA1UEAxMicmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NSBzdWJzdWJzdWJDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgz
+MDAwWqAvMC0wHwYDVR0jBBgwFoAU+mK6vX5eX98fuge+H3k3gtz8EygwCgYDVR0U
+BAMCAQEwDQYJKoZIhvcNAQELBQADggEBAGQii0uxuUm9ok8RNEseRwlN5+lK2R2A
+VZUJ+vZ/O+4ye3x1RIcZ38oWF8zrGZqp6Afos6JbZLSUAGRrbmYowxXCT3vV3yA5
+SBdIoXsByE2Kh6dyeNbB/jDFRNP5rbKcwJJGqXrfnRbHXOOizHPMmWTBscj9lit6
+HIzQhlURn1bHP2GcQ17uBGSYpSVhVV247dlt4+HgReog9NC8D26xPVdnaodtBYvp
+oknWHAcjehSi5kjt4/DJ0Fym3yHGbwpkKWT0A7RXK6cCRWfvJDnGu5vrIKigQo7q
+z4ZIKE1aO2tXJ98dc8M6Z6u1MZDnn3n/9JUAhZPtZ9Gb4eEUU+qgrRk=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7CACRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7CACRL.pem
new file mode 100644
index 0000000000..99d47f5020
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7CACRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBzDCBtQIBATANBgkqhkiG9w0BAQsFADBSMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEiMCAGA1UEAxMZcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NyBDQRcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAwWqAvMC0w
+HwYDVR0jBBgwFoAUbDGXATUg3ts15QppWFmIZMwhzkowCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAHC+EDnf6+cnW0GTLMwWoISAn/jJ++FGGwmSv7O8st49
+YmlngcgSQdE1CmcLFM8Lsv390rQwtm57E89aLHSpSbVXvAS/ZvyS5yRgoxGJLw5r
+ulwKqAmjzrXPB/0A7mjLwXVxLBZTAqJgnIFW+qE679S4SKLWOsc66HRFsdQmFbwe
+BiF1/V5PbM83sNyN+boyBm1w5YrasEIWLajc+s+gF1dbQTKuDziD52azMegWvfIO
+xqixHCdK+CpIFObodAnW2gPHWTicXYH+ZwagtqQbI2EM7SdnbvQQe68frsfqK1k/
+SGXl0LfQl3/GmYynOg46FDf53/oRxz0bwsEa8XBpXpY=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subCARE2CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subCARE2CRL.pem
new file mode 100644
index 0000000000..dd8aaf35a7
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subCARE2CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB0jCBuwIBATANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEoMCYGA1UEAxMfcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NyBzdWJDQVJFMhcNMTAwMTAxMDgzMDAwWhcNMzAxMjMxMDgzMDAw
+WqAvMC0wHwYDVR0jBBgwFoAU51wljn6qTHeDe8PqadbHojThNFkwCgYDVR0UBAMC
+AQEwDQYJKoZIhvcNAQELBQADggEBACgCaW8g9ZHgkL+vcByM70Ao9B8BhlunjYHK
+905EiAQQ3OqjJzEE5YRp0uhrbChY1xoHKAjE45VIhK1aADKyV5Wt+ugBAoFLAPcN
+9FQwvTEBjUwZPCQaV54hyt/PrDBh8GJxnTpLnEb/+gl/hu2P1tDD0Zqb4BPoOxur
+abZ0PpzSCPHJdQq75RX/KZCEkaOsa4wHslFHXJXlLLh5vRqvrM23NDsY9lsNb9+3
+3mSVngQWhqVJNdFsMJisyzq88Iv3cSmgzD4oowE05khNWWhpbgxtdMYGWVqN2qEg
+EDI3oExT5CeehzLWuI7dnhKZVJl7y68n1s7KHKJtMb9vnGsiNZ4=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.pem
new file mode 100644
index 0000000000..cce599a5fb
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubCARE2RE4CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2DCBwQIBATANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTEuMCwGA1UEAxMlcmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NyBzdWJzdWJDQVJFMlJFNBcNMTAwMTAxMDgzMDAwWhcNMzAxMjMx
+MDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUbv+NCItm/pule/tkM2XqA5VIlJgwCgYD
+VR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBADsVgmLjUlCjkqyM30ho6gvaBfoZ
+3IEMbL01Z1YWCVL/M7dkcp2H98jCurGWlEQCqlx8gXZRrrO8u7rtpHKu0oUuCcrC
+6bxljOwBRgdv0TnNB3k+FrXcaBT7/SJtGhLwjh0smLC69eI42quLSEXXHhlpmYiJ
+1cOQwPCtd+KHbeDMoKi6j7HbFD3OR7jH+OsbnwMpWdlyhDeZlXXh5vbLXtN/j6VH
+9TWdi/Tt6z049i5YcCL2l5Kq9Mp/Y2DRpLQAycHpYL+/U8yOyUq3A3MYO/fdWo1k
+H0nSPreisWgBkSD/u11jR/hPbEH9SXv2nflBaRg/9kSoAbuDknlvrLGxwbQ=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.pem b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.pem
new file mode 100644
index 0000000000..bd1656505c
--- /dev/null
+++ b/lib/public_key/test/pkits_SUITE_data/pkits/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.pem
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIB2zCBxAIBATANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJVUzEfMB0GA1UE
+ChMWVGVzdCBDZXJ0aWZpY2F0ZXMgMjAxMTExMC8GA1UEAxMocmVxdWlyZUV4cGxp
+Y2l0UG9saWN5NyBzdWJzdWJzdWJDQVJFMlJFNBcNMTAwMTAxMDgzMDAwWhcNMzAx
+MjMxMDgzMDAwWqAvMC0wHwYDVR0jBBgwFoAUeyxRYTEVrawsa6m+OzsYGpKqf0Qw
+CgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADggEBAKC0+mcSVMrZw/Yabdg8xvnX
+VJrufKnwa2sdt5WXbKX73DCh2OvTm5gJg61AkjghRN4W1VfHpQqc6lsrWHlFK+6r
+GbsL/og+JwfDgiHr+xLf9hmxlS2Uu+TK1HYUVGw/VNLoLPqre1tq4ag4W7re2Z3g
+BBZ8OyS0aUcMYpI1rp9/+PWOYo/9cEDFK2zlsIazYl0Nk8Jz8xWVzFP4gf5RXb5i
+ejUZI578baWPUfUUnEQMSqiKJmHNxPyY6REVUEFkMDu5dOlCu0GfsLBw61am3hGQ
+XvILnAB1SRdyO5uNlJLkRh9EB5aUDRUC5HydfiaSTzb0gkzdKgCRjUUsUjovcPg=
+-----END X509 CRL-----
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 2b83bc0a5c..ea48479f0b 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -20,85 +20,19 @@
 %%
 -module(public_key_SUITE).
 
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
-%%-include_lib("common_test/include/ct.hrl").
--include_lib("test_server/include/test_server.hrl").
-
--include_lib("public_key/include/public_key.hrl").
-
 -define(TIMEOUT, 120000). % 2 min
 
-%% Test server callback functions
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    try crypto:start() of
-	ok ->
-	    Config
-    catch _:_ ->
-	    {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) ->
-    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(_TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
 
 %%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-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() -> 
@@ -119,30 +53,46 @@ groups() ->
        ssh_openssh_public_key_long_header]},
      {sign_verify, [], [rsa_sign_verify, dsa_sign_verify]}
     ].
+%%-------------------------------------------------------------------
+init_per_suite(Config) ->
+    try crypto:start() of
+	ok ->
+	    Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
 
+end_per_suite(_Config) ->
+    application:stop(crypto).
+
+%%-------------------------------------------------------------------
 init_per_group(_GroupName, Config) ->
     Config.
 
 end_per_group(_GroupName, Config) ->
     Config.
+%%-------------------------------------------------------------------
+init_per_testcase(_TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+    [{watchdog, Dog} | Config].
 
 
-%% Test cases starts here.
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
 
-app(doc) ->
-    "Test that the public_key app file is ok";
-app(suite) ->
-    [];
+app() ->
+    [{doc, "Test that the public_key app file is ok"}].
 app(Config) when is_list(Config) ->
-    ok = test_server:app_test(public_key).
+    ok = ?t:app_test(public_key).
 
 %%--------------------------------------------------------------------
 
-dsa_pem(doc) ->
-    [""];
-dsa_pem(suite) ->
-    [];
+dsa_pem() ->
+    [{doc, "DSA PEM-file decode/encode"}].
 dsa_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -164,10 +114,8 @@ dsa_pem(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-rsa_pem(doc) ->
-    [""];
-rsa_pem(suite) ->
-    [];
+rsa_pem() ->
+    [{doc, "RSA PEM-file decode/encode"}].
 rsa_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
     [{'RSAPrivateKey', DerRSAKey, not_encrypted} =  Entry0 ] =
@@ -201,10 +149,8 @@ rsa_pem(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-encrypted_pem(doc) ->
-    [""];
-encrypted_pem(suite) ->
-    [];
+encrypted_pem() ->
+    [{doc, "Encrypted PEM-file decode/encode"}].
 encrypted_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -234,10 +180,8 @@ encrypted_pem(Config) when is_list(Config) ->
     
 %%--------------------------------------------------------------------
 
-dh_pem(doc) ->
-    [""];
-dh_pem(suite) ->
-    [];
+dh_pem() ->
+    [{doc, "DH parametrs PEM-file decode/encode"}].
 dh_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
     [{'DHParameter', DerDH, not_encrypted} = Entry] =
@@ -252,10 +196,8 @@ dh_pem(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-pkcs10_pem(doc) ->
-    [""];
-pkcs10_pem(suite) ->
-    [];
+pkcs10_pem() ->
+   [{doc, "PKCS-10 PEM-file decode/encode"}].
 pkcs10_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
     [{'CertificationRequest', DerPKCS10, not_encrypted} = Entry] =
@@ -269,10 +211,8 @@ pkcs10_pem(Config) when is_list(Config) ->
     Entry = public_key:pem_entry_encode('CertificationRequest', PKCS10).
 
 %%--------------------------------------------------------------------
-pkcs7_pem(doc) ->
-    [""];
-pkcs7_pem(suite) ->
-    [];
+pkcs7_pem() ->
+    [{doc, "PKCS-7 PEM-file decode/encode"}].
 pkcs7_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
     [{'ContentInfo', DerPKCS7, not_encrypted} = Entry] =
@@ -286,10 +226,8 @@ pkcs7_pem(Config) when is_list(Config) ->
     Entry = public_key:pem_entry_encode('ContentInfo', PKCS7).
 
 %%--------------------------------------------------------------------
-cert_pem(doc) ->
-    [""];
-cert_pem(suite) ->
-    [];
+cert_pem() ->
+    [{doc, "Certificate PEM-file decode/encode"}].
 cert_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -315,10 +253,8 @@ cert_pem(Config) when is_list(Config) ->
     [Entry0] = erl_make_certs:pem_to_der(filename:join(Datadir, "wdsa.pem")).
 
 %%--------------------------------------------------------------------
-ssh_rsa_public_key(doc) ->
-    "";
-ssh_rsa_public_key(suite) ->
-    [];
+ssh_rsa_public_key() ->
+    [{doc, "ssh rsa public key decode/encode"}].
 ssh_rsa_public_key(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -343,10 +279,8 @@ ssh_rsa_public_key(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-ssh_dsa_public_key(doc) ->
-    "";
-ssh_dsa_public_key(suite) ->
-    [];
+ssh_dsa_public_key() ->
+    [{doc, "ssh dsa public key decode/encode"}].
 ssh_dsa_public_key(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -370,10 +304,8 @@ ssh_dsa_public_key(Config) when is_list(Config) ->
 	public_key:ssh_decode(EncodedOpenSsh, public_key).
 
 %%--------------------------------------------------------------------
-ssh_rfc4716_rsa_comment(doc) ->
-       "Test comment header and rsa key";
-ssh_rfc4716_rsa_comment(suite) ->
-    [];
+ssh_rfc4716_rsa_comment() ->
+    [{doc, "Test comment header and rsa key"}].
 ssh_rfc4716_rsa_comment(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -388,10 +320,8 @@ ssh_rfc4716_rsa_comment(Config) when is_list(Config) ->
     RSARawSsh2 = public_key:ssh_encode([{PubKey, Attributes}], rfc4716_public_key).
 
 %%--------------------------------------------------------------------
-ssh_rfc4716_dsa_comment(doc) ->
-       "Test comment header and dsa key";
-ssh_rfc4716_dsa_comment(suite) ->
-    [];
+ssh_rfc4716_dsa_comment() ->
+     [{doc, "Test comment header and dsa key"}].
 ssh_rfc4716_dsa_comment(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -410,10 +340,8 @@ ssh_rfc4716_dsa_comment(Config) when is_list(Config) ->
         public_key:ssh_decode(Encoded, public_key).
 
 %%--------------------------------------------------------------------
-ssh_rfc4716_rsa_subject(doc) ->
-       "Test another header value than comment";
-ssh_rfc4716_rsa_subject(suite) ->
-    [];
+ssh_rfc4716_rsa_subject() ->
+    [{doc,  "Test another header value than comment"}].
 ssh_rfc4716_rsa_subject(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -432,10 +360,8 @@ ssh_rfc4716_rsa_subject(Config) when is_list(Config) ->
         public_key:ssh_decode(Encoded, public_key).
 
 %%--------------------------------------------------------------------
-ssh_known_hosts(doc) ->
-    "";
-ssh_known_hosts(suite) ->
-    [];
+ssh_known_hosts() ->
+    [{doc, "ssh known hosts file encode/decode"}].
 ssh_known_hosts(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -463,10 +389,8 @@ ssh_known_hosts(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-ssh1_known_hosts(doc) ->
-    "";
-ssh1_known_hosts(suite) ->
-    [];
+ssh1_known_hosts() ->
+    [{doc, "ssh (ver 1) known hosts file encode/decode"}].
 ssh1_known_hosts(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -485,10 +409,8 @@ ssh1_known_hosts(Config) when is_list(Config) ->
     Decoded = public_key:ssh_decode(Encoded, known_hosts).
 
 %%--------------------------------------------------------------------
-ssh_auth_keys(doc) ->
-    "";
-ssh_auth_keys(suite) ->
-    [];
+ssh_auth_keys() ->
+    [{doc, "ssh authorized keys file encode/decode"}].
 ssh_auth_keys(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -513,10 +435,8 @@ ssh_auth_keys(Config) when is_list(Config) ->
     Decoded = public_key:ssh_decode(Encoded, auth_keys).
 
 %%--------------------------------------------------------------------
-ssh1_auth_keys(doc) ->
-    "";
-ssh1_auth_keys(suite) ->
-    [];
+ssh1_auth_keys() ->
+    [{doc, "ssh (ver 1) authorized keys file encode/decode"}].
 ssh1_auth_keys(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -543,10 +463,8 @@ ssh1_auth_keys(Config) when is_list(Config) ->
     Decoded = public_key:ssh_decode(Encoded, auth_keys).
 
 %%--------------------------------------------------------------------
-ssh_openssh_public_key_with_comment(doc) ->
-    "Test that emty lines and lines starting with # are ignored";
-ssh_openssh_public_key_with_comment(suite) ->
-    [];
+ssh_openssh_public_key_with_comment() ->
+    [{doc, "Test that emty lines and lines starting with # are ignored"}].
 ssh_openssh_public_key_with_comment(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -554,10 +472,8 @@ ssh_openssh_public_key_with_comment(Config) when is_list(Config) ->
     [{{_, #'Dss-Parms'{}}, _}] = public_key:ssh_decode(DSARawOpenSsh, openssh_public_key).
 
 %%--------------------------------------------------------------------
-ssh_openssh_public_key_long_header(doc) ->
-    "Test that long headers are handled";
-ssh_openssh_public_key_long_header(suite) ->
-    [];
+ssh_openssh_public_key_long_header() ->
+  [{doc, "Test that long headers are handled"}].
 ssh_openssh_public_key_long_header(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
 
@@ -568,10 +484,8 @@ ssh_openssh_public_key_long_header(Config) when is_list(Config) ->
     Decoded = public_key:ssh_decode(Encoded, rfc4716_public_key).
 
 %%--------------------------------------------------------------------
-encrypt_decrypt(doc) -> 
-    [""];
-encrypt_decrypt(suite) -> 
-    [];
+encrypt_decrypt() ->
+    [{doc, "Test public_key:encrypt_private and public_key:decrypt_public"}].
 encrypt_decrypt(Config) when is_list(Config) -> 
     {PrivateKey, _DerKey} = erl_make_certs:gen_rsa(64),
     #'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} = PrivateKey,
@@ -588,10 +502,8 @@ encrypt_decrypt(Config) when is_list(Config) ->
     ok.
        
 %%--------------------------------------------------------------------
-rsa_sign_verify(doc) ->
-    ["Checks that we can sign and verify rsa signatures."];
-rsa_sign_verify(suite) ->
-    [];
+rsa_sign_verify() ->
+    [{doc, "Checks that we can sign and verify rsa signatures."}].
 rsa_sign_verify(Config) when is_list(Config) ->
     Ca = {_, CaKey} = erl_make_certs:make_cert([]),
     {Cert1, _} = erl_make_certs:make_cert([{key, dsa}, {issuer, Ca}]),
@@ -611,10 +523,8 @@ rsa_sign_verify(Config) when is_list(Config) ->
     
 %%--------------------------------------------------------------------
 
-dsa_sign_verify(doc) ->
-    ["Checks that we can sign and verify dsa signatures."];
-dsa_sign_verify(suite) ->
-    [];
+dsa_sign_verify() ->
+    [{doc, "Checks that we can sign and verify dsa signatures."}].
 dsa_sign_verify(Config) when is_list(Config) ->
     Ca = erl_make_certs:make_cert([]),
     CertInfo = {_,CertKey1} = erl_make_certs:make_cert([{key, dsa}, {issuer, Ca}]),
@@ -650,10 +560,8 @@ dsa_sign_verify(Config) when is_list(Config) ->
 			      {DSAPublicKey, DSAParams}).
 
 %%--------------------------------------------------------------------
-pkix(doc) ->
-    "Misc pkix tests not covered elsewhere";
-pkix(suite) ->
-    [];
+pkix() ->
+    [{doc, "Misc pkix tests not covered elsewhere"}].
 pkix(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
     Certs0 = erl_make_certs:pem_to_der(filename:join(Datadir, "cacerts.pem")),
@@ -691,17 +599,15 @@ pkix(Config) when is_list(Config) ->
 		 [[{'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"}}]]},
+		 [[{'AttributeTypeAndValue', {2,5,4,3},{printableString,"erlangca"}}],
+		  [{'AttributeTypeAndValue', {2,5,4,3},{printableString,"erlang ca"}}]]},
     VerifyStr = public_key:pkix_normalize_name(TestStr),
 
     ok.
 
 %%--------------------------------------------------------------------
-pkix_countryname(doc) ->
-    "Test workaround for certs that code x509countryname as utf8";
-pkix_countryname(suite) ->
-    [];
+pkix_countryname() ->
+ [{doc, "Test workaround for certs that code x509countryname as utf8"}].
 pkix_countryname(Config) when is_list(Config) ->
     Cert = incorrect_pkix_cert(),
     OTPCert = public_key:pkix_decode_cert(Cert, otp),
@@ -711,24 +617,9 @@ pkix_countryname(Config) when is_list(Config) ->
     check_countryname(Issuer),
     check_countryname(Subj).
 
-check_countryname({rdnSequence,DirName}) ->
-    do_check_countryname(DirName).
-do_check_countryname([]) ->
-    ok;
-do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
-					       value = "US"}|_]) ->
-    ok;
-do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
-					       value =  Value}|_]) ->
-    test_server:fail({incorrect_cuntry_name, Value});
-do_check_countryname([_| Rest]) ->
-    do_check_countryname(Rest).
-
 %%--------------------------------------------------------------------
-pkix_path_validation(doc) ->
-    "Misc pkix tests not covered elsewhere";
-pkix_path_validation(suite) ->
-    [];
+pkix_path_validation() ->
+    [{doc, "Test PKIX path validation"}].
 pkix_path_validation(Config) when is_list(Config) ->
     CaK = {Trusted,_} = 
 	erl_make_certs:make_cert([{key, dsa},
@@ -759,7 +650,8 @@ pkix_path_validation(Config) when is_list(Config) ->
 
     CertK3 = {Cert3,_}  = erl_make_certs:make_cert([{issuer, CertK1}, 
 					       {extensions, [{basic_constraints, false}]}]),
-    {Cert4,_}  = erl_make_certs:make_cert([{issuer, CertK3}]),
+    {Cert4,_}  = erl_make_certs:make_cert([{issuer, CertK3}, {extensions, [{key_usage, undefined}]}]),
+
     {error, {bad_cert,missing_basic_constraint}} =
 	public_key:pkix_path_validation(Trusted, [Cert1, Cert3,Cert4], []),
 
@@ -796,6 +688,21 @@ pkix_path_validation(Config) when is_list(Config) ->
 	public_key:pkix_path_validation(unknown_ca, [Cert1], [{verify_fun,
 							      VerifyFunAndState1}]),
     ok.
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+check_countryname({rdnSequence,DirName}) ->
+    do_check_countryname(DirName).
+do_check_countryname([]) ->
+    ok;
+do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
+					       value = "US"}|_]) ->
+    ok;
+do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
+					       value =  Value}|_]) ->
+    ct:fail({incorrect_cuntry_name, Value});
+do_check_countryname([_| Rest]) ->
+    do_check_countryname(Rest).
 
 check_entry_type(#'DSAPrivateKey'{}, 'DSAPrivateKey') ->
     true;
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index b8af89d040..bd20a5546b 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.17
+PUBLIC_KEY_VSN = 0.18
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index fbe29753be..8437b7a623 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -274,7 +274,8 @@
 	</taglist>
 
 	<p>Example:</p>
-	<p><code>erl -sasl releases_dir \"mytarget/releases\" -boot mytarget/releases/1.0/myrel -boot_var RELTOOL_EXT_LIB mytarget/lib</code></p>
+	<p><code>erl -sasl releases_dir \"mytarget/releases\" -boot mytarget/releases/1.0/myrel\
+ -boot_var RELTOOL_EXT_LIB mytarget/lib</code></p>
       </item>
 
       <tag><c>incl_sys_filters</c></tag>
diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
index a7e34053f1..74918f1d67 100644
--- a/lib/reltool/src/Makefile
+++ b/lib/reltool/src/Makefile
@@ -79,10 +79,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Dependencies
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index 0c0b295db1..8e182d02ed 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -49,7 +49,6 @@
 	 rel_book,
          lib_tree,
          status_bar,
-         popup_menu,
          source,
          whitelist,
          blacklist,
@@ -136,6 +135,7 @@ init(Options) ->
 	do_init(Options)
     catch
 	error:Reason ->
+	    io:format("~p: ~p~n",[Reason, erlang:get_stacktrace()]),
 	    exit({Reason, erlang:get_stacktrace()})
     end.
 
@@ -403,8 +403,6 @@ create_menubar(Frame) ->
     wxEvtHandler:connect(Frame,
                          command_menu_selected,
                          [{userData, main_window}]),
-    wxEvtHandler:connect(File, menu_close),
-    wxEvtHandler:connect(Help, menu_close),
     MenuBar.
 
 create_app_page(#state{book = Book} = S) ->
@@ -780,15 +778,12 @@ root_popup(S, Root, Tree, Item) ->
     wxMenu:appendSeparator(PopupMenu),
     wxMenu:append(PopupMenu, 1, "Edit"),
     Choices = [edit],
-    wxEvtHandler:connect(PopupMenu, command_menu_selected),
-    wxEvtHandler:connect(PopupMenu, menu_close),
+    Popup = #root_popup{dir = Root, choices = Choices,
+			tree = Tree, item = Item},
+    wxEvtHandler:connect(PopupMenu, command_menu_selected, [{userData, {popup, Popup}}]),
     wxWindow:popupMenu(S#state.frame, PopupMenu),
 
-    Popup = #root_popup{dir = Root,
-			choices = Choices,
-			tree = Tree,
-			item = Item},
-    S#state{popup_menu = Popup}.
+    S.
 
 lib_popup(S, Lib, Tree, Item) ->
     PopupMenu = wxMenu:new(),
@@ -804,12 +799,10 @@ lib_popup(S, Lib, Tree, Item) ->
                 wxMenu:append(PopupMenu, 3, "Delete"),
                 [add, edit, delete]
         end,
-    wxEvtHandler:connect(PopupMenu, command_menu_selected),
-    wxEvtHandler:connect(PopupMenu, menu_close),
-    wxWindow:popupMenu(S#state.frame, PopupMenu),
-
     Popup = #lib_popup{dir = Lib, choices = Choices, tree = Tree, item = Item},
-    S#state{popup_menu = Popup}.
+    wxEvtHandler:connect(PopupMenu, command_menu_selected, [{userData, {popup, Popup}}]),
+    wxWindow:popupMenu(S#state.frame, PopupMenu),
+    S.
 
 escript_popup(S, File, Tree, Item) ->
     PopupMenu = wxMenu:new(),
@@ -825,15 +818,11 @@ escript_popup(S, File, Tree, Item) ->
                 wxMenu:append(PopupMenu, 3, "Delete"),
                 [add, edit, delete]
         end,
-    wxEvtHandler:connect(PopupMenu, command_menu_selected),
-    wxEvtHandler:connect(PopupMenu, menu_close),
+    Popup = #escript_popup{file = File, choices = Choices,
+			   tree = Tree, item = Item},
+    wxEvtHandler:connect(PopupMenu, command_menu_selected, [{userData, {popup, Popup}}]),
     wxWindow:popupMenu(S#state.frame, PopupMenu),
-
-    Popup = #escript_popup{file = File,
-			   choices = Choices,
-			   tree = Tree,
-			   item = Item},
-    S#state{popup_menu = Popup}.
+    S.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -903,11 +892,13 @@ handle_event(S, #wx{id = Id, obj= ObjRef, userData = UserData, event = Event} =
 	    wxMessageDialog:showModal(MD),
 	    wxMessageDialog:destroy(MD),
             S;
-        #wxMenu{type = menu_close} ->
-            S#state{popup_menu = undefined};
-        #wxCommand{type = command_menu_selected = Type, cmdString = Str}
-        when S#state.popup_menu =/= undefined ->
-            handle_popup_event(S, Type, Id, ObjRef, UserData, Str);
+        #wxCommand{type = command_menu_selected = Type, cmdString = Str} ->
+	    case UserData of
+		{popup, Popup} ->
+		    handle_popup_event(S, Type, Id, ObjRef, Popup, Str);
+		true ->
+		    S
+	    end;
 	#wxMouse{type = enter_window} ->
 	    %% The following is commented out because it raises the
 	    %% main system window on top of popup windows.
@@ -1028,11 +1019,9 @@ warning_popup_position(#state{frame=MF,warning_list=WL},{WFW,WFH}) ->
     {X,Y}.
 
 handle_popup_event(S, _Type, 0, _ObjRef, _UserData, _Str) ->
-    S#state{popup_menu = undefined};
-handle_popup_event(#state{popup_menu = #root_popup{dir = OldDir,
-						   choices = Choices},
-                          sys = Sys} = S,
-                   _Type, Pos, _ObjRef, _UserData, _Str) ->
+    S;
+handle_popup_event(#state{sys = Sys} = S, _Type, Pos, _ObjRef,
+		   #root_popup{dir = OldDir, choices = Choices}, _Str) ->
     case lists:nth(Pos, Choices) of
         edit ->
             Style = ?wxFD_OPEN bor ?wxFD_FILE_MUST_EXIST,
@@ -1042,18 +1031,16 @@ handle_popup_event(#state{popup_menu = #root_popup{dir = OldDir,
 			    Style) of
 		{ok, NewDir} when NewDir =:= OldDir ->
 		    %% Same dir.Ignore.
-		    S#state{popup_menu = undefined};
+		    S;
 		{ok, NewDir} ->
                     Sys2 = Sys#sys{root_dir = NewDir},
-                    do_set_sys(S#state{popup_menu = undefined, sys = Sys2});
+                    do_set_sys(S#state{sys = Sys2});
                 cancel ->
-                    S#state{popup_menu = undefined}
+                    S
             end
     end;
-handle_popup_event(#state{popup_menu = #lib_popup{dir = OldDir,
-						  choices = Choices},
-                          sys = Sys} = S,
-                   _Type, Pos, _ObjRef, _UserData, _Str) ->
+handle_popup_event(#state{sys = Sys} = S, _Type, Pos, _ObjRef,
+		   #lib_popup{dir = OldDir, choices = Choices}, _Str) ->
     case lists:nth(Pos, Choices) of
         add ->
             {ok, Cwd} = file:get_cwd(),
@@ -1063,15 +1050,14 @@ handle_popup_event(#state{popup_menu = #lib_popup{dir = OldDir,
                     case lists:member(NewDir, Sys#sys.lib_dirs) of
                         true ->
                             %% Ignore duplicate. Keep old.
-                            S#state{popup_menu = undefined};
+                            S;
                         false ->
                             LibDirs = Sys#sys.lib_dirs ++ [NewDir],
                             Sys2 = Sys#sys{lib_dirs = LibDirs},
-                            do_set_sys(S#state{popup_menu = undefined,
-					       sys = Sys2})
+                            do_set_sys(S#state{sys = Sys2})
                     end;
                 cancel ->
-                    S#state{popup_menu = undefined}
+                    S
                 end;
         edit ->
             Style = ?wxFD_OPEN bor ?wxFD_FILE_MUST_EXIST,
@@ -1083,28 +1069,25 @@ handle_popup_event(#state{popup_menu = #lib_popup{dir = OldDir,
                     case lists:member(NewDir, Sys#sys.lib_dirs) of
                         true ->
                             %% Ignore duplicate. Keep old.
-                            S#state{popup_menu = undefined};
+                            S;
                         false ->
                             Pred = fun(E) -> E =/= OldDir end,
                             {Before, [_| After]} =
                                 lists:splitwith(Pred, Sys#sys.lib_dirs),
                             LibDirs2 = Before ++ [NewDir | After],
                             Sys2 = Sys#sys{lib_dirs = LibDirs2},
-                            do_set_sys(S#state{popup_menu = undefined,
-					       sys = Sys2})
+                            do_set_sys(S#state{sys = Sys2})
                     end;
                 cancel ->
-                    S#state{popup_menu = undefined}
+                    S
             end;
         delete ->
             LibDirs = Sys#sys.lib_dirs -- [OldDir],
             Sys2 = Sys#sys{lib_dirs = LibDirs},
-            do_set_sys(S#state{popup_menu = undefined, sys = Sys2})
+            do_set_sys(S#state{sys = Sys2})
     end;
-handle_popup_event(#state{popup_menu = #escript_popup{file = OldFile,
-						      choices = Choices},
-                          sys = Sys} = S,
-                   _Type, Pos, _ObjRef, _UserData, _Str) ->
+handle_popup_event(#state{sys = Sys} = S, _Type, Pos, _ObjRef,
+		   #escript_popup{file = OldFile, choices = Choices}, _Str) ->
     case lists:nth(Pos, Choices) of
         add ->
             OldFile2 =
@@ -1124,14 +1107,14 @@ handle_popup_event(#state{popup_menu = #escript_popup{file = OldFile,
                     case lists:member(NewFile, Sys#sys.escripts) of
                         true ->
                             %% Ignore duplicate. Keep old.
-                            S#state{popup_menu = undefined};
+                            S;
                         false ->
                             Escripts = Sys#sys.escripts ++ [NewFile],
                             Sys2 = Sys#sys{escripts = Escripts},
-                            do_set_sys(S#state{popup_menu = undefined, sys = Sys2})
+                            do_set_sys(S#state{sys = Sys2})
                     end;
                 cancel ->
-                    S#state{popup_menu = undefined}
+                    S
             end;
         edit ->
             Style = ?wxFD_OPEN bor ?wxFD_FILE_MUST_EXIST,
@@ -1143,23 +1126,22 @@ handle_popup_event(#state{popup_menu = #escript_popup{file = OldFile,
                     case lists:member(NewFile, Sys#sys.escripts) of
                         true ->
                             %% Ignore duplicate. Keep old.
-                            S#state{popup_menu = undefined};
+                            S;
                         false ->
                             Pred = fun(E) -> E =/= OldFile end,
                             {Before, [_| After]} =
 				lists:splitwith(Pred, Sys#sys.escripts),
                             Escripts2 = Before ++ [NewFile | After],
                             Sys2 = Sys#sys{escripts = Escripts2},
-                            do_set_sys(S#state{popup_menu = undefined,
-					       sys = Sys2})
+                            do_set_sys(S#state{sys = Sys2})
                     end;
                 cancel ->
-                    S#state{popup_menu = undefined}
+                    S
             end;
         delete ->
             Escripts = Sys#sys.escripts -- [OldFile],
             Sys2 = Sys#sys{escripts = Escripts},
-            do_set_sys(S#state{popup_menu = undefined, sys = Sys2})
+            do_set_sys(S#state{sys = Sys2})
     end.
 
 handle_system_event(#state{sys = Sys} = S,
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 6cb7ba0163..1f4ce7226a 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -482,33 +482,12 @@ do_gen_script(#rel{name = RelName, vsn = RelVsn},
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-load_app_mods(#app{mods = Mods} = App, Mand, PathFlag, Variables) ->
+load_app_mods(#app{mods = Mods0} = App, Mand, PathFlag, Variables) ->
     Path = cr_path(App, PathFlag, Variables),
-    PartNames =
-        lists:sort([{packages:split(M),M} ||
-                       #mod{name = M, is_included=true} <- Mods,
-                       not lists:member(M, Mand)]),
-    SplitMods =
-        lists:foldl(
-          fun({Parts,M}, [{Last, Acc}|Rest]) ->
-                  [_|Tail] = lists:reverse(Parts),
-                  case lists:reverse(Tail) of
-                      Subs when Subs == Last ->
-                          [{Last,[M|Acc]}|Rest];
-                      Subs ->
-                          [{Subs, [M]}|[{Last,Acc}|Rest]]
-                  end
-          end,
-          [{[],
-            []}],
-          PartNames),
-    lists:foldl(
-      fun({Subs,Ms}, Cmds) ->
-              [{path, [filename:join([Path | Subs])]},
-               {primLoad, lists:sort(Ms)} | Cmds]
-      end,
-      [],
-      SplitMods).
+    Mods = [M || #mod{name = M, is_included=true} <- Mods0,
+		 not lists:member(M, Mand)],
+    [{path, [filename:join([Path])]},
+     {primLoad, lists:sort(Mods)}].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% sort_used_and_incl_apps(Apps, OrderedApps) -> Apps
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index 586f649924..d315a90e18 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -111,11 +111,11 @@ debug opt valgrind: $(SOLIBS) $(OBJDIR) $(LIBDIR) $(NIF_LIB)
 ifdef DTRACE_ENABLED
 DTRACE_USER_HEADER=$(OBJDIR)/dtrace_user.h
 $(OBJDIR)/dtrace_user.h: ./dtrace_user.d
-	dtrace -h -C $(INCLUDES) \
+	$(dtrace_verbose)dtrace -h -C $(INCLUDES) \
 	  -s ./dtrace_user.d \
 	  -o ./dtrace_user.tmp
-	sed -e '/^#define[ 	]*ERLANG_[A-Z0-9_]*(.*)/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ./dtrace_user.tmp > $@
-	rm ./dtrace_user.tmp
+	$(V_at)sed -e '/^#define[ 	]*ERLANG_[A-Z0-9_]*(.*)/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ./dtrace_user.tmp > $@
+	$(V_at)rm ./dtrace_user.tmp
 else
 DTRACE_USER_HEADER=
 endif
@@ -124,7 +124,7 @@ DTRACE_OBJS =
 ifdef DTRACE_ENABLED_2STEP
 DTRACE_OBJS += $(OBJDIR)/dtrace_user.o
 $(OBJDIR)/dtrace_user.o: $(before_DTrace_OBJS) $(OBJDIR)/dtrace_user.h
-	dtrace -G -C \
+	$(dtrace_verbose)dtrace -G -C \
 	  -s ./dtrace_user.d \
 	  -o $@ $(before_DTrace_OBJS)
 endif
@@ -138,26 +138,26 @@ $(LIBDIR):
 	-@mkdir -p $(LIBDIR)
 
 $(OBJDIR)/dyntrace$(TYPEMARKER).o: dyntrace.c $(DTRACE_USER_HEADER)
-	$(INSTALL_DIR) $(OBJDIR)
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_at)$(INSTALL_DIR) $(OBJDIR)
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(NIF_LIB): $(DYNTRACE_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+	$(V_at)$(INSTALL_DIR) $(LIBDIR)
+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(OBJDIR)/%.o: %.c
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(LIBDIR)/trace_ip_drv.so: $(TRACE_IP_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS)
+	$(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS)
 
 $(LIBDIR)/trace_file_drv.so: $(TRACE_FILE_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS)
+	$(V_LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS)
 
 $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 $(LIBDIR)/trace_file_drv.dll: $(TRACE_FILE_DRV_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
 	rm -f $(SOLIBS) $(TRACE_IP_DRV_OBJS) $(TRACE_FILE_DRV_OBJS)
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index c7c5cd4ff0..d8c82b2459 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -101,7 +101,8 @@
           allowed:</p>
         <pre>
 4> <input>dbg:fun2ms(fun([M,N]) when N > X, is_atomm(M)  -> return_trace() end).</input>
-Error: fun containing local erlang function calls ('is_atomm' called in guard) cannot be translated into match_spec
+Error: fun containing local erlang function calls ('is_atomm' called in guard)\
+ cannot be translated into match_spec
 {error,transform_error}
 5> <input>dbg:fun2ms(fun([M,N]) when N > X, is_atom(M)  -> return_trace() end).</input>
 [{['$1','$2'],[{'>','$2',{const,3}},{is_atom,'$1'}],[{return_trace}]}]</pre>
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index d6750f3a88..53b9ce34e4 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -35,6 +35,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/runtime_tools-$(VSN)
 # ----------------------------------------------------
 
 MODULES= \
+	appmon_info \
 	erts_alloc_config \
 	runtime_tools \
 	runtime_tools_sup \
@@ -80,10 +81,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/appmon/src/appmon_info.erl b/lib/runtime_tools/src/appmon_info.erl
index 332140f69d..332140f69d 100644
--- a/lib/appmon/src/appmon_info.erl
+++ b/lib/runtime_tools/src/appmon_info.erl
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 01e99f3f5e..9498412505 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -83,7 +83,7 @@ get_table2(Parent, Table, Type) ->
 	       ets -> ets:info(Table, size);
 	       mnesia -> mnesia:table_info(Table, size)
 	   end,
-    case Size > 0 of
+    case Size =/= undefined andalso Size > 0 of
 	false ->
 	    Parent ! {self(), '$end_of_table'},
 	    normal;
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index 60be9ed7c9..602048dc21 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -19,7 +19,7 @@
 {application, runtime_tools,
    [{description,  "RUNTIME_TOOLS"},
     {vsn,          "%VSN%"},
-    {modules,      [dbg,observer_backend,percept_profile,
+    {modules,      [appmon_info, dbg,observer_backend,percept_profile,
 		    runtime_tools,runtime_tools_sup,erts_alloc_config,
 		    ttb_autostart,dyntrace]},
     {registered,   [runtime_tools_sup]},
diff --git a/lib/runtime_tools/src/runtime_tools_sup.erl b/lib/runtime_tools/src/runtime_tools_sup.erl
index c8dab250dd..264e172a3c 100644
--- a/lib/runtime_tools/src/runtime_tools_sup.erl
+++ b/lib/runtime_tools/src/runtime_tools_sup.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -18,7 +19,7 @@
 %%
 %% ------------------------------------------------------------------------------
 %% File    : runtime_tools_sup.erl
-%% Author  : Lennart �hman <[email protected]>
+%% Author  : Lennart Öhman <[email protected]>
 
 -module(runtime_tools_sup).
 -behaviour(supervisor).
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index de0c45e6ae..c1ad8ca0bb 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -80,10 +80,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/sasl/src/overload.erl b/lib/sasl/src/overload.erl
index 5a4782efff..97f7bebe00 100644
--- a/lib/sasl/src/overload.erl
+++ b/lib/sasl/src/overload.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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 +26,7 @@
 	 format_status/2]).
 
 %%%-----------------------------------------------------------------
-%%% This is a rewrite of overload from BS.3, by Peter H�gfeldt.
+%%% This is a rewrite of overload from BS.3, by Peter Högfeldt.
 %%%
 %%% DESCRIPTION
 %%%
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 29c4a0d168..9b2e2c809b 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1067,11 +1067,10 @@ check_mod(Mod,App,Dir,Ext,IncPath) ->
     end.
 
 mod_to_filename(Dir, Mod, Ext) ->
-    Parts = packages:split(Mod),
-    filename:join([Dir | Parts]) ++ Ext.
+    filename:join(Dir, atom_to_list(Mod) ++ Ext).
 
 check_module(Mod, Dir, ObjModTime, IncPath) ->
-    {SrcDirs,_IncDirs}= smart_guess(Mod, Dir,IncPath),
+    {SrcDirs,_IncDirs}= smart_guess(Dir,IncPath),
     case locate_src(Mod,SrcDirs) of
 	{ok,_FDir,_File,LastModTime} ->
 	    if
@@ -1085,7 +1084,7 @@ check_module(Mod, Dir, ObjModTime, IncPath) ->
     end.
 
 locate_src(Mod,[Dir|Dirs]) ->
-    File = filename:join(Dir, mod_to_fname(Mod) ++ ".erl"),
+    File = mod_to_filename(Dir, Mod, ".erl"),
     case file:read_file_info(File) of
 	{ok,FileInfo} ->
 	    LastModTime = FileInfo#file_info.mtime,
@@ -1096,9 +1095,6 @@ locate_src(Mod,[Dir|Dirs]) ->
 locate_src(_,[]) ->
     false.
 
-mod_to_fname(Mod) ->
-    hd(lists:reverse(packages:split(Mod))).
-
 
 %%______________________________________________________________________
 %% smart_guess(Mod, Dir,IncludePath) -> {[Dirs],[IncDirs]}
@@ -1106,17 +1102,12 @@ mod_to_fname(Mod) ->
 %% src-dir should be one of .../src or .../src/e_src
 %% If dir does not contain .../ebin set dir to the same directory.
 
-smart_guess(Mod, Dir,IncPath) ->
+smart_guess(Dir,IncPath) ->
     case reverse(filename:split(Dir)) of
 	["ebin"|D] ->
-	    Subdirs = case packages:split(Mod) of
-			  [_] -> [];
-			  [_|_] = Parts ->
-			      lists:reverse(tl(lists:reverse(Parts)))
-		      end,
 	    D1 = reverse(D),
-	    Dirs = [filename:join(D1 ++ ["src" | Subdirs]),
-		    filename:join(D1 ++ ["src", "e_src" | Subdirs])],
+	    Dirs = [filename:join(D1 ++ ["src"]),
+		    filename:join(D1 ++ ["src", "e_src"])],
 	    {Dirs,Dirs ++ IncPath};
 	_ ->
 	    {[Dir],[Dir] ++ IncPath}
@@ -1423,23 +1414,8 @@ load_appl_mods([], _, _, _) ->
     [{progress, modules_loaded}].
 
 load_commands(Mods, Path) ->
-    SplitMods = lists:foldl(
-		  fun({Parts,M}, [{Last, Acc}|Rest]) ->
-			  [_|Tail] = lists:reverse(Parts),
-			  case lists:reverse(Tail) of
-			      Subs when Subs == Last ->
-				  [{Last,[M|Acc]}|Rest];
-			      Subs ->
-				  [{Subs, [M]}|[{Last,Acc}|Rest]]
-			  end
-		  end, [{[],[]}],
-		  lists:sort([{packages:split(M),M} || M <- Mods])),
-    lists:foldl(
-      fun({Subs,Ms}, Cmds) ->
-	      [{path, [filename:join([Path | Subs])]},
-	       {primLoad,lists:sort(Ms)} | Cmds]
-      end, [], SplitMods).
-
+    [{path, [filename:join([Path])]},
+     {primLoad,lists:sort(Mods)}].
 
 %%______________________________________________________________________
 %% Pack an application to an application term.
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 8820565124..6e55498669 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -118,7 +118,7 @@ clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
 
 $(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk	# Create top make file 
-	sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
 
 man: man1 man3 man6 man7
 
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 442837d57d..5b94dcb051 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,6 +34,86 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.23</title>
+<!--
+    <p>Version 4.23 supports code replacement in runtime from/to
+    version 4.22.1, 
+    4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
+-->
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[manager] Polish return values of snmpm_user_default according 
+	  to snmpm_user doc.</p>
+	  <p>Luca Favatella</p>
+	  <p>Own Id: OTP-10671</p>
+        </item>
+
+        <item>
+          <p>[agent] Remove runtime warning in snmpa_agent because of 
+	  tuple fun usage. </p>
+	  <p>Luca Favatella</p>
+	  <p>Own Id: OTP-10672</p>
+        </item>
+
+        <item>
+          <p>[manager] SNMP manager performance optimization. </p>
+	  <p>Ivan Dubovik</p>
+	  <p>Own Id: OTP-10673</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+      <!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Simultaneous 
+          <seealso marker="snmpa#backup">snmpa:backup/1,2</seealso> 
+          calls can interfere.
+          The master agent did not check if a backup was already in 
+          progress when a backup request was accepted. </p>
+          <p>Own Id: OTP-9884</p>
+          <p>Aux Id: Seq 11995</p>
+        </item>
+
+      </list>
+      -->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 4.23 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.22.1</title>
     <p>Version 4.22.1 supports code replacement in runtime from/to
     version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index e6e188d5d5..07fdd208ff 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -279,7 +279,6 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
       <fsummary>Register this agent</fsummary>
       <type>
         <v>UserId = term()</v>
-        <v>Addr = ip_address()</v>
         <v>TargetName = target_name()</v>
         <v>Config = [agent_config()]</v>
         <v>agent_config() = {Item, Val}</v>
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 5c1f855fad..e7ca540cc6 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -141,11 +141,11 @@ OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
 debug opt: $(TARGET_FILES)
 
 $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1: $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1.src
-	$(PERL) -p -e 's?%PERL%?$(PERL)? ' < $< > $@
-	chmod 755 $@
+	$(gen_verbose)$(PERL) -p -e 's?%PERL%?$(PERL)? ' < $< > $@
+	$(V_at)chmod 755 $@
 
 $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:	$(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 # To support parallel make, we'll need explicit dependencies
 # to ensure that an imported MIB has been compiled when it's needed.
@@ -214,7 +214,7 @@ info:
 	@echo "RELSYSDIR   = "$(RELSYSDIR)""
 
 v1/%.mib.v1: %.mib $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1
-	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
+	$(gen_verbose)$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
 
 # ----------------------------------------------------
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 436f15eb9c..ad9540e886 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -496,7 +496,7 @@ verify_vacmSecurityToGroupTable_col(_, Val) ->
 %%
 %%-----------------------------------------------------------------
 vacmAccessTable(print) ->
-    %% M�ste jag g�ra om alla entrien till {RowIdx, Row}?
+    %% Do I need to turn all entries into {RowIdx, Row}?
     TableInfo = get_table(vacmAccessTable), 
     PrintRow = 
 	fun(Prefix, Row) ->
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 9d30e332f1..57846db13b 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1134,7 +1134,7 @@ handle_call({get, Vars, Context}, _From, S) ->
 	  "~n   Vars:    ~p"
 	  "~n   Context: ~p", [Vars, Context]),
     put_pdu_data({undefined, undefined, undefined, undefined, Context}),
-    case catch mapfoldl({?MODULE, tr_var}, [], 1, Vars) of
+    case catch mapfoldl(fun ?MODULE:tr_var/2, [], 1, Vars) of
 	{error, Reason} -> {reply, {error, Reason}, S};
 	{_, Varbinds} ->
 	    ?vdebug("Varbinds: ~p",[Varbinds]),
@@ -1155,7 +1155,7 @@ handle_call({get_next, Vars, Context}, _From, S) ->
           "~n   Vars:    ~p"
           "~n   Context: ~p",[Vars, Context]),
     put_pdu_data({undefined, undefined, undefined, undefined, Context}),
-    case catch mapfoldl({?MODULE, tr_var}, [], 1, Vars) of
+    case catch mapfoldl(fun ?MODULE:tr_var/2, [], 1, Vars) of
         {error, Reason} -> {reply, {error, Reason}, S};
         {_, Varbinds} ->
             ?vdebug("Varbinds: ~p",[Varbinds]),
diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
index f7c311b663..716add8b9e 100644
--- a/lib/snmp/src/app/Makefile
+++ b/lib/snmp/src/app/Makefile
@@ -116,10 +116,10 @@ info:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 593ddd82bd..a6abf8439a 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
 %% 
 %% The 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,582 +22,12 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
-  {"4.22", 
-   [
-    {load_module, snmpm,                   soft_purge, soft_purge, []}, 
-    {load_module, snmp_pdus,               soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.21.7", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.6",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  },
-  {"4.21.5",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib,   soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib,     soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap,        soft_purge, soft_purge, []}, 
-    {load_module, snmpa_vacm,        soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,   soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,        soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  },
-  {"4.21.4", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.3", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.2", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21.1", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }, 
-  {"4.21", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]},
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {add_module,  snmpm_net_if_mt}
-   ]
-  }
  ], 
 
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
-  {"4.22", 
-   [
-    {load_module, snmpm,                   soft_purge, soft_purge, []}, 
-    {load_module, snmp_pdus,               soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.21.7", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.6",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  },
-  {"4.21.5",
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, [snmp_conf]},
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib,   soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib,     soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap,        soft_purge, soft_purge, []}, 
-    {load_module, snmpa_vacm,        soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db,   soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_mib,        soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  },
-  {"4.21.4", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.3", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.2", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21.1", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }, 
-  {"4.21", 
-   [
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_framework_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_notification_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_standard_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, [snmp_conf]}, 
-
-    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
-    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmp_log, soft_purge, soft_purge, []}, 
-    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
-     [snmp_conf]}, 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmp_conf, snmpa_mib_lib]},
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db,  soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,       soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-
-    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-   ]
-  }
  ]
+
 }.
 
diff --git a/lib/snmp/src/compile/depend.mk b/lib/snmp/src/compile/depend.mk
index 3ee8dc4bec..e6ba1ac810 100644
--- a/lib/snmp/src/compile/depend.mk
+++ b/lib/snmp/src/compile/depend.mk
@@ -45,5 +45,5 @@ $(EBIN)/snmpc_mib_gram.$(EMULATOR): \
 	snmpc_mib_gram.erl
 
 $(BIN)/snmpc: snmpc.src ../../vsn.mk
-	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
-	chmod 755 $@
+	$(vsn_verbose)$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+	$(V_at)chmod 755 $@
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index f590892c66..6ac0115dad 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -107,63 +107,9 @@
 	 async_get_bulk/5, async_get_bulk/6, async_get_bulk/7, async_get_bulk/8 
 	]).
 
-%% Backward compatibility exports (API version "1")
--deprecated({agent_info,        3}).
--deprecated({update_agent_info, 5}).
--deprecated({g,                 3}).
--deprecated({g,                 4}).
--deprecated({g,                 5}).
--deprecated({g,                 6}).
--deprecated({g,                 7}).
--deprecated({ag,                3}).
--deprecated({ag,                4}).
--deprecated({ag,                5}).
--deprecated({ag,                6}).
--deprecated({ag,                7}).
--deprecated({gn,                3}).
--deprecated({gn,                4}).
--deprecated({gn,                5}).
--deprecated({gn,                6}).
--deprecated({gn,                7}).
--deprecated({agn,               3}).
--deprecated({agn,               4}).
--deprecated({agn,               5}).
--deprecated({agn,               6}).
--deprecated({agn,               7}).
--deprecated({gb,                5}).
--deprecated({gb,                6}).
--deprecated({gb,                7}).
--deprecated({gb,                8}).
--deprecated({gb,                9}).
--deprecated({agb,               5}).
--deprecated({agb,               6}).
--deprecated({agb,               7}).
--deprecated({agb,               8}).
--deprecated({agb,               9}).
--deprecated({s,                 3}).
--deprecated({s,                 4}).
--deprecated({s,                 5}).
--deprecated({s,                 6}).
--deprecated({s,                 7}).
--deprecated({as,                3}).
--deprecated({as,                4}).
--deprecated({as,                5}).
--deprecated({as,                6}).
--deprecated({as,                7}).
--export([
-	 agent_info/3, update_agent_info/5, 
-	 g/3, g/4, g/5, g/6, g/7, 
-	 ag/3, ag/4, ag/5, ag/6, ag/7, 
-	 gn/3, gn/4, gn/5, gn/6, gn/7, 
-	 agn/3, agn/4, agn/5, agn/6, agn/7, 
-	 gb/5, gb/6, gb/7, gb/8, gb/9, 
-	 agb/5, agb/6, agb/7, agb/8, agb/9, 
-	 s/3, s/4, s/5, s/6, s/7, 
-	 as/3, as/4, as/5, as/6, as/7
-	]).
-
 %% Application internal export
 -export([start_link/3, snmpm_start_verify/2, snmpm_start_verify/3]).
+-export([target_name/1, target_name/2]).
 
 
 -include_lib("snmp/src/misc/snmp_debug.hrl").
@@ -439,32 +385,16 @@ unregister_agent(UserId, Addr, Port) ->
 	    Error
     end.
 
+
 agent_info(TargetName, Item) ->
     snmpm_config:agent_info(TargetName, Item).
 
-%% Backward compatibility
-agent_info(Addr, Port, Item) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    agent_info(TargetName, Item);
-	Error ->
-	    Error
-    end.
-
 update_agent_info(UserId, TargetName, Info) when is_list(Info) ->
     snmpm_config:update_agent_info(UserId, TargetName, Info).
 
 update_agent_info(UserId, TargetName, Item, Val) ->
     update_agent_info(UserId, TargetName, [{Item, Val}]).
 
-%% Backward compatibility functions
-update_agent_info(UserId, Addr, Port, Item, Val) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    update_agent_info(UserId, TargetName, Item, Val);
-	Error ->
-	    Error
-    end.
 
 which_agents() ->
     snmpm_config:which_agents().
@@ -552,55 +482,6 @@ sync_get(UserId, TargetName, Context, Oids, Timeout, ExtraInfo) ->
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-g(UserId, Addr, Oids) ->
-    g(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids).
-
-g(UserId, Addr, CtxName, Oids) when is_list(CtxName) andalso is_list(Oids) ->
-    g(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids);
-
-g(UserId, Addr, Port, Oids) when is_integer(Port) andalso is_list(Oids) ->
-    g(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids);
-
-g(UserId, Addr, Oids, Timeout) 
-  when is_list(Oids) andalso is_integer(Timeout) ->
-    g(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids, Timeout).
-
-g(UserId, Addr, Port, CtxName, Oids) 
-  when is_integer(Port) andalso is_list(CtxName) andalso is_list(Oids) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get(UserId, TargetName, CtxName, Oids);
-	Error ->
-	    Error
-    end;    
-    
-g(UserId, Addr, Port, Oids, Timeout) 
-  when is_integer(Port) andalso is_list(Oids) andalso is_integer(Timeout) ->
-    g(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids, Timeout);
-
-g(UserId, Addr, CtxName, Oids, Timeout) 
-  when is_list(CtxName) andalso is_list(Oids) andalso is_integer(Timeout) ->
-    g(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids, Timeout).
-
-g(UserId, Addr, Port, CtxName, Oids, Timeout) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get(UserId, TargetName, CtxName, Oids, Timeout);
-	Error ->
-	    Error
-    end.
-
-g(UserId, Addr, Port, CtxName, Oids, Timeout, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get(UserId, TargetName, CtxName, Oids, Timeout, ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
 
 %% --- asynchroneous get-request ---
 %% 
@@ -637,55 +518,6 @@ async_get(UserId, TargetName, Context, Oids, Expire, ExtraInfo) ->
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-ag(UserId, Addr, Oids) ->
-    ag(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids).
-
-ag(UserId, Addr, Port, Oids) when is_integer(Port) andalso is_list(Oids) ->
-    ag(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids);
-
-ag(UserId, Addr, CtxName, Oids) when is_list(CtxName) andalso is_list(Oids) ->
-    ag(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids);
-
-ag(UserId, Addr, Oids, Expire) when is_list(Oids) andalso is_integer(Expire) ->
-    ag(UserId, Addr, ?DEFAULT_AGENT_PORT, ?DEFAULT_CONTEXT, Oids, Expire).
-
-ag(UserId, Addr, Port, CtxName, Oids) 
-  when is_integer(Port) andalso is_list(CtxName) andalso is_list(Oids) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get(UserId, TargetName, CtxName, Oids);
-	Error ->
-	    Error
-    end;
-
-ag(UserId, Addr, Port, Oids, Expire) 
-  when is_integer(Port) andalso is_list(Oids) andalso is_integer(Expire) ->
-    ag(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids, Expire);
-
-ag(UserId, Addr, CtxName, Oids, Expire) 
-  when is_list(CtxName) andalso is_list(Oids) andalso is_integer(Expire) ->
-    ag(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids, Expire).
-
-ag(UserId, Addr, Port, CtxName, Oids, Expire) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get(UserId, TargetName, CtxName, Oids, Expire);
-	Error ->
-	    Error
-    end.
-
-ag(UserId, Addr, Port, CtxName, Oids, Expire, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get(UserId, TargetName, CtxName, Oids, Expire, ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
-
 %% --- synchroneous get_next-request ---
 %% 
 
@@ -719,55 +551,6 @@ sync_get_next(UserId, TargetName, Context, Oids, Timeout, ExtraInfo) ->
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-gn(UserId, Addr, Oids) ->
-    gn(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids).
-
-gn(UserId, Addr, CtxName, Oids) when is_list(CtxName) andalso is_list(Oids) ->
-    gn(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids);
-
-gn(UserId, Addr, Port, Oids) when is_integer(Port) andalso is_list(Oids) ->
-    gn(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids);
-
-gn(UserId, Addr, Oids, Timeout) 
-  when is_list(Oids) andalso is_integer(Timeout) ->
-    gn(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids, Timeout).
-
-gn(UserId, Addr, Port, CtxName, Oids) 
-  when is_integer(Port) andalso is_list(CtxName) andalso is_list(Oids) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get_next(UserId, TargetName, CtxName, Oids);
-	Error ->
-	    Error
-    end;    
-	
-gn(UserId, Addr, Port, Oids, Timeout) 
-  when is_integer(Port) andalso is_list(Oids) andalso is_integer(Timeout) ->
-    gn(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids, Timeout);
-gn(UserId, Addr, CtxName, Oids, Timeout) 
-  when is_list(CtxName) andalso is_list(Oids) andalso is_integer(Timeout) ->
-    gn(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids, Timeout).
-
-gn(UserId, Addr, Port, CtxName, Oids, Timeout) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get_next(UserId, TargetName, CtxName, Oids, Timeout);
-	Error ->
-	    Error
-    end.
-
-gn(UserId, Addr, Port, CtxName, Oids, Timeout, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get_next(UserId, TargetName, CtxName, Oids, Timeout, ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
-
 %% --- asynchroneous get_next-request ---
 %% 
 
@@ -801,56 +584,6 @@ async_get_next(UserId, TargetName, Context, Oids, Expire, ExtraInfo) ->
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-agn(UserId, Addr, Oids) ->
-    agn(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids).
-
-agn(UserId, Addr, CtxName, Oids) when is_list(CtxName) andalso is_list(Oids) ->
-    agn(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids);
-
-agn(UserId, Addr, Port, Oids) when is_integer(Port) andalso is_list(Oids) ->
-    agn(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids);
-
-agn(UserId, Addr, Oids, Expire) 
-  when is_list(Oids) andalso is_integer(Expire) ->
-    agn(UserId, Addr, ?DEFAULT_AGENT_PORT, Oids, Expire).
-
-agn(UserId, Addr, Port, CtxName, Oids) 
-  when is_integer(Port) andalso is_list(CtxName) andalso is_list(Oids) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get_next(UserId, TargetName, CtxName, Oids);
-	Error ->
-	    Error
-    end;    
-	
-agn(UserId, Addr, Port, Oids, Expire) 
-  when is_integer(Port) andalso is_list(Oids) andalso is_integer(Expire) ->
-    agn(UserId, Addr, Port, ?DEFAULT_CONTEXT, Oids, Expire);
-agn(UserId, Addr, CtxName, Oids, Expire) 
-  when is_list(CtxName) andalso is_list(CtxName) andalso is_integer(Expire) ->
-    agn(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, Oids, Expire).
-
-agn(UserId, Addr, Port, CtxName, Oids, Expire) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get_next(UserId, TargetName, CtxName, Oids, Expire);
-	Error ->
-	    Error
-    end.
-
-agn(UserId, Addr, Port, CtxName, Oids, Expire, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get_next(UserId, TargetName, CtxName, Oids, Expire, 
-			   ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
-
 %% --- synchroneous set-request ---
 %% 
 
@@ -884,64 +617,6 @@ sync_set(UserId, TargetName, Context, VarsAndVals, Timeout, ExtraInfo) ->
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-s(UserId, Addr, VarsAndVals) ->
-    s(UserId, Addr, ?DEFAULT_AGENT_PORT, VarsAndVals).
-
-s(UserId, Addr, Port, VarsAndVals) 
-  when is_integer(Port) andalso is_list(VarsAndVals) ->
-    s(UserId, Addr, Port, ?DEFAULT_CONTEXT, VarsAndVals);
-
-s(UserId, Addr, CtxName, VarsAndVals) 
-  when is_list(CtxName) andalso is_list(VarsAndVals) ->
-    s(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, VarsAndVals);
-
-s(UserId, Addr, VarsAndVals, Timeout) 
-  when is_list(VarsAndVals) andalso is_integer(Timeout) ->
-    s(UserId, Addr, ?DEFAULT_AGENT_PORT, VarsAndVals, Timeout).
-
-s(UserId, Addr, Port, CtxName, VarsAndVals) 
-  when is_integer(Port) andalso 
-       is_list(CtxName) andalso 
-       is_list(VarsAndVals) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_set(UserId, TargetName, CtxName, VarsAndVals);
-	Error ->
-	    Error
-    end;
-
-s(UserId, Addr, Port, VarsAndVals, Timeout) 
-  when is_integer(Port) andalso 
-       is_list(VarsAndVals) andalso 
-       is_integer(Timeout) ->
-    s(UserId, Addr, Port, ?DEFAULT_CONTEXT, VarsAndVals, Timeout);
-
-s(UserId, Addr, CtxName, VarsAndVals, Timeout) 
-  when is_list(CtxName) andalso 
-       is_list(VarsAndVals) andalso 
-       is_integer(Timeout) ->
-    s(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, VarsAndVals, Timeout).
-
-s(UserId, Addr, Port, CtxName, VarsAndVals, Timeout) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_set(UserId, TargetName, CtxName, VarsAndVals, Timeout);
-	Error ->
-	    Error
-    end.
-
-s(UserId, Addr, Port, CtxName, VarsAndVals, Timeout, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_set(UserId, TargetName, CtxName, VarsAndVals, Timeout, ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
-
 %% --- asynchroneous set-request --- 
 %% 
 
@@ -975,63 +650,6 @@ async_set(UserId, TargetName, Context, VarsAndVals, Expire, ExtraInfo) ->
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-as(UserId, Addr, VarsAndVals) ->
-    as(UserId, Addr, ?DEFAULT_AGENT_PORT, VarsAndVals).
-
-as(UserId, Addr, Port, VarsAndVals) 
-  when is_integer(Port) andalso is_list(VarsAndVals) ->
-    as(UserId, Addr, Port, ?DEFAULT_CONTEXT, VarsAndVals);
-
-as(UserId, Addr, CtxName, VarsAndVals) 
-  when is_list(CtxName) andalso is_list(VarsAndVals) ->
-    as(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, VarsAndVals);
-
-as(UserId, Addr, VarsAndVals, Expire) 
-  when is_list(VarsAndVals) andalso is_integer(Expire) ->
-    as(UserId, Addr, ?DEFAULT_AGENT_PORT, VarsAndVals, Expire).
-
-as(UserId, Addr, Port, CtxName, VarsAndVals) 
-  when is_integer(Port) andalso 
-       is_list(CtxName) andalso 
-       is_list(VarsAndVals) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_set(UserId, TargetName, CtxName, VarsAndVals);
-	Error ->
-	    Error
-    end;
-	
-as(UserId, Addr, Port, VarsAndVals, Expire) 
-  when is_integer(Port) andalso 
-       is_list(VarsAndVals) andalso 
-       is_integer(Expire) ->
-    as(UserId, Addr, Port, ?DEFAULT_CONTEXT, VarsAndVals, Expire);
-
-as(UserId, Addr, CtxName, VarsAndVals, Expire) 
-  when is_list(CtxName) andalso 
-       is_list(VarsAndVals) andalso 
-       is_integer(Expire) ->
-    as(UserId, Addr, ?DEFAULT_AGENT_PORT, CtxName, VarsAndVals, Expire).
-
-as(UserId, Addr, Port, CtxName, VarsAndVals, Expire) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_set(UserId, TargetName, CtxName, VarsAndVals, Expire);
-	Error ->
-	    Error
-    end.
-
-as(UserId, Addr, Port, CtxName, VarsAndVals, Expire, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_set(UserId, TargetName, CtxName, VarsAndVals, Expire, ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
 %% --- synchroneous get-bulk ---
 %% 
 
@@ -1091,162 +709,6 @@ sync_get_bulk(UserId, TargetName, NonRep, MaxRep, Context, Oids, Timeout,
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-gb(UserId, Addr, NonRep, MaxRep, Oids) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId: ~p"
-    %%   "~n   Addr:   ~p"
-    %%   "~n   NonRep: ~p"
-    %%   "~n   MaxRep: ~p"
-    %%   "~n   Oids:   ~p", 
-    %%   [UserId, Addr, NonRep, MaxRep, Oids]),
-    gb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, Oids).
-
-gb(UserId, Addr, Port, NonRep, MaxRep, Oids) 
-  when is_integer(Port) andalso 
-       is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(Oids) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId: ~p"
-    %%   "~n   Addr:   ~p"
-    %%   "~n   Port:   ~p"
-    %%   "~n   NonRep: ~p"
-    %%   "~n   MaxRep: ~p"
-    %%   "~n   Oids:   ~p", 
-    %%   [UserId, Addr, Port, NonRep, MaxRep, Oids]),
-    gb(UserId, Addr, Port, NonRep, MaxRep, ?DEFAULT_CONTEXT, Oids);
-
-gb(UserId, Addr, NonRep, MaxRep, CtxName, Oids) 
-  when is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(CtxName) andalso 
-       is_list(Oids) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:  ~p"
-    %%   "~n   Addr:    ~p"
-    %%   "~n   NonRep:  ~p"
-    %%   "~n   MaxRep:  ~p"
-    %%   "~n   CtxName: ~p"
-    %%   "~n   Oids:    ~p", 
-    %%   [UserId, Addr, NonRep, MaxRep, CtxName, Oids]),
-    gb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, CtxName, Oids);
-
-gb(UserId, Addr, NonRep, MaxRep, Oids, Timeout) 
-  when is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(Oids) andalso 
-       is_integer(Timeout) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:  ~p"
-    %%   "~n   Addr:    ~p"
-    %%   "~n   NonRep:  ~p"
-    %%   "~n   MaxRep:  ~p"
-    %%   "~n   Oids:    ~p"
-    %%   "~n   Timeout: ~p", 
-    %%   [UserId, Addr, NonRep, MaxRep, Oids, Timeout]),
-    gb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, Oids, Timeout).
-
-gb(UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids) 
-  when is_integer(Port) andalso 
-       is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(CtxName) andalso 
-       is_list(Oids) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:  ~p"
-    %%   "~n   Addr:    ~p"
-    %%   "~n   Port:    ~p"
-    %%   "~n   NonRep:  ~p"
-    %%   "~n   MaxRep:  ~p"
-    %%   "~n   CtxName: ~p"
-    %%   "~n   Oids:    ~p", 
-    %%   [UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids]),
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    %% p("gb -> TargetName: ~p", [TargetName]),
-	    sync_get_bulk(UserId, TargetName, NonRep, MaxRep, CtxName, Oids);
-	Error ->
-	    Error
-    end;
-
-gb(UserId, Addr, Port, NonRep, MaxRep, Oids, Timeout) 
-  when is_integer(Port) andalso 
-       is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(Oids) andalso 
-       is_integer(Timeout) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:  ~p"
-    %%   "~n   Addr:    ~p"
-    %%   "~n   Port:    ~p"
-    %%   "~n   NonRep:  ~p"
-    %%   "~n   MaxRep:  ~p"
-    %%   "~n   Oids:    ~p"
-    %%   "~n   Timeout: ~p", 
-    %%   [UserId, Addr, Port, NonRep, MaxRep, Oids, Timeout]),
-    gb(UserId, Addr, Port, NonRep, MaxRep, ?DEFAULT_CONTEXT, Oids, Timeout);
-
-gb(UserId, Addr, NonRep, MaxRep, CtxName, Oids, Timeout) 
-  when is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(CtxName) andalso 
-       is_list(Oids) andalso 
-       is_integer(Timeout) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:  ~p"
-    %%   "~n   Addr:    ~p"
-    %%   "~n   NonRep:  ~p"
-    %%   "~n   MaxRep:  ~p"
-    %%   "~n   CtxName: ~p"
-    %%   "~n   Oids:    ~p"
-    %%   "~n   Timeout: ~p", 
-    %%   [UserId, Addr, NonRep, MaxRep, CtxName, Oids, Timeout]),
-    gb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, CtxName, Oids, 
-       Timeout).
-
-gb(UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids, Timeout) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:  ~p"
-    %%   "~n   Addr:    ~p"
-    %%   "~n   Port:    ~p"
-    %%   "~n   NonRep:  ~p"
-    %%   "~n   MaxRep:  ~p"
-    %%   "~n   CtxName: ~p"
-    %%   "~n   Oids:    ~p"
-    %%   "~n   Timeout: ~p", 
-    %%   [UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids, Timeout]),
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get_bulk(UserId, TargetName, 
-			  NonRep, MaxRep, CtxName, Oids, Timeout);
-	Error ->
-	    Error
-    end.
-
-gb(UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids, Timeout, ExtraInfo) ->
-    %% p("gb -> entry with"
-    %%   "~n   UserId:    ~p"
-    %%   "~n   Addr:      ~p"
-    %%   "~n   Port:      ~p"
-    %%   "~n   NonRep:    ~p"
-    %%   "~n   MaxRep:    ~p"
-    %%   "~n   CtxName:   ~p"
-    %%   "~n   Oids:      ~p"
-    %%   "~n   Timeout:   ~p"
-    %%   "~n   ExtraInfo: ~p", 
-    %%   [UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids, Timeout, ExtraInfo]),
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    sync_get_bulk(UserId, TargetName, 
-			  NonRep, MaxRep, CtxName, Oids, Timeout, ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
-
-
 %% --- asynchroneous get-bulk ---
 %% 
 
@@ -1291,81 +753,6 @@ async_get_bulk(UserId, TargetName, NonRep, MaxRep, Context, Oids, Expire,
 %% </BACKWARD-COMPAT>
 
 
-%% <DEPRECATED>
-agb(UserId, Addr, NonRep, MaxRep, Oids) ->
-    agb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, Oids).
-
-agb(UserId, Addr, Port, NonRep, MaxRep, Oids) 
-  when is_integer(Port) andalso 
-       is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(Oids) ->
-    agb(UserId, Addr, Port, NonRep, MaxRep, ?DEFAULT_CONTEXT, Oids);
-
-agb(UserId, Addr, NonRep, MaxRep, CtxName, Oids) 
-  when is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(CtxName) andalso 
-       is_list(Oids) ->
-    agb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, CtxName, Oids);
-
-agb(UserId, Addr, NonRep, MaxRep, Oids, Expire) 
-  when is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(Oids) andalso 
-       is_integer(Expire) ->
-    agb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, Oids, Expire).
-
-agb(UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids) 
-  when is_integer(Port) andalso 
-       is_integer(NonRep) andalso 
-       is_integer(MaxRep), 
-       is_list(CtxName) andalso 
-       is_list(Oids) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get_bulk(UserId, TargetName, 
-			   NonRep, MaxRep, CtxName, Oids);
-	Error ->
-	    Error
-    end;
-
-agb(UserId, Addr, Port, NonRep, MaxRep, Oids, Expire) 
-  when is_integer(Port) andalso 
-       is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(Oids) andalso 
-       is_integer(Expire) ->
-    agb(UserId, Addr, Port, NonRep, MaxRep, ?DEFAULT_CONTEXT, Oids, Expire);
-
-agb(UserId, Addr, NonRep, MaxRep, CtxName, Oids, Expire) 
-  when is_integer(NonRep) andalso 
-       is_integer(MaxRep) andalso 
-       is_list(CtxName) andalso 
-       is_list(Oids) andalso 
-       is_integer(Expire) ->
-    agb(UserId, Addr, ?DEFAULT_AGENT_PORT, NonRep, MaxRep, CtxName, Oids).
-
-agb(UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids, Expire) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get_bulk(UserId, TargetName, 
-			   NonRep, MaxRep, CtxName, Oids, Expire);
-	Error ->
-	    Error
-    end.
-
-agb(UserId, Addr, Port, NonRep, MaxRep, CtxName, Oids, Expire, ExtraInfo) ->
-    case target_name(Addr, Port) of
-	{ok, TargetName} ->
-	    async_get_bulk(UserId, TargetName, 
-			   NonRep, MaxRep, CtxName, Oids, Expire,
-			   ExtraInfo);
-	Error ->
-	    Error
-    end.
-%% </DEPRECATED>
-
 
 cancel_async_request(UserId, ReqId) ->
     snmpm_server:cancel_async_request(UserId, ReqId).
@@ -1457,7 +844,7 @@ sys_up_time() ->
 format_reason(Reason) ->
     format_reason("", Reason).
 
-format_reason(Prefix, Reason) when is_integer(Prefix) and (Prefix >= 0) ->
+format_reason(Prefix, Reason) when is_integer(Prefix) andalso (Prefix >= 0) ->
     format_reason(lists:duplicate(Prefix, $ ), Reason);
 format_reason(Prefix, Reason) when is_list(Prefix) ->
     case (catch do_format_reason(Prefix, Reason)) of
@@ -1691,6 +1078,9 @@ format_vb_value(Prefix, _Type, Val) ->
 %% --- Internal utility functions ---
 %% 
 
+target_name(Addr) ->
+    target_name(Addr, ?DEFAULT_AGENT_PORT).
+
 target_name(Addr, Port) ->
     snmpm_config:agent_info(Addr, Port, target_name).
 
diff --git a/lib/snmp/src/manager/snmpm_conf.erl b/lib/snmp/src/manager/snmpm_conf.erl
index e50508c489..03dbd028f7 100644
--- a/lib/snmp/src/manager/snmpm_conf.erl
+++ b/lib/snmp/src/manager/snmpm_conf.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -365,7 +366,7 @@ do_write_usm_conf(Fd,
 do_write_usm_conf(Fd, 
 		  {EngineID, UserName, SecName, 
 		   AuthP, AuthKey, PrivP, PrivKey}) ->
-    io:format(Fd, "{\"~s\", \"~s\", \"~s\", �~w, ~w, ~w, ~w}.~n", 
+    io:format(Fd, "{\"~s\", \"~s\", \"~s\", í~w, ~w, ~w, ~w}.~n",
 	      [EngineID, UserName, SecName, AuthP, AuthKey, PrivP, PrivKey]);
 do_write_usm_conf(_Fd, Crap) ->
     error({bad_usm_conf, Crap}).
diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index d7148bb4a4..953c94ab54 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -591,8 +591,8 @@ sec_engine_id(TargetName) ->
 
 
 %% BMK BMK BMK
-%% Denna verkar v�ldigt lik generate_v1_v2c_response_msg!
-%% Gemensam? Borde det finnas olikheter?
+%% This one looks very similar to lik generate_v1_v2c_response_msg!
+%% Common/shared? Should there be differences?
 %% 
 generate_v1_v2c_msg(Vsn, Pdu, Community, Log) ->
     ?vdebug("generate_v1_v2c_msg -> encode pdu", []),
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 484954addb..61d22362cc 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -3163,17 +3163,16 @@ request_id() ->
 %%----------------------------------------------------------------------
 
 agent_data(TargetName, SendOpts) ->
-    case snmpm_config:agent_info(TargetName, all) of
-	{ok, Info} ->
-	    Version = agent_data_item(version, Info), 
+    case snmpm_config:agent_info(TargetName, version) of
+	{ok, Version} ->
 	    MsgData = 
 		case Version of
 		    v3 ->
-			DefSecModel = agent_data_item(sec_model, Info),
-			DefSecName  = agent_data_item(sec_name,  Info),
-			DefSecLevel = agent_data_item(sec_level, Info),
+			DefSecModel = agent_data_item(sec_model, TargetName),
+			DefSecName  = agent_data_item(sec_name,  TargetName),
+			DefSecLevel = agent_data_item(sec_level, TargetName),
 			
-			EngineId    = agent_data_item(engine_id, Info),
+			EngineId    = agent_data_item(engine_id, TargetName),
 			CtxName     = agent_data_item(context, 
 						      SendOpts, 
 						      ?DEFAULT_CONTEXT),
@@ -3191,8 +3190,8 @@ agent_data(TargetName, SendOpts) ->
 			{SecModel, SecName, mk_sec_level_flag(SecLevel), 
 			 EngineId, CtxName, TargetName};
 		    _ ->
-			DefComm     = agent_data_item(community, Info),
-			DefSecModel = agent_data_item(sec_model, Info),
+			DefComm     = agent_data_item(community, TargetName),
+			DefSecModel = agent_data_item(sec_model, TargetName),
 			
 			Comm        = agent_data_item(community, 
 						      SendOpts, 
@@ -3203,21 +3202,21 @@ agent_data(TargetName, SendOpts) ->
 			
 			{Comm, SecModel}
 		end,
-	    Domain  = agent_data_item(tdomain,  Info),
-	    Addr    = agent_data_item(address,  Info),
-	    Port    = agent_data_item(port,     Info),
-	    RegType = agent_data_item(reg_type, Info),
+	    Domain  = agent_data_item(tdomain,  TargetName),
+	    Addr    = agent_data_item(address,  TargetName),
+	    Port    = agent_data_item(port,     TargetName),
+	    RegType = agent_data_item(reg_type, TargetName),
 	    {ok, RegType, Domain, Addr, Port, version(Version), MsgData};
 	Error ->
 	    Error
     end.
 
-agent_data_item(Item, Info) ->
-    case lists:keysearch(Item, 1, Info) of
-	{value, {_, Val}} ->
+agent_data_item(Item, TargetName) ->
+    case snmpm_config:agent_info(TargetName, Item) of
+	{ok, Val} ->
 	    Val;
-	false ->
-	    throw({error, {not_found, Item, Info}})
+	{error, not_found} ->
+	    throw({error, {not_found, Item, TargetName}})
     end.
 
 agent_data_item(Item, Info, Default) ->
diff --git a/lib/snmp/src/manager/snmpm_user_default.erl b/lib/snmp/src/manager/snmpm_user_default.erl
index d90fc3f258..015198cb76 100644
--- a/lib/snmp/src/manager/snmpm_user_default.erl
+++ b/lib/snmp/src/manager/snmpm_user_default.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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,7 +62,7 @@ handle_trap(TargetName, SnmpTrap, UserData) ->
 	 "~n   SnmpTrap: ~p"
 	 "~n   UserData: ~p", 
 	 [TargetName, SnmpTrap, UserData]),
-    ok.
+    ignore.
 
 
 handle_inform(TargetName, SnmpInform, UserData) ->
@@ -80,7 +80,7 @@ handle_report(TargetName, SnmpReport, UserData) ->
 	 "~n   SnmpReport: ~p"
 	 "~n   UserData:   ~p", 
 	 [TargetName, SnmpReport, UserData]),
-    ok.
+    ignore.
 
 
 info(F, A) ->
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index bfe14bc080..09e1eb25a9 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %% 
 %% %CopyrightBegin%
 %%
@@ -5752,14 +5753,14 @@ otp_4394_config(AgentConfDir, MgrDir, Ip0) ->
     ?line write_community_conf(AgentConfDir, [C1, C2]),
     ?line update_vacm(Vsn, AgentConfDir),
     Ta1 = {"shelob v1", 
-	   [134,138,177,177], 5000, 1500, 3, %% Anv�nd Ip och modda
+	   [134,138,177,177], 5000, 1500, 3, %% Use Ip and modify
 	   "pc1", 
 	   "target_v1", "", 
 	   %% [255,255,255,255,0,0], 
 	   [],
 	   2048},
     Ta2 = {"bifur v1", 
-	   [134,138,177,75], 5000, 1500, 3, %% Anv�nd Ip
+	   [134,138,177,75], 5000, 1500, 3, %% Use Ip
 	   "pc2", 
 	   "target_v1", "", 
 	   %% [255,255,255,255,0,0],
diff --git a/lib/snmp/test/snmp_log_test.erl b/lib/snmp/test/snmp_log_test.erl
index aeac4d1f71..e9345b44cc 100644
--- a/lib/snmp/test/snmp_log_test.erl
+++ b/lib/snmp/test/snmp_log_test.erl
@@ -375,9 +375,9 @@ log_to_io1(Config) when is_list(Config) ->
 
 
 %%======================================================================
-%% Starta en logger-process som med ett visst intervall loggar
-%% meddelanden. Starta en reader-process som vid ett viss tillf�lle
-%% l�ser fr�n loggen.
+%% Start a logger-process that logs messages with a certain interval.
+%% Start a reader-process that reads messages from the log at a certain
+%% point of time.
 
 log_to_io2(suite) -> [];
 log_to_io2(doc) -> "Log to io from a different process than which "
@@ -578,9 +578,9 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
 
 
 %%======================================================================
-%% Starta en logger-process som med ett visst intervall loggar
-%% meddelanden. Starta en reader-process som vid ett viss tillf�lle
-%% l�ser fr�n loggen.
+%% Start a logger-process that logs messages with a certain interval.
+%% Start a reader-process that reads messages from the log at a certain
+%% point of time.
 %%
 %% Test: ts:run(snmp, snmp_log_test, log_to_txt2, [batch]).
 
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index c374a2f0a6..dedbae5ce4 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -174,7 +174,26 @@ end_per_suite(Config) when is_list(Config) ->
 
 init_per_testcase(Case, Config) when is_list(Config) ->
     io:format(user, "~n~n*** INIT ~w:~w ***~n~n", [?MODULE,Case]),
-    init_per_testcase2(Case, Config).
+    %% This version of the API, based on Addr and Port, has been deprecated
+    DeprecatedApiCases = 
+	[
+	 simple_sync_get1, 
+	 simple_async_get1, 
+	 simple_sync_get_next1, 
+	 simple_async_get_next1, 
+	 simple_sync_set1, 
+	 simple_async_set1, 
+	 simple_sync_get_bulk1, 
+	 simple_async_get_bulk1,
+	 misc_async1
+	],
+    case lists:member(Case, DeprecatedApiCases) of
+	true ->
+	    %% ?SKIP(api_no_longer_supported);
+	    {skip, api_no_longer_supported};
+	false ->
+	    init_per_testcase2(Case, Config)
+    end.
 
 init_per_testcase2(Case, Config) ->
     ?DBG("init_per_testcase2 -> ~p", [erlang:nodes()]),
@@ -226,18 +245,6 @@ init_per_testcase2(Case, Config) ->
     Conf2.
 
 init_per_testcase3(Case, Config) ->
-    ApiCases01 = 
-	[
-	 simple_sync_get1, 
-	 simple_async_get1, 
-	 simple_sync_get_next1, 
-	 simple_async_get_next1, 
-	 simple_sync_set1, 
-	 simple_async_set1, 
-	 simple_sync_get_bulk1, 
-	 simple_async_get_bulk1,
-	 misc_async1
-	],
     ApiCases02 = 
 	[
 	 simple_sync_get2, 
@@ -273,7 +280,6 @@ init_per_testcase3(Case, Config) ->
 	 inform_swarm,
 	 report
 	] ++ 
-	ApiCases01 ++ 
 	ApiCases02 ++
 	ApiCases03,
     case lists:member(Case, Cases) of
@@ -319,18 +325,6 @@ end_per_testcase(Case, Config) when is_list(Config) ->
     Conf2.
 
 end_per_testcase2(Case, Config) ->
-    ApiCases01 = 
-	[
-	 simple_sync_get1, 
-	 simple_async_get1, 
-	 simple_sync_get_next1, 
-	 simple_async_get_next1, 
-	 simple_sync_set1, 
-	 simple_async_set1, 
-	 simple_sync_get_bulk1, 
-	 simple_async_get_bulk1,
-	 misc_async1
-	],
     ApiCases02 = 
 	[
 	 simple_sync_get2, 
@@ -366,7 +360,6 @@ end_per_testcase2(Case, Config) ->
 	 inform_swarm,
 	 report
 	] ++ 
-	ApiCases01 ++ 
 	ApiCases02 ++ 
 	ApiCases03,
     case lists:member(Case, Cases) of
@@ -1596,12 +1589,14 @@ register_agent3(Config) when is_list(Config) ->
 simple_sync_get1(doc) -> ["Simple sync get-request - Old style (Addr & Port)"];
 simple_sync_get1(suite) -> [];
 simple_sync_get1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, ssg1),
     p("starting with Config: ~p~n", [Config]),
 
     Node  = ?config(manager_node, Config),
-    Addr  = ?config(ip, Config),
+    Addr  = ?config(manager_agent_target_name, Config),
     Port  = ?AGENT_PORT,
 
     p("issue get-request without loading the mib"),
@@ -1757,6 +1752,8 @@ simple_async_get1(doc) ->
     ["Simple (async) get-request - Old style (Addr & Port)"];
 simple_async_get1(suite) -> [];
 simple_async_get1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, sag1),
     p("starting with Config: ~p~n", [Config]),
@@ -1972,6 +1969,8 @@ simple_sync_get_next1(doc) -> ["Simple (sync) get_next-request - "
 			       "Old style (Addr & Port)"];
 simple_sync_get_next1(suite) -> [];
 simple_sync_get_next1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, ssgn1),
     p("starting with Config: ~p~n", [Config]),
@@ -2264,6 +2263,8 @@ simple_async_get_next1(doc) -> ["Simple (async) get_next-request - "
 				"Old style (Addr & Port)"];
 simple_async_get_next1(suite) -> [];
 simple_async_get_next1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, ssgn1),
     p("starting with Config: ~p~n", [Config]),
@@ -2516,6 +2517,8 @@ simple_sync_set1(doc) -> ["Simple (sync) set-request - "
 			  "Old style (Addr & Port)"];
 simple_sync_set1(suite) -> [];
 simple_sync_set1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, sss1),
     p("starting with Config: ~p~n", [Config]),
@@ -2686,6 +2689,8 @@ simple_async_set1(doc) -> ["Simple (async) set-request - "
 			   "Old style (Addr & Port)"];
 simple_async_set1(suite) -> [];
 simple_async_set1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, sas1),
     p("starting with Config: ~p~n", [Config]),
@@ -2896,6 +2901,8 @@ simple_sync_get_bulk1(doc) -> ["Simple (sync) get_bulk-request - "
 			       "Old style (Addr & Port)"];
 simple_sync_get_bulk1(suite) -> [];
 simple_sync_get_bulk1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, ssgb1),
     p("starting with Config: ~p~n", [Config]),
@@ -3261,6 +3268,8 @@ simple_async_get_bulk1(doc) -> ["Simple (async) get_bulk-request - "
 				"Old style (Addr & Port)"];
 simple_async_get_bulk1(suite) -> [];
 simple_async_get_bulk1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, sagb1),
     p("starting with Config: ~p~n", [Config]),
@@ -3605,6 +3614,8 @@ misc_async1(doc) -> ["Misc (async) request(s) - "
 		     "Old style (Addr & Port)"];
 misc_async1(suite) -> [];
 misc_async1(Config) when is_list(Config) ->
+    ?SKIP(api_no_longer_supported), 
+
     process_flag(trap_exit, true),
     put(tname, ms1),
     p("starting with Config: ~p~n", [Config]),
@@ -5591,29 +5602,35 @@ fin_mgr_user(Conf) ->
 
 init_mgr_user_data1(Conf) ->
     Node = ?config(manager_node, Conf),
-    Addr = ?config(ip, Conf),
-    Port = ?AGENT_PORT,
-    ?line ok = mgr_user_register_agent(Node, Addr, Port),
+    TargetName = ?config(manager_agent_target_name, Conf),
+    Addr       = ?config(ip, Conf),
+    Port       = ?AGENT_PORT,
+    ?line ok = mgr_user_register_agent(Node, TargetName, 
+				       [{address,   Addr},
+					{port,      Port},
+					{engine_id, "agentEngine"}]),
     Agents = mgr_user_which_own_agents(Node),
     ?DBG("Own agents: ~p", [Agents]),
 
-    ?line {ok, DefAgentConf} = mgr_user_agent_info(Node, Addr, Port, all),
+    ?line {ok, DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
     ?DBG("Default agent config: ~n~p", [DefAgentConf]),
 
-    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  community, "all-rights"),
-    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  sec_name, "all-rights"),
-    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  engine_id, "agentEngine"),
-    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  max_message_size, 1024),
 
-    ?line {ok, AgentConf} = mgr_user_agent_info(Node, Addr, Port, all),
+    ?line {ok, AgentConf} = mgr_user_agent_info(Node, TargetName, all),
     ?DBG("Updated agent config: ~n~p", [AgentConf]),
     Conf.
 
 init_mgr_user_data2(Conf) ->
+    ?DBG("init_mgr_user_data2 -> entry with"
+	 "~n   Conf: ~p", [Conf]),
     Node       = ?config(manager_node, Conf),
     TargetName = ?config(manager_agent_target_name, Conf),
     Addr       = ?config(ip, Conf),
@@ -5641,9 +5658,8 @@ init_mgr_user_data2(Conf) ->
 
 fin_mgr_user_data1(Conf) ->
     Node = ?config(manager_node, Conf),
-    Addr = ?config(ip, Conf),
-    Port = ?AGENT_PORT,
-    mgr_user_unregister_agent(Node, Addr, Port),
+    TargetName = ?config(manager_agent_target_name, Conf),
+    mgr_user_unregister_agent(Node, TargetName),
     mgr_user_which_own_agents(Node),
     Conf.
 
@@ -5670,33 +5686,41 @@ mgr_user_stop(Node) ->
 %%     mgr_user_register_agent(Node, Addr, ?AGENT_PORT, []).
 mgr_user_register_agent(Node, TargetName, Conf) 
   when is_list(TargetName) andalso is_list(Conf) ->
-    rcall(Node, snmp_manager_user, register_agent, [TargetName, Conf]);
-mgr_user_register_agent(Node, Addr, Port) ->
-    mgr_user_register_agent(Node, Addr, Port, []).
-mgr_user_register_agent(Node, Addr, Port, Conf) ->
-    rcall(Node, snmp_manager_user, register_agent, [Addr, Port, Conf]).
+    rcall(Node, snmp_manager_user, register_agent, [TargetName, Conf]).
+%% <REMOVED-IN-R16B>
+%% mgr_user_register_agent(Node, Addr, Port) ->
+%%     mgr_user_register_agent(Node, Addr, Port, []).
+%% mgr_user_register_agent(Node, Addr, Port, Conf) ->
+%%     rcall(Node, snmp_manager_user, register_agent, [Addr, Port, Conf]).
+%% </REMOVED-IN-R16B>
 
 %% mgr_user_unregister_agent(Node) ->
 %%     mgr_user_unregister_agent(Node, ?LOCALHOST(), ?AGENT_PORT).
-mgr_user_unregister_agent(Node, Addr_or_TargetName) ->
-    rcall(Node, snmp_manager_user, unregister_agent, [Addr_or_TargetName]).
-mgr_user_unregister_agent(Node, Addr, Port) ->
-    rcall(Node, snmp_manager_user, unregister_agent, [Addr, Port]).
-
-mgr_user_agent_info(Node, Addr_or_TargetName, Item) when is_atom(Item) ->
-    rcall(Node, snmp_manager_user, agent_info, [Addr_or_TargetName, Item]).
-mgr_user_agent_info(Node, Addr, Port, Item) when is_atom(Item) ->
-    rcall(Node, snmp_manager_user, agent_info, [Addr, Port, Item]).
+mgr_user_unregister_agent(Node, TargetName) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, unregister_agent, [TargetName]).
+%% <REMOVED-IN-R16B>
+%% mgr_user_unregister_agent(Node, Addr, Port) ->
+%%     rcall(Node, snmp_manager_user, unregister_agent, [Addr, Port]).
+%% </REMOVED-IN-R16B>
+
+mgr_user_agent_info(Node, TargetName, Item) 
+  when is_list(TargetName) andalso is_atom(Item) ->
+    rcall(Node, snmp_manager_user, agent_info, [TargetName, Item]).
+%% <REMOVED-IN-R16B>
+%% mgr_user_agent_info(Node, Addr, Port, Item) when is_atom(Item) ->
+%%     rcall(Node, snmp_manager_user, agent_info, [Addr, Port, Item]).
+%% </REMOVED-IN-R16B>
 
 %% mgr_user_update_agent_info(Node, Item, Val) when atom(Item) ->
 %%     mgr_user_update_agent_info(Node, ?LOCALHOST(), ?AGENT_PORT, Item, Val).
-mgr_user_update_agent_info(Node, Addr_or_TargetName, Item, Val) 
-  when is_atom(Item) ->
-    rcall(Node, snmp_manager_user, update_agent_info, 
-	  [Addr_or_TargetName, Item, Val]).
-mgr_user_update_agent_info(Node, Addr, Port, Item, Val) when is_atom(Item) ->
-    rcall(Node, snmp_manager_user, update_agent_info, 
-	  [Addr, Port, Item, Val]).
+mgr_user_update_agent_info(Node, TargetName, Item, Val) 
+  when is_list(TargetName) andalso is_atom(Item) ->
+    rcall(Node, snmp_manager_user, update_agent_info, [TargetName, Item, Val]).
+%% <REMOVED-IN-R16B>
+%% mgr_user_update_agent_info(Node, Addr, Port, Item, Val) when is_atom(Item) ->
+%%     rcall(Node, snmp_manager_user, update_agent_info, 
+%% 	  [Addr, Port, Item, Val]).
+%% </REMOVED-IN-R16B>
 
 %% mgr_user_which_all_agents(Node) ->
 %%     rcall(Node, snmp_manager_user, which_all_agents, []).
@@ -5709,89 +5733,112 @@ mgr_user_load_mib(Node, Mib) ->
 
 %% mgr_user_sync_get(Node, Oids) ->
 %%     mgr_user_sync_get(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
-mgr_user_sync_get(Node, Addr_or_TargetName, Oids) ->
-    rcall(Node, snmp_manager_user, sync_get, [Addr_or_TargetName, Oids]).
+mgr_user_sync_get(Node, TargetName, Oids) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, sync_get, [TargetName, Oids]).
+%% <REMOVED-IN-R16B>
 mgr_user_sync_get(Node, Addr, Port, Oids) ->
     rcall(Node, snmp_manager_user, sync_get, [Addr, Port, Oids]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_sync_get2(Node, TargetName, Oids, SendOpts) ->
+mgr_user_sync_get2(Node, TargetName, Oids, SendOpts) when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, sync_get2, [TargetName, Oids, SendOpts]).
 
 %% mgr_user_async_get(Node, Oids) ->
 %%     mgr_user_async_get(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
-mgr_user_async_get(Node, Addr_or_TargetName, Oids) ->
-    rcall(Node, snmp_manager_user, async_get, [Addr_or_TargetName, Oids]).
+mgr_user_async_get(Node, TargetName, Oids) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, async_get, [TargetName, Oids]).
+%% <REMOVED-IN-R16B>
 mgr_user_async_get(Node, Addr, Port, Oids) ->
     rcall(Node, snmp_manager_user, async_get, [Addr, Port, Oids]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_async_get2(Node, TargetName, Oids, SendOpts) ->
+mgr_user_async_get2(Node, TargetName, Oids, SendOpts) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, async_get2, [TargetName, Oids, SendOpts]).
 
 %% mgr_user_sync_get_next(Node, Oids) ->
 %%     mgr_user_sync_get_next(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
-mgr_user_sync_get_next(Node, Addr_or_TargetName, Oids) ->
-    rcall(Node, snmp_manager_user, sync_get_next, [Addr_or_TargetName, Oids]).
+mgr_user_sync_get_next(Node, TargetName, Oids) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, sync_get_next, [TargetName, Oids]).
+%% <REMOVED-IN-R16B>
 mgr_user_sync_get_next(Node, Addr, Port, Oids) ->
     rcall(Node, snmp_manager_user, sync_get_next, [Addr, Port, Oids]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_sync_get_next2(Node, TargetName, Oids, SendOpts) ->
+mgr_user_sync_get_next2(Node, TargetName, Oids, SendOpts) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, sync_get_next2, [TargetName, Oids, SendOpts]).
 
 %% mgr_user_async_get_next(Node, Oids) ->
 %%     mgr_user_async_get_next(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
-mgr_user_async_get_next(Node, Addr_or_TargetName, Oids) ->
-    rcall(Node, snmp_manager_user, async_get_next, [Addr_or_TargetName, Oids]).
+mgr_user_async_get_next(Node, TargetName, Oids) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, async_get_next, [TargetName, Oids]).
+%% <REMOVED-IN-R16B>
 mgr_user_async_get_next(Node, Addr, Port, Oids) ->
     rcall(Node, snmp_manager_user, async_get_next, [Addr, Port, Oids]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_async_get_next2(Node, TargetName, Oids, SendOpts) ->
+mgr_user_async_get_next2(Node, TargetName, Oids, SendOpts) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, async_get_next2, [TargetName, Oids, SendOpts]).
 
 %% mgr_user_sync_set(Node, VAV) ->
 %%     mgr_user_sync_set(Node, ?LOCALHOST(), ?AGENT_PORT, VAV).
-mgr_user_sync_set(Node, Addr_or_TargetName, VAV) ->
-    rcall(Node, snmp_manager_user, sync_set, [Addr_or_TargetName, VAV]).
+mgr_user_sync_set(Node, TargetName, VAV) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, sync_set, [TargetName, VAV]).
+%% <REMOVED-IN-R16B>
 mgr_user_sync_set(Node, Addr, Port, VAV) ->
     rcall(Node, snmp_manager_user, sync_set, [Addr, Port, VAV]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_sync_set2(Node, TargetName, VAV, SendOpts) ->
+mgr_user_sync_set2(Node, TargetName, VAV, SendOpts) when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, sync_set2, [TargetName, VAV, SendOpts]).
 
 %% mgr_user_async_set(Node, VAV) ->
 %%     mgr_user_async_set(Node, ?LOCALHOST(), ?AGENT_PORT, VAV).
-mgr_user_async_set(Node, Addr_or_TargetName, VAV) ->
-    rcall(Node, snmp_manager_user, async_set, [Addr_or_TargetName, VAV]).
+mgr_user_async_set(Node, TargetName, VAV) when is_list(TargetName) ->
+    rcall(Node, snmp_manager_user, async_set, [TargetName, VAV]).
+%% <REMOVED-IN-R16B>
 mgr_user_async_set(Node, Addr, Port, VAV) ->
     rcall(Node, snmp_manager_user, async_set, [Addr, Port, VAV]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_async_set2(Node, TargetName, VAV, SendOpts) ->
+mgr_user_async_set2(Node, TargetName, VAV, SendOpts) when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, async_set2, [TargetName, VAV, SendOpts]).
 
 %% mgr_user_sync_get_bulk(Node, NonRep, MaxRep, Oids) ->
 %%     mgr_user_sync_get_bulk(Node, ?LOCALHOST(), ?AGENT_PORT, 
 %% 			   NonRep, MaxRep, Oids).
-mgr_user_sync_get_bulk(Node, Addr_or_TargetName, NonRep, MaxRep, Oids) ->
+mgr_user_sync_get_bulk(Node, TargetName, NonRep, MaxRep, Oids) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, sync_get_bulk, 
-	  [Addr_or_TargetName, NonRep, MaxRep, Oids]).
+	  [TargetName, NonRep, MaxRep, Oids]).
+%% <REMOVED-IN-R16B>
 mgr_user_sync_get_bulk(Node, Addr, Port, NonRep, MaxRep, Oids) ->
     rcall(Node, snmp_manager_user, sync_get_bulk, 
 	     [Addr, Port, NonRep, MaxRep, Oids]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_sync_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) ->
+mgr_user_sync_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, sync_get_bulk2, 
 	  [TargetName, NonRep, MaxRep, Oids, SendOpts]).
 
 %% mgr_user_async_get_bulk(Node, NonRep, MaxRep, Oids) ->
 %%     mgr_user_async_get_bulk(Node, ?LOCALHOST(), ?AGENT_PORT, 
 %% 			   NonRep, MaxRep, Oids).
-mgr_user_async_get_bulk(Node, Addr_or_TargetName, NonRep, MaxRep, Oids) ->
+mgr_user_async_get_bulk(Node, TargetName, NonRep, MaxRep, Oids) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, async_get_bulk, 
-	  [Addr_or_TargetName, NonRep, MaxRep, Oids]).
+	  [TargetName, NonRep, MaxRep, Oids]).
+%% <REMOVED-IN-R16B>
 mgr_user_async_get_bulk(Node, Addr, Port, NonRep, MaxRep, Oids) ->
     rcall(Node, snmp_manager_user, async_get_bulk, 
 	     [Addr, Port, NonRep, MaxRep, Oids]).
+%% </REMOVED-IN-R16B>
 
-mgr_user_async_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) ->
+mgr_user_async_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) 
+  when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, async_get_bulk2, 
 	  [TargetName, NonRep, MaxRep, Oids, SendOpts]).
 
diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index 1b62b04960..4e789bbaec 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -44,20 +44,20 @@
 	 info/0, 
 	 system_info/0, 
 	 simulate_crash/1,
-	 register_agent/2, register_agent/3, 
-	 unregister_agent/1, unregister_agent/2, 
-	 agent_info/2, agent_info/3, 
-	 update_agent_info/3, update_agent_info/4, 
+	 register_agent/2, 
+	 unregister_agent/1, 
+	 agent_info/2, 
+	 update_agent_info/3, 
 	 which_all_agents/0, which_own_agents/0, 
 	 load_mib/1, unload_mib/1, 
-	 sync_get/1,       sync_get/2,       sync_get/3,       sync_get2/3, 
-	 async_get/1,      async_get/2,      async_get/3,      async_get2/3,
-	 sync_get_next/1,  sync_get_next/2,  sync_get_next/3,  sync_get_next2/3,
-	 async_get_next/1, async_get_next/2, async_get_next/3, async_get_next2/3,
-	 sync_set/1,       sync_set/2,       sync_set/3,       sync_set2/3, 
-	 async_set/1,      async_set/2,      async_set/3,      async_set2/3, 
-	 sync_get_bulk/3,  sync_get_bulk/4,  sync_get_bulk/5,  sync_get_bulk2/5,
-	 async_get_bulk/3, async_get_bulk/4, async_get_bulk/5, async_get_bulk2/5,
+	 sync_get/1,       sync_get/2,       sync_get2/3, 
+	 async_get/1,      async_get/2,      async_get2/3,
+	 sync_get_next/1,  sync_get_next/2,  sync_get_next2/3,
+	 async_get_next/1, async_get_next/2, async_get_next2/3,
+	 sync_set/1,       sync_set/2,       sync_set2/3, 
+	 async_set/1,      async_set/2,      async_set2/3, 
+	 sync_get_bulk/3,  sync_get_bulk/4,  sync_get_bulk2/5,
+	 async_get_bulk/3, async_get_bulk/4, async_get_bulk2/5,
 	 name_to_oid/1, oid_to_name/1, 
 	 purify_oid/1	 
         ]).
@@ -73,15 +73,11 @@
 
 -export([
 	 handle_error/3,
-         handle_agent/4,
+         handle_agent/5,
          handle_pdu/4,
          handle_trap/3,
          handle_inform/3,
-         handle_report/3, 
-         handle_pdu/5,    % For backwards compatibillity 
-         handle_trap/4,   % For backwards compatibillity 
-         handle_inform/4, % For backwards compatibillity 
-         handle_report/4  % For backwards compatibillity 
+         handle_report/3
 	]).
 
 
@@ -126,27 +122,16 @@ simulate_crash(Reason) ->
 
 register_agent(TargetName, Config) 
   when is_list(TargetName) andalso is_list(Config) ->
-    call({register_agent, TargetName, Config});
-register_agent(Addr, Port) ->
-    register_agent(Addr, Port, []).
-
-register_agent(Addr, Port, Conf) ->
-    call({register_agent, Addr, Port, Conf}).
+    call({register_agent, TargetName, Config}).
 
 unregister_agent(TargetName) ->
     call({unregister_agent, TargetName}).
-unregister_agent(Addr, Port) ->
-    call({unregister_agent, Addr, Port}).
 
 agent_info(TargetName, Item) ->
     call({agent_info, TargetName, Item}).
-agent_info(Addr, Port, Item) ->
-    call({agent_info, Addr, Port, Item}).
 
 update_agent_info(TargetName, Item, Val) ->
     call({update_agent_info, TargetName, Item, Val}).
-update_agent_info(Addr, Port, Item, Val) ->
-    call({update_agent_info, Addr, Port, Item, Val}).
 
 which_all_agents() ->
     call(which_all_agents).
@@ -165,11 +150,8 @@ unload_mib(Mib) ->
 sync_get(Oids) ->
     call({sync_get, Oids}).
 
-sync_get(Addr_or_TargetName, Oids) ->
-    call({sync_get, Addr_or_TargetName, Oids}).
-
-sync_get(Addr, Port, Oids) ->
-    call({sync_get, Addr, Port, Oids}).
+sync_get(TargetName, Oids) ->
+    call({sync_get, TargetName, Oids}).
 
 sync_get2(TargetName, Oids, SendOpts) ->
     call({sync_get2, TargetName, Oids, SendOpts}).
@@ -180,11 +162,8 @@ sync_get2(TargetName, Oids, SendOpts) ->
 async_get(Oids) ->
     call({async_get, Oids}).
 
-async_get(Addr_or_TargetName, Oids) ->
-    call({async_get, Addr_or_TargetName, Oids}).
-
-async_get(Addr, Port, Oids) ->
-    call({async_get, Addr, Port, Oids}).
+async_get(TargetName, Oids) ->
+    call({async_get, TargetName, Oids}).
 
 async_get2(TargetName, Oids, SendOpts) ->
     call({async_get2, TargetName, Oids, SendOpts}).
@@ -194,11 +173,8 @@ async_get2(TargetName, Oids, SendOpts) ->
 sync_get_next(Oids) ->
     call({sync_get_next, Oids}).
 
-sync_get_next(Addr_or_TargetName, Oids) ->
-    call({sync_get_next, Addr_or_TargetName, Oids}).
-
-sync_get_next(Addr, Port, Oids) ->
-    call({sync_get_next, Addr, Port, Oids}).
+sync_get_next(TargetName, Oids) ->
+    call({sync_get_next, TargetName, Oids}).
 
 sync_get_next2(TargetName, Oids, SendOpts) ->
     call({sync_get_next2, TargetName, Oids, SendOpts}).
@@ -208,11 +184,8 @@ sync_get_next2(TargetName, Oids, SendOpts) ->
 async_get_next(Oids) ->
     call({async_get_next, Oids}).
 
-async_get_next(Addr_or_TargetName, Oids) ->
-    call({async_get_next, Addr_or_TargetName, Oids}).
-
-async_get_next(Addr, Port, Oids) ->
-    call({async_get_next, Addr, Port, Oids}).
+async_get_next(TargetName, Oids) ->
+    call({async_get_next, TargetName, Oids}).
 
 async_get_next2(TargetName, Oids, SendOpts) ->
     call({async_get_next2, TargetName, Oids, SendOpts}).
@@ -222,11 +195,8 @@ async_get_next2(TargetName, Oids, SendOpts) ->
 sync_set(VAV) ->
     call({sync_set, VAV}).
 
-sync_set(Addr_or_TargetName, VAV) ->
-    call({sync_set, Addr_or_TargetName, VAV}).
-
-sync_set(Addr, Port, VAV) ->
-    call({sync_set, Addr, Port, VAV}).
+sync_set(TargetName, VAV) ->
+    call({sync_set, TargetName, VAV}).
 
 sync_set2(TargetName, VAV, SendOpts) ->
     call({sync_set2, TargetName, VAV, SendOpts}).
@@ -236,11 +206,8 @@ sync_set2(TargetName, VAV, SendOpts) ->
 async_set(VAV) ->
     call({async_set, VAV}).
 
-async_set(Addr_or_TargetName, VAV) ->
-    call({async_set, Addr_or_TargetName, VAV}).
-
-async_set(Addr, Port, VAV) ->
-    call({async_set, Addr, Port, VAV}).
+async_set(TargetName, VAV) ->
+    call({async_set, TargetName, VAV}).
 
 async_set2(TargetName, VAV, SendOpts) ->
     call({async_set2, TargetName, VAV, SendOpts}).
@@ -250,11 +217,8 @@ async_set2(TargetName, VAV, SendOpts) ->
 sync_get_bulk(NonRep, MaxRep, Oids) ->
     call({sync_get_bulk, NonRep, MaxRep, Oids}).
 
-sync_get_bulk(Addr_or_TargetName, NonRep, MaxRep, Oids) ->
-    call({sync_get_bulk, Addr_or_TargetName, NonRep, MaxRep, Oids}).
-
-sync_get_bulk(Addr, Port, NonRep, MaxRep, Oids) ->
-    call({sync_get_bulk, Addr, Port, NonRep, MaxRep, Oids}).
+sync_get_bulk(TargetName, NonRep, MaxRep, Oids) ->
+    call({sync_get_bulk, TargetName, NonRep, MaxRep, Oids}).
 
 sync_get_bulk2(TargetName, NonRep, MaxRep, Oids, SendOpts) ->
     call({sync_get_bulk2, TargetName, NonRep, MaxRep, Oids, SendOpts}).
@@ -264,11 +228,8 @@ sync_get_bulk2(TargetName, NonRep, MaxRep, Oids, SendOpts) ->
 async_get_bulk(NonRep, MaxRep, Oids) ->
     call({async_get_bulk, NonRep, MaxRep, Oids}).
 
-async_get_bulk(Addr_or_TargetName, NonRep, MaxRep, Oids) ->
-    call({async_get_bulk, Addr_or_TargetName, NonRep, MaxRep, Oids}).
-
-async_get_bulk(Addr, Port, NonRep, MaxRep, Oids) ->
-    call({async_get_bulk, Addr, Port, NonRep, MaxRep, Oids}).
+async_get_bulk(TargetName, NonRep, MaxRep, Oids) ->
+    call({async_get_bulk, TargetName, NonRep, MaxRep, Oids}).
 
 async_get_bulk2(TargetName, NonRep, MaxRep, Oids, SendOpts) ->
     call({async_get_bulk2, TargetName, NonRep, MaxRep, Oids, SendOpts}).
@@ -340,24 +301,12 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{register_agent, Addr, Port, Conf}, From, Ref} ->
-	    d("loop -> received register_agent request"),
-	    Res = snmpm:register_agent(Id, Addr, Port, Conf),
-	    reply(From, Res, Ref),
-	    loop(S);
-
 	{{unregister_agent, TargetName}, From, Ref} ->
 	    d("loop -> received unregister_agent request"),
 	    Res = snmpm:unregister_agent(Id, TargetName),
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{unregister_agent, Addr, Port}, From, Ref} ->
-	    d("loop -> received unregister_agent request"),
-	    Res = snmpm:unregister_agent(Id, Addr, Port),
-	    reply(From, Res, Ref),
-	    loop(S);
-
 	{{agent_info, TargetName, Item}, From, Ref} ->
 	   d("loop -> received agent_info request with"
 	     "~n   TargetName: ~p"
@@ -368,15 +317,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{agent_info, Addr, Port, Item}, From, Ref} ->
-	   d("loop -> received agent_info request with"
-	     "~n   Addr: ~p"
-	     "~n   Port: ~p"
-	     "~n   Item: ~p", [Addr, Port, Item]), 
-	    Res = snmpm:agent_info(Addr, Port, Item),
-	    reply(From, Res, Ref),
-	    loop(S);
-
 	{{update_agent_info, TargetName, Item, Val}, From, Ref} ->
 	   d("loop -> received update_agent_info request with"
 	     "~n   TargetName: ~p"
@@ -386,16 +326,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{update_agent_info, Addr, Port, Item, Val}, From, Ref} ->
-	   d("loop -> received update_agent_info request with"
-	     "~n   Addr: ~p"
-	     "~n   Port: ~p"
-	     "~n   Item: ~p"
-	     "~n   Val: ~p", [Addr, Port, Item, Val]), 
-	    Res = snmpm:update_agent_info(Id, Addr, Port, Item, Val),
-	    reply(From, Res, Ref),
-	    loop(S);
-
 	{which_all_agents, From, Ref} ->
 	    d("loop -> received which_all_agents request"),
 	    Res = snmpm:which_agents(),
@@ -452,23 +382,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{sync_get, Addr, Oids}, From, Ref} ->
-	    d("loop -> received sync_get request with"
-	      "~n   Addr: ~p"
-	      "~n   Oids: ~p", [Addr, Oids]),
-	    Res = snmpm:g(Id, Addr, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{sync_get, Addr, Port, Oids}, From, Ref} ->
-	    d("loop -> received sync_get request with"
-	      "~n   Addr: ~p"
-	      "~n   Port: ~p"
-	      "~n   Oids: ~p", [Addr, Port, Oids]),
-	    Res = snmpm:g(Id, Addr, Port, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (async) get-request --
@@ -500,18 +413,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{async_get, Addr, Oids}, From, Ref} ->
-	    d("loop -> received async_get request"),
-	    Res = snmpm:ag(Id, Addr, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{async_get, Addr, Port, Oids}, From, Ref} ->
-	    d("loop -> received async_get request"),
-	    Res = snmpm:ag(Id, Addr, Port, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (sync) get_next-request --
@@ -543,18 +444,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{sync_get_next, Addr, Oids}, From, Ref} ->
-	    d("loop -> received sync_get_next request"),
-	    Res = snmpm:gn(Id, Addr, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{sync_get_next, Addr, Port, Oids}, From, Ref} ->
-	    d("loop -> received sync_get_next request"),
-	    Res = snmpm:gn(Id, Addr, Port, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (async) get_next-request --
@@ -586,18 +475,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{async_get_next, Addr, Oids}, From, Ref} ->
-	    d("loop -> received async_get_next request"),
-	    Res = snmpm:agn(Id, Addr, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{async_get_next, Addr, Port, Oids}, From, Ref} ->
-	    d("loop -> received async_get_next request"),
-	    Res = snmpm:agn(Id, Addr, Port, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (sync) set-request --
@@ -626,18 +503,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{sync_set, Addr, VAV}, From, Ref} ->
-	    d("loop -> received sync_set request"),
-	    Res = snmpm:s(Id, Addr, VAV), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{sync_set, Addr, Port, VAV}, From, Ref} ->
-	    d("loop -> received sync_set request"),
-	    Res = snmpm:s(Id, Addr, Port, VAV), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (async) set-request --
@@ -666,18 +531,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{async_set, Addr, VAV}, From, Ref} ->
-	    d("loop -> received async_set request"),
-	    Res = snmpm:as(Id, Addr, VAV), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{async_set, Addr, Port, VAV}, From, Ref} ->
-	    d("loop -> received async_set request"),
-	    Res = snmpm:as(Id, Addr, Port, VAV), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (sync) get-bulk-request --
@@ -718,27 +571,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{sync_get_bulk, Addr, NonRep, MaxRep, Oids}, From, Ref} ->
-	    d("loop -> received sync_get_bulk request with"
-	      "~n   Addr:   ~p"
-	      "~n   NonRep: ~w"
-	      "~n   MaxRep: ~w"
-	      "~n   Oids:   ~p", [Addr, NonRep, MaxRep, Oids]),
-	    Res = snmpm:gb(Id, Addr, NonRep, MaxRep, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{sync_get_bulk, Addr, Port, NonRep, MaxRep, Oids}, From, Ref} ->
-	    d("loop -> received sync_get_bulk request with"
-	      "~n   Addr:   ~p"
-	      "~n   Port:   ~w"
-	      "~n   NonRep: ~w"
-	      "~n   MaxRep: ~w"
-	      "~n   Oids:   ~p", [Addr, Port, NonRep, MaxRep, Oids]),
-	    Res = snmpm:gb(Id, Addr, Port, NonRep, MaxRep, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- (async) get-bulk-request --
@@ -779,27 +611,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    reply(From, Res, Ref),
 	    loop(S);
 
-	{{async_get_bulk, Addr, NonRep, MaxRep, Oids}, From, Ref} ->
-	    d("loop -> received async_get_bulk request with"
-	      "~n   Addr:   ~p"
-	      "~n   NonRep: ~w"
-	      "~n   MaxRep: ~w"
-	      "~n   Oids:   ~p", [Addr, NonRep, MaxRep, Oids]),
-	    Res = snmpm:agb(Id, Addr, NonRep, MaxRep, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
-	{{async_get_bulk, Addr, Port, NonRep, MaxRep, Oids}, From, Ref} ->
-	    d("loop -> received async_get_bulk request with"
-	      "~n   Addr:   ~p"
-	      "~n   Port:   ~w"
-	      "~n   NonRep: ~w"
-	      "~n   MaxRep: ~w"
-	      "~n   Oids:   ~p", [Addr, Port, NonRep, MaxRep, Oids]),
-	    Res = snmpm:agb(Id, Addr, Port, NonRep, MaxRep, Oids), 
-	    reply(From, Res, Ref),
-	    loop(S);
-
 
 	%% 
 	%% -- logical name translation --
@@ -846,12 +657,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    Parent ! {async_event, ReqId, {pdu, SnmpResponse}},
 	    loop(S);
 
-	%% For backwards compatibillity 
-	{handle_pdu, _Pid, _Addr, _Port, ReqId, SnmpResponse} ->
-	    d("loop -> received pdu callback from manager for ~w", [ReqId]),
-	    Parent ! {async_event, ReqId, {pdu, SnmpResponse}},
-	    loop(S);
-
 	{handle_trap, _Pid, TargetName, SnmpTrap} ->
 	    d("loop -> received trap callback from manager for "
 	      "~n   ~p", 
@@ -860,15 +665,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    Parent ! {async_event, TargetName, {trap, SnmpTrap}}, 
 	    loop(S);
 
-	%% For backwards compatibillity 
-	{handle_trap, _Pid, Addr, Port, SnmpTrap} ->
-	    d("loop -> received trap callback from manager for "
-	      "~n   ~p:~w", 
-	      "~n   ~p", 
-	      [Addr, Port, SnmpTrap]),
-	    Parent ! {async_event, {Addr, Port}, {trap, SnmpTrap}}, 
-	    loop(S);
-
 	{handle_inform, Pid, TargetName, SnmpInform} ->
 	    d("loop -> received inform callback from manager for "
 	      "~n   ~p", 
@@ -877,15 +673,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    Parent ! {async_event, TargetName, {inform, Pid, SnmpInform}}, 
 	    loop(S);
 
-	%% For backwards compatibillity 
-	{handle_inform, Pid, Addr, Port, SnmpInform} ->
-	    d("loop -> received inform callback from manager for "
-	      "~n   ~p:~w", 
-	      "~n   ~p", 
-	      [Addr, Port, SnmpInform]),
-	    Parent ! {async_event, {Addr, Port}, {inform, Pid, SnmpInform}}, 
-	    loop(S);
-
 	{handle_report, _Pid, TargetName, SnmpReport} ->
 	    d("loop -> received report callback from manager for "
 	      "~n   ~p", 
@@ -894,15 +681,6 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    Parent ! {async_event, TargetName, {report, SnmpReport}}, 
 	    loop(S);
 
-	%% For backwards compatibillity 
-	{handle_report, _Pid, Addr, Port, SnmpReport} ->
-	    d("loop -> received report callback from manager for "
-	      "~n   ~p:~w", 
-	      "~n   ~p", 
-	      [Addr, Port, SnmpReport]),
-	    Parent ! {async_event, {Addr, Port}, {report, SnmpReport}}, 
-	    loop(S);
-
 	{'EXIT', Parent, Reason} ->
 	    d("received exit signal from parent: ~n~p", [Reason]),
 	    info("received exit signal from parent: ~n~p", [Reason]),
@@ -981,8 +759,8 @@ handle_error(ReqId, Reason, UserPid) ->
     ignore.
  
  
-handle_agent(Addr, Port, SnmpInfo, UserPid) ->
-    UserPid ! {handle_agent, self(), Addr, Port, SnmpInfo},
+handle_agent(Addr, Port, SnmpInfo, UserPid, UserData) ->
+    UserPid ! {handle_agent, self(), Addr, Port, SnmpInfo, UserData},
     ignore.
  
  
@@ -990,22 +768,10 @@ handle_pdu(TargetName, ReqId, SnmpResponse, UserPid) ->
     UserPid ! {handle_pdu, self(), TargetName, ReqId, SnmpResponse},
     ignore.
  
-%% For backwards compatibillity 
-handle_pdu(Addr, Port, ReqId, SnmpResponse, UserPid) ->
-    UserPid ! {handle_pdu, self(), Addr, Port, ReqId, SnmpResponse},
-    ignore.
- 
- 
 handle_trap(TargetName, SnmpTrap, UserPid) ->
     UserPid ! {handle_trap, self(), TargetName, SnmpTrap},
     ok.
  
-%% For backwards compatibillity 
-handle_trap(Addr, Port, SnmpTrap, UserPid) ->
-    UserPid ! {handle_trap, self(), Addr, Port, SnmpTrap},
-    ok.
- 
- 
 handle_inform(TargetName, SnmpInform, UserPid) ->
     UserPid ! {handle_inform, self(), TargetName, SnmpInform},
     receive
@@ -1015,26 +781,10 @@ handle_inform(TargetName, SnmpInform, UserPid) ->
 	    ok
     end.
 
-%% For backwards compatibillity 
-handle_inform(Addr, Port, SnmpInform, UserPid) ->
-    UserPid ! {handle_inform, self(), Addr, Port, SnmpInform},
-    receive
-	{handle_inform_no_response, {Addr, Port}} ->
-	    no_reply;
-	{handle_inform_response, {Addr, Port}} ->
-	    ok
-    end.
-
-
 handle_report(TargetName, SnmpReport, UserPid) ->
     UserPid ! {handle_report, self(), TargetName, SnmpReport},
     ok.
 
-%% For backwards compatibillity 
-handle_report(Addr, Port, SnmpReport, UserPid) ->
-    UserPid ! {handle_report, self(), Addr, Port, SnmpReport},
-    ok.
-
 
 %%----------------------------------------------------------------------
 %% Debug
diff --git a/lib/snmp/test/snmp_manager_user_old.erl b/lib/snmp/test/snmp_manager_user_old.erl
index 6280cef51f..9f951bf64d 100644
--- a/lib/snmp/test/snmp_manager_user_old.erl
+++ b/lib/snmp/test/snmp_manager_user_old.erl
@@ -107,10 +107,20 @@ unregister_agent(Addr, Port) ->
     snmpm:unregister_agent(?USER_ID, Addr, Port).
 
 agent_info(Addr, Port, Item) ->
-    snmpm:agent_info(?USER_ID, Addr, Port, Item).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:agent_info(TargetName, Item);
+	Error ->
+	    Error
+    end.
 
 update_agent_info(Addr, Port, Item, Val) ->
-    snmpm:update_agent_info(?USER_ID, Addr, Port, Item, Val).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:update_agent_info(?USER_ID, TargetName, Item, Val);
+	Error ->
+	    Error
+    end.
 
 which_agents() ->
     snmpm:which_agents().
@@ -128,73 +138,153 @@ unload_mib(Mib) ->
 %% -- 
 
 sync_get(Addr, Oids) ->
-    snmpm:g(?USER_ID, Addr, Oids).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:sync_get2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 sync_get(Addr, Port, Oids) ->
-    snmpm:g(?USER_ID, Addr, Port, Oids).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:sync_get2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 async_get(Addr, Oids) ->
-    snmpm:ag(?USER_ID, Addr, Oids).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:async_get2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 async_get(Addr, Port, Oids) ->
-    snmpm:ag(?USER_ID, Addr, Port, Oids).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:async_get2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 sync_get_next(Addr, Oids) ->
-    snmpm:gn(?USER_ID, Addr, Oids).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:sync_get_next2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 sync_get_next(Addr, Port, Oids) ->
-    snmpm:gn(?USER_ID, Addr, Port, Oids).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:sync_get_next2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 async_get_next(Addr, Oids) ->
-    snmpm:agn(?USER_ID, Addr, Oids).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:async_get_next2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 async_get_next(Addr, Port, Oids) ->
-    snmpm:agn(?USER_ID, Addr, Port, Oids).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:async_get_next2(?USER_ID, TargetName, Oids);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 sync_set(Addr, VAV) ->
-    snmpm:s(?USER_ID, Addr, VAV).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:sync_set2(?USER_ID, TargetName, VAV);
+	Error ->
+	    Error
+    end.
 
 sync_set(Addr, Port, VAV) ->
-    snmpm:s(?USER_ID, Addr, Port, VAV).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:sync_set2(?USER_ID, TargetName, VAV);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 async_set(Addr, VAV) ->
-    snmpm:as(?USER_ID, Addr, VAV).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:async_set2(?USER_ID, TargetName, VAV);
+	Error ->
+	    Error
+    end.
 
 async_set(Addr, Port, VAV) ->
-    snmpm:as(?USER_ID, Addr, Port, VAV).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:async_set2(?USER_ID, TargetName, VAV);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 sync_get_bulk(Addr, NonRep, MaxRep, Oids) ->
-    snmpm:gb(?USER_ID, Addr, NonRep, MaxRep, Oids).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:sync_get_bulk2(?USER_ID, TargetName, NonRep, MaxRep, Oids);
+	Error ->
+	    Error
+    end.
 
 sync_get_bulk(Addr, Port, NonRep, MaxRep, Oids) ->
-    snmpm:gb(?USER_ID, Addr, Port, NonRep, MaxRep, Oids).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:sync_get_bulk2(?USER_ID, TargetName, NonRep, MaxRep, Oids);
+	Error ->
+	    Error
+    end.
 
 
 %% --
 
 async_get_bulk(Addr, NonRep, MaxRep, Oids) ->
-    snmpm:agb(?USER_ID, Addr, NonRep, MaxRep, Oids).
+    case snmpm:target_name(Addr) of
+	{ok, TargetName} ->
+	    snmpm:async_get_bulk2(?USER_ID, TargetName, NonRep, MaxRep, Oids);
+	Error ->
+	    Error
+    end.
 
 async_get_bulk(Addr, Port, NonRep, MaxRep, Oids) ->
-    snmpm:agb(?USER_ID, Addr, Port, NonRep, MaxRep, Oids).
+    case snmpm:target_name(Addr, Port) of
+	{ok, TargetName} ->
+	    snmpm:async_get_bulk2(?USER_ID, TargetName, NonRep, MaxRep, Oids);
+	Error ->
+	    Error
+    end.
 
 
 %% -- 
diff --git a/lib/snmp/test/snmp_manager_user_test.erl b/lib/snmp/test/snmp_manager_user_test.erl
index fefa1ad713..41d5c50b19 100644
--- a/lib/snmp/test/snmp_manager_user_test.erl
+++ b/lib/snmp/test/snmp_manager_user_test.erl
@@ -36,7 +36,7 @@
 %% -compile(export_all).
 
 -export([
-all/0,groups/0,init_per_group/2,end_per_group/2,
+	 all/0,groups/0,init_per_group/2,end_per_group/2,
          init_per_testcase/2, end_per_testcase/2,
 	 
 	 
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index e327456bc4..f0abae73e8 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -324,7 +324,7 @@ fail(Reason, Mod, Line) ->
 skip(Reason, Module, Line) ->
     String = lists:flatten(io_lib:format("Skipping ~p(~p): ~p~n", 
 					 [Module, Line, Reason])),
-    exit({skipped, String}).
+    exit({skip, String}).
     
 
 %% ----------------------------------------------------------------
diff --git a/lib/snmp/test/snmp_test_manager.erl b/lib/snmp/test/snmp_test_manager.erl
index 4cc6d36acc..0df2350d58 100644
--- a/lib/snmp/test/snmp_test_manager.erl
+++ b/lib/snmp/test/snmp_test_manager.erl
@@ -43,7 +43,7 @@
 %% Manager callback API:
 -export([
 	 handle_error/3,
-         handle_agent/4,
+         handle_agent/5,
          handle_pdu/4,
          handle_trap/3,
          handle_inform/3,
@@ -239,7 +239,7 @@ handle_info({snmp_error, ReqId, Reason},
     P ! {snmp_error, ReqId, Reason}, 
     {noreply, State};
 
-handle_info({snmp_agent, Addr, Port, Info, Pid}, 
+handle_info({snmp_agent, Addr, Port, Info, Pid, _UserData}, 
 	    #state{parent = P} = State) ->
     error_msg("detected new agent: "
 	      "~n   Addr: ~w"
@@ -326,8 +326,8 @@ handle_error(ReqId, Reason, Pid) ->
     ignore.
 
 
-handle_agent(Addr, Port, SnmpInfo, Pid) ->
-    Pid ! {snmp_agent, Addr, Port, SnmpInfo, self()},
+handle_agent(Addr, Port, SnmpInfo, Pid, UserData) ->
+    Pid ! {snmp_agent, Addr, Port, SnmpInfo, self(), UserData},
     receive
 	{snmp_agent_reply, Reply, Pid} ->
 	    Reply
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index b90dbe4eef..8145e415f3 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.22.1
+SNMP_VSN    = 4.23
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/html/SSH_protocols.png b/lib/ssh/doc/html/SSH_protocols.png
new file mode 100644
index 0000000000..145c96c4cd
--- /dev/null
+++ b/lib/ssh/doc/html/SSH_protocols.png
diff --git a/lib/ssh/doc/man6/.gitignore b/lib/ssh/doc/man6/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lib/ssh/doc/man6/.gitignore
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index da99c4ea0f..0e79d9979f 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -37,21 +37,30 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	ssh.xml \
+XML_REF3_FILES = ssh.xml \
 	ssh_channel.xml \
-	ssh_connection.xml\
+	ssh_connection.xml \
+	ssh_client_key_api.xml \
+	ssh_server_key_api.xml \
 	ssh_sftp.xml \
 	ssh_sftpd.xml \
 
-XML_PART_FILES = part_notes.xml
-XML_CHAPTER_FILES = notes.xml
+XML_REF6_FILES = ssh_app.xml
+
+XML_PART_FILES = part_notes.xml \
+		 usersguide.xml
+XML_CHAPTER_FILES = notes.xml \
+	introduction.xml \
+	ssh_protocol.xml \
+	using_ssh.xml
 
 BOOK_FILES = book.xml
 
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
+XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES)  $(XML_REF6_FILES)\
             $(XML_PART_FILES) $(XML_CHAPTER_FILES) 
 
+IMAGE_FILES = SSH_protocols.png
+
 # ----------------------------------------------------
 
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
@@ -62,10 +71,12 @@ EXTRA_FILES = \
 	$(DEFAULT_GIF_FILES) \
 	$(DEFAULT_HTML_FILES) \
 	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
+        $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html) \
 	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
 
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
+MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
@@ -80,16 +91,19 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
+$(HTMLDIR)/%.png: %.png
 	$(INSTALL_DATA) $< $@
 
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
+images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
+
 pdf: $(TOP_PDF_FILE)
 
-html: $(HTML_REF_MAN_FILE)
+html: images $(HTML_REF_MAN_FILE)
+
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
@@ -97,7 +111,7 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-man: $(MAN3_FILES)
+man: $(MAN3_FILES) $(MAN6_FILES)
 
 
 debug opt: 
@@ -117,5 +131,8 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
+	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
+
 
 release_spec:
diff --git a/lib/ssh/doc/src/SSH_protocols.png b/lib/ssh/doc/src/SSH_protocols.png
new file mode 100644
index 0000000000..145c96c4cd
--- /dev/null
+++ b/lib/ssh/doc/src/SSH_protocols.png
diff --git a/lib/ssh/doc/src/book.xml b/lib/ssh/doc/src/book.xml
index fcec1d6f70..3c2375f96d 100644
--- a/lib/ssh/doc/src/book.xml
+++ b/lib/ssh/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2005</year><year>2010</year>
+      <year>2005</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,6 +34,9 @@
   <preamble>
     <contents level="2"></contents>
   </preamble>
+  <parts lift="yes">
+    <xi:include href="usersguide.xml"/>
+  </parts>
   <applications>
     <xi:include href="ref_man.xml"/>
   </applications>
diff --git a/lib/ssh/doc/src/fascicules.xml b/lib/ssh/doc/src/fascicules.xml
index 43090b4aed..069d9002e0 100644
--- a/lib/ssh/doc/src/fascicules.xml
+++ b/lib/ssh/doc/src/fascicules.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
+  <fascicule file="usersguide" href="usersguide_frame.html" entry="no">
+    User's Guide
+  </fascicule>
   <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
     Reference Manual
   </fascicule>
diff --git a/lib/ssh/doc/src/introduction.xml b/lib/ssh/doc/src/introduction.xml
new file mode 100644
index 0000000000..aac8de0f76
--- /dev/null
+++ b/lib/ssh/doc/src/introduction.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2012</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>Introduction</title>
+    <prepared>OTP team</prepared>
+    <file>introduction.xml</file>
+  </header>
+
+  <section>
+    <title>Purpose</title>
+
+    <p>Secure Shell (SSH) is a protocol for secure remote login and
+    other secure network services over an insecure network. SSH
+    provides a single, full-duplex, byte-oriented connection between
+    client and server. The protocol also provides privacy, integrity,
+    server authentication and man-in-the-middle protection.</p>
+
+    <p>The Erlang SSH application is an implementation of the SSH
+    protocol in Erlang which offers API functions to write customized
+    SSH clients and servers as well as making the Erlang shell
+    available via SSH. Also included in the SSH application are an
+    SFTP (SSH File Transfer Protocol) client <seealso
+    marker="ssh_sftp">ssh_sftp</seealso> and server <seealso
+    marker="ssh_sftp">ssh_sftpd</seealso>.</p>
+  </section>
+
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the concepts of <seealso marker="doc/design_principals:users_guide">OTP</seealso>
+    and has a basic understanding of <url href="http://en.wikipedia.org/wiki/Public-key_cryptography">public keys</url>.</p>
+  </section>
+
+</chapter>
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index d4acb2ef1a..e58d4e2c36 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.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>
@@ -780,7 +780,7 @@
       <list>
         <item>
           <p>
-            Ssh timeouts will now behave as expected e.i. defaults to
+            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>
           <p>
@@ -833,7 +833,7 @@
 	caused the ssh daemon to close the connections to all
 	currently logged in users if one user logged out. Another
 	problem related to the supervision tree caused the closing
-	down of clients to leak processes e.i. all processes was
+	down of clients to leak processes i.e. all processes was
       not shutdown correctly.</p>
       <p>
       Own Id: OTP-7676</p>
@@ -925,7 +925,7 @@
 	slightly changes the options to the API function
 	ssh:daemon/[1,2,3] deprecating all no longer documented
 	options. Note that the new API enforces the "logical way"
-	of using the old API e.i. making the subsystem process
+	of using the old API i.e. making the subsystem process
 	part of the ssh applications supervisor tree, so missuses
       of the old API are not compatible with the new API.</p>
       <p>
diff --git a/lib/ssh/doc/src/ref_man.xml b/lib/ssh/doc/src/ref_man.xml
index 9ab56b28ec..88203b5034 100644
--- a/lib/ssh/doc/src/ref_man.xml
+++ b/lib/ssh/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?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">
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,19 +22,22 @@
     </legalnotice>
 
     <title>SSH Reference Manual</title>
-    <prepared>Jakob Cederlund</prepared>
-    <docno></docno>
+    <prepared>OTP</prepared>
     <date>2007-10-06</date>
     <rev>%VSN%</rev>
-    <file>application.sgml</file>
+    <file>ref_man.xml</file>
   </header>
   <description>
     <p>The SSH application is an erlang implementation of the
-      secure shell protocol.</p>
+      secure shell protocol (SSH) as defined by RFC 4250 - 4254</p>
+
   </description>
+  <xi:include href="ssh_app.xml"/>
   <xi:include href="ssh.xml"/>
   <xi:include href="ssh_channel.xml"/>
   <xi:include href="ssh_connection.xml"/>
+  <xi:include href="ssh_client_key_api.xml"/>
+  <xi:include href="ssh_server_key_api.xml"/>
   <xi:include href="ssh_sftp.xml"/>
   <xi:include href="ssh_sftpd.xml"/>
 </application>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 04b7a2ae56..7f7d887d5e 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -22,13 +22,7 @@
     </legalnotice>
     
     <title>ssh</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible>H&aring;kan Mattsson</responsible>
-    <docno></docno>
-    <approved>H&aring;kan Mattsson</approved>
-    <checked></checked>
     <date>2007-10-06</date>
-    <rev>PA1</rev>
   </header>
   <module>ssh</module>
   <modulesummary>Main API of the SSH application</modulesummary>
@@ -40,80 +34,85 @@
     <title>SSH</title>
 
     <list type="bulleted">
-      <item>ssh requires the crypto and public_key applications.</item>
-      <item>Supported SSH-version is 2.0 </item>
-      <item>Currently supports only a minimum of mac and encryption algorithms i.e.
-      hmac-sha1, and aes128-cb and 3des-cbc.</item>
+      <item>SSH requires the crypto and public_key applications.</item>
+      <item>Supported SSH version is 2.0 </item>
+      <item>Supported MAC algorithms: hmac-sha1</item>
+      <item>Supported encryption algorithms: aes128-cb and 3des-cbc</item>
     </list>
  
   </section>
   
   <section>
-    <title>COMMON DATA TYPES </title>
+    <title>DATA TYPES </title>
     <p>Type definitions that are used more than once in
-    this module:</p>
+    this module and/or abstractions to indicate the intended use of the data
+    type:</p>
     <p><c>boolean() = true | false </c></p>
-    <p><c>string() = list of ASCII characters</c></p>
+    <p><c>string() = [byte()]</c></p>
     <p><c>ssh_daemon_ref() - opaque to the user
     returned by ssh:daemon/[1,2,3]</c></p>
     <p><c>ssh_connection_ref() - opaque to the user
     returned by ssh:connect/3</c></p>
     <p><c>ip_address() - {N1,N2,N3,N4} % IPv4 |
     {K1,K2,K3,K4,K5,K6,K7,K8} % IPv6</c></p>
-    <p><c>subsystem_spec() = {subsystem_name(), {channel_callback(), channel_init_args()}} </c></p>  
+    <p><c>subsystem_spec() = {subsystem_name(),
+    {channel_callback(), channel_init_args()}} </c></p>
     <p><c>subsystem_name() = string() </c></p>
     <p><c>channel_callback() = atom() - Name of the erlang module
     implementing the subsystem using the ssh_channel behavior see</c>
     <seealso marker="ssh_channel">ssh_channel(3)</seealso></p>
     <p><c>channel_init_args() = list()</c></p>
  </section>
-  
+
  <funcs>
    
    <func>
      <name>close(ConnectionRef) -> ok </name>
-      <fsummary>Closes a ssh connection</fsummary>
+      <fsummary>Closes an SSH connection</fsummary>
       <type>
 	<v>ConnectionRef = ssh_connection_ref()</v>
       </type>
-      <desc><p>Closes a ssh connection.</p> 
+      <desc><p>Closes an SSH connection.</p>
       </desc>
     </func>
     
     <func>
       <name>connect(Host, Port, Options) -> </name>
-      <name>connect(Host, Port, Options, Timeout) -> {ok, ssh_connection_ref()}
-      | {error, Reason}</name>
+      <name>connect(Host, Port, Options, Timeout) -> {ok,
+      ssh_connection_ref()} | {error, Reason}</name>
       <fsummary>Connect to an ssh server.</fsummary>
       <type>
         <v>Host = string()</v>
 	<v>Port = integer()</v>
-	<d>The default is <c><![CDATA[22]]></c>, the registered port for SSH.</d>
+	<d>The default is <c><![CDATA[22]]></c>, the assigned well known port
+	number for SSH.</d>
 	<v>Options = [{Option, Value}]</v>
 	<v>Timeout = infinity | integer(milliseconds)</v>
       </type>
       <desc>
-	<p>Connects to an SSH server. No channel is started this is done
+	<p>Connects to an SSH server. No channel is started. This is done
 	by calling ssh_connect:session_channel/2.</p>
 	<p>Options are:</p>
 	<taglist>
           <tag><c><![CDATA[{user_dir, string()}]]></c></tag>
 	  <item>
-	    <p>Sets the user directory e.i. the directory containing
+	    <p>Sets the user directory i.e. the directory containing
 	    ssh configuration files for the user such as
-	    <c><![CDATA[known_hosts]]></c>, <c><![CDATA[id_rsa, id_dsa]]></c> and
-	    <c><![CDATA[authorized_key]]></c>. Defaults to the directory normally
-	    referred to as <c><![CDATA[~/.ssh]]></c> </p>
+	    <c><![CDATA[known_hosts]]></c>, <c><![CDATA[id_rsa,
+	    id_dsa]]></c> and
+	    <c><![CDATA[authorized_key]]></c>. Defaults to the
+	    directory normally referred to as
+	    <c><![CDATA[~/.ssh]]></c> </p>
 	  </item>
 	  <tag><c><![CDATA[{dsa_pass_phrase, string()}]]></c></tag>
 	  <item>
-	    <p>If the user dsa key is protected by a pass phrase it can be
+	    <p>If the user dsa key is protected by a passphrase it can be
 	    supplied with this option.
 	    </p>
 	  </item>
 	  <tag><c><![CDATA[{rsa_pass_phrase, string()}]]></c></tag>
 	  <item>
-	    <p>If the user rsa key is protected by a pass phrase it can be
+	    <p>If the user rsa key is protected by a passphrase it can be
 	    supplied with this option.
 	    </p>
 	  </item>
@@ -135,25 +134,26 @@
 	    password. Do note that it may not always be desirable to use
 	    those options from a security point of view.</p>
 	  </item>
-	  <tag><c><![CDATA[{public_key_alg, ssh_rsa | ssh_dsa}]]></c></tag>
+	  <tag><c><![CDATA[{public_key_alg, 'ssh-rsa' | 'ssh-dss'}]]></c></tag>
 	  <item>
             <p>Sets the preferred public key algorithm to use for user
-	    authentication. If the the preferred algorithm fails of
+	    authentication. If the the preferred algorithm fails for
 	    some reason, the other algorithm is tried. The  default is
 	    to try <c><![CDATA[ssh_rsa]]></c> first.</p>
 	  </item>
 	  <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
 	  <item>
-            <p>List of public key algorithms to try to use, ssh_rsa and ssh_dsa available. 
-	    Will override <c><![CDATA[{public_key_alg, ssh_rsa | ssh_dsa}]]></c></p>
+            <p>List of public key algorithms to try to use, 'ssh-rsa' and 'ssh-dss' available. 
+	    Will override <c><![CDATA[{public_key_alg, 'ssh-rsa' | 'ssh-dss'}]]></c></p>
 	  </item>
 	  <tag><c><![CDATA[{connect_timeout, timeout()}]]></c></tag>
 	  <item>
-	    <p>Sets a timeout on the transport layer connection. Defaults to infinity.</p>
+	    <p>Sets a timeout on the transport layer
+	    connection. Defaults to <c>infinity</c>.</p>
 	  </item>
-	  <tag><c><![CDATA[{user, String}]]></c></tag>
+	  <tag><c><![CDATA[{user, string()}]]></c></tag>
           <item>
-	    <p>Provide a user name. If this option is not given, ssh
+	    <p>Provides a user name. If this option is not given, ssh
 	    reads from the environment (<c><![CDATA[LOGNAME]]></c> or
 	    <c><![CDATA[USER]]></c> on unix,
 	    <c><![CDATA[USERNAME]]></c> on Windows).</p>
@@ -165,23 +165,11 @@
 	    password if the password authentication method is
 	    attempted.</p>
           </item>
-          <tag><c><![CDATA[{user_auth, Fun/3}]]></c></tag>
-          <item>
-	    <p>Provide a fun for password authentication. The fun
-	    will be called as <c><![CDATA[fun(User, Password, Opts)]]></c> and
-	    should return <c><![CDATA[true]]></c> or <c><![CDATA[false]]></c>.</p>
-	  </item>
-	  <tag><c><![CDATA[{key_cb, atom() = KeyCallbackModule}]]></c></tag>
+	  <tag><c><![CDATA[{key_cb, atom()}]]></c></tag>
 	  <item>
-	    <p>Provide a special call-back module for key handling.
-	    The call-back module should be modeled after the
-	    <c><![CDATA[ssh_file]]></c> module. The functions that must
-	    be exported are:
-	    <c><![CDATA[private_host_rsa_key/2]]></c>,
-	    <c><![CDATA[private_host_dsa_key/2]]></c>,
-	    <c><![CDATA[lookup_host_key/3]]></c> and
-	    <c><![CDATA[add_host_key/3]]></c>. This is considered
-	    somewhat experimental and will be better documented later on.</p>
+	    <p>Module implementing the behaviour <seealso marker="ssh_client_key_api">ssh_client_key_api</seealso>.
+	    Can be used to customize the handling of public keys.
+	    </p>
 	  </item>
 	  <tag><c><![CDATA[{quiet_mode, atom() = boolean()}]]></c></tag>
 	  <item>
@@ -189,20 +177,27 @@
 	  </item>
 	  <tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag>
 	  <item>
-	    <p>Allow an existing file-descriptor to be used
+	    <p>Allow an existing file descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
-	  <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+	  <tag><c><![CDATA[{ipv6_disabled, boolean()}]]></c></tag>
 	  <item>
-	  <p>Determines if SSH shall use IPv6 or not.</p></item>
-	  <tag><c><![CDATA[{idle_time, timeout()}]]></c></tag>
+	    <p>Determines if SSH shall use IPv6 or not.</p>
+	  </item>
+	  <tag><c><![CDATA[{rekey_limit, integer()}]]></c></tag>
+	  <item>
+	    <p>Provide, in bytes, when rekeying should be initiated, 
+	    defaults to one time each GB and one time per hour.</p>
+	  </item>
+	  <tag><c><![CDATA[{idle_time, integer()}]]></c></tag>
 	  <item>
-	  <p>Sets a timeout on connection when no channels are active, default is infinity</p></item>
+ 	  <p>Sets a timeout on connection when no channels are active, default is infinity</p></item>
 	</taglist>
       </desc>   
     </func>
 
     <func>
-      <name>connection_info(ConnectionRef, [Option]) ->[{Option, Value}] </name>
+      <name>connection_info(ConnectionRef, [Option]) ->[{Option,
+      Value}] </name>
       <fsummary> Retrieves information about a connection. </fsummary>
       <type>
         <v>Option = client_version | server_version | peer</v>
@@ -217,7 +212,8 @@
     <func>
       <name>daemon(Port) -> </name>
       <name>daemon(Port, Options) -> </name>
-      <name>daemon(HostAddress, Port, Options) -> ssh_daemon_ref()</name>
+      <name>daemon(HostAddress, Port, Options) -> {ok,
+      ssh_daemon_ref()} | {error, atom()}</name>
       <fsummary>Starts a server listening for SSH connections 
       on the given port.</fsummary>
       <type>
@@ -228,30 +224,32 @@
 	<v>Value = term()</v>
       </type>
       <desc>
-        <p>Starts a server listening for SSH connections on the given port.</p>
-      
-        <p>Options are:</p>
+        <p>Starts a server listening for SSH connections on the given
+        port.</p>
+	<p>Options are:</p>
         <taglist>
 	  <tag><c><![CDATA[{subsystems, [subsystem_spec()]]]></c></tag>
 	  <item>
-	    Provides specifications for handling of subsystems.  The
-	    "sftp" subsystem-spec can be retrieved by calling
-	    ssh_sftpd:subsystem_spec/1. If the subsystems option in not present
-	    the value of <c>[ssh_sftpd:subsystem_spec([])]</c> will be used.
-	    It is of course possible to set the option to the empty list
-	    if you do not want the daemon to run any subsystems at all.
+	    Provides specifications for handling of subsystems. The
+	    "sftp" subsystem spec can be retrieved by calling
+	    ssh_sftpd:subsystem_spec/1. If the subsystems option in
+	    not present the value of
+	    <c>[ssh_sftpd:subsystem_spec([])]</c> will be used.  It is
+	    of course possible to set the option to the empty list if
+	    you do not want the daemon to run any subsystems at all.
 	  </item>
-	  <tag><c><![CDATA[{shell, {Module, Function, Args} | fun(string() = User) - > pid() |
-	  fun(string() = User, ip_address() = PeerAddr) -> pid()}]]></c></tag>
+	  <tag><c><![CDATA[{shell, {Module, Function, Args} |
+	  fun(string() = User) - > pid() | fun(string() = User,
+	  ip_address() = PeerAddr) -> pid()}]]></c></tag>
 	  <item>
-	    Defines the read-eval-print loop used when a shell is requested
-	    by the client. Example use the
-	    erlang shell: <c><![CDATA[{shell, start, []}]]></c> which is
-	    the default behavior.
+	    Defines the read-eval-print loop used when a shell is
+	    requested by the client. Default is to use the erlang shell:
+	    <c><![CDATA[{shell, start, []}]]></c>
 	  </item>
-	  <tag><c><![CDATA[{ssh_cli,{channel_callback(), channel_init_args()}}]]></c></tag>
+	  <tag><c><![CDATA[{ssh_cli,{channel_callback(),
+	  channel_init_args()}}]]></c></tag>
 	  <item>
-	    Provide your own cli implementation, e.i. a channel callback
+	    Provides your own cli implementation, i.e. a channel callback
 	    module that implements a shell and command execution. Note
 	    that you may customize the shell read-eval-print loop using the
 	    option <c>shell</c> which is much less work than implementing
@@ -259,27 +257,30 @@
 	  </item>
 	  <tag><c><![CDATA[{user_dir, String}]]></c></tag>
 	  <item>
-	    <p>Sets the user directory e.i. the directory containing
+	    <p>Sets the user directory i.e. the directory containing
 	    ssh configuration files for the user such as
-	    <c><![CDATA[known_hosts]]></c>, <c><![CDATA[id_rsa, id_dsa]]></c> and
-	    <c><![CDATA[authorized_key]]></c>. Defaults to the directory normally
-	    referred to as <c><![CDATA[~/.ssh]]></c> </p>
+	    <c><![CDATA[known_hosts]]></c>, <c><![CDATA[id_rsa,
+	    id_dsa]]></c> and
+	    <c><![CDATA[authorized_key]]></c>. Defaults to the
+	    directory normally referred to as
+	    <c><![CDATA[~/.ssh]]></c> </p>
 	  </item>
           <tag><c><![CDATA[{system_dir, string()}]]></c></tag>
           <item>
-            <p>Sets the system directory, containing the host files
-            that identifies the host for ssh. The default is
-            <c><![CDATA[/etc/ssh]]></c>, note that SSH normally
-            requires the host files there to be readable only by
-	    root.</p>
+            <p>Sets the system directory, containing the host key files
+            that identifies the host keys for ssh. The default is
+            <c><![CDATA[/etc/ssh]]></c>, note that for security reasons
+            this directory is normally only accessible by the root user.</p>
 	  </item>
 	  <tag><c><![CDATA[{auth_methods, string()}]]></c></tag>
 	  <item>
-	    <p>Comma separated string that determines which authentication methodes that the server
-	    should support and in what order they will be tried. Defaults to
+	    <p>Comma separated string that determines which
+	    authentication methodes that the server should support and
+	    in what order they will be tried. Defaults to
 	    <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p>
           </item>
-	  <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag>
+	  <tag><c><![CDATA[{user_passwords, [{string() = User,
+	  string() = Password}]}]]></c></tag>
 	  <item>
             <p>Provide passwords for password authentication.They will
 	    be used when someone tries to connect to the server and
@@ -293,13 +294,19 @@
               user. From a security perspective this option makes
 	      the server very vulnerable.</p>
 	  </item>
-	  <tag><c><![CDATA[{pwdfun, fun/2}]]></c></tag>
+	  <tag><c><![CDATA[{pwdfun, fun(User::string(), password::string() -> boolean()}]]></c></tag>
 	  <item>
 	    <p>Provide a function for password validation. This is called
 	      with user and password as strings, and should return
 	      <c><![CDATA[true]]></c> if the password is valid and
 	      <c><![CDATA[false]]></c> otherwise.</p>
 	  </item>
+	  <tag><c><![CDATA[{key_cb, atom()}]]></c></tag>
+	  <item>
+	    <p>Module implementing the behaviour <seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>.
+	    Can be used to customize the handling of public keys.
+	    </p>
+	  </item>
 	  <tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag>
 	  <item>
 	    <p>Allow an existing file-descriptor to be used
@@ -335,9 +342,9 @@
 	<v> Options - see ssh:connect/3</v>
       </type>
       <desc>
-        <p>Starts an interactive shell to an SSH server on the
+        <p>Starts an interactive shell via an SSH server on the
 	given <c>Host</c>. The function waits for user input,
-	and will not return until the remote shell is ended (e.g. on
+	and will not return until the remote shell is ended (i.e.
 	exit from the shell).
 	</p>
       </desc>
@@ -346,25 +353,24 @@
     <func>
       <name>start() -> </name>
       <name>start(Type) -> ok | {error, Reason}</name>
-      <fsummary>Starts the Ssh application. </fsummary>
+      <fsummary>Starts the SSH application. </fsummary>
       <type>
         <v>Type =  permanent | transient | temporary</v>
 	<v>Reason = term() </v>
       </type>
       <desc>
-        <p>Starts the Ssh application. Default type
-          is temporary. See also
-          <seealso marker="kernel:application">application(3)</seealso>
-	  Requires that the crypto application has been started.
+        <p>Utility function that starts crypto, public_key and the SSH
+	application. Defult type is temporary.
+	See also <seealso marker="kernel:application">application(3)</seealso>
 	</p>
       </desc>
     </func>
 
     <func>
       <name>stop() -> ok </name>
-      <fsummary>Stops the Ssh application.</fsummary>
+      <fsummary>Stops the SSH application.</fsummary>
       <desc>
-        <p>Stops the Ssh application. See also
+        <p>Stops the SSH application. See also
           <seealso marker="kernel:application">application(3)</seealso></p>
       </desc>
     </func>
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml
new file mode 100644
index 0000000000..c01f44936a
--- /dev/null
+++ b/lib/ssh/doc/src/ssh_app.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE appref SYSTEM "appref.dtd">
+
+<appref>
+  <header>
+    <copyright>
+      <year>2012</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>SSH</title>
+    <file>ssh_app.xml</file>
+  </header>
+  <app>SSH</app>
+  <appsummary>The ssh application implements the SSH (Secure Shell) protocol and
+  provides an SFTP (SSH File Transfer Protocol) client and server. </appsummary>
+
+  <section>
+    <title>DEPENDENCIES</title>
+    <p>The ssh application uses the Erlang applications public_key and
+    crypto to handle public keys and encryption, hence these
+    applications needs to be loaded for the ssh application to work. In
+    an embedded environment that means they need to be started with
+    application:start/[1,2] before the ssh application is started.
+    </p>
+  </section>
+
+  <section>
+    <title>CONFIGURATION</title>
+
+    <p>The ssh application does not currently have an application
+    specific configuration file as described in application(3),
+    however it will by default use the following configuration files
+    from openssh: known_hosts, authorized_keys, authorized_keys2,
+    id_dsa and id_rsa, ssh_host_dsa_key and ssh_host_rsa_key.  By
+    default Erlang SSH will look for id_dsa, id_rsa, known_hosts
+    and authorized_keys in ~/.ssh, and the host key files in /etc/ssh
+    . These locations may be changed by the options user_dir and
+    system_dir.  Public key handling may also be customized by
+    providing a callback module implementing the behaviors
+    <seealso marker="ssh_client_key_api">ssh_client_key_api</seealso> and
+    <seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>.
+    </p>
+
+    <section>
+      <title>PUBLIC KEYS</title>
+      <p>
+	id_dsa and id_rsa are the users private key files, note that
+	the public key is part of the private key so the ssh
+	application will not use the id_&lt;*>.pub files. These are
+	for the users convenience when he/she needs to convey their
+	public key.
+      </p>
+    </section>
+
+    <section>
+      <title>KNOW HOSTS</title>
+      <p>The known_hosts file contains a list of approved servers and
+      their public keys.  Once a server is listed, it can be verified
+      without user interaction.
+      </p>
+     </section>
+
+     <section>
+      <title>AUTHORIZED KEYS</title>
+      <p>The authorized key file keeps track of the user's authorized
+      public keys. The most common use of this file is to let users
+      log in without entering their password which is supported by the
+      Erlang SSH daemon.
+      </p>
+     </section>
+
+     <section>
+       <title>HOST KEYS</title>
+       <p>Currently rsa and dsa host keys are supported and are
+       expected to be found in files named ssh_host_rsa_key and
+       ssh_host_dsa_key.
+       </p>
+     </section>
+  </section>
+
+  <section>
+    <title>SEE ALSO</title>
+    <p>application(3)</p>
+  </section>
+
+</appref>
diff --git a/lib/ssh/doc/src/ssh_channel.xml b/lib/ssh/doc/src/ssh_channel.xml
index c2b7aa94a5..f0083ae8d1 100644
--- a/lib/ssh/doc/src/ssh_channel.xml
+++ b/lib/ssh/doc/src/ssh_channel.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2009</year>
-      <year>2009</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -22,31 +22,35 @@
 
       The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
-
     <title>ssh_channel</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
   </header>
   <module>ssh_channel</module>
-  <modulesummary>Generic Ssh Channel Behavior
+  <modulesummary>-behaviour(ssh_channel).
   </modulesummary>
   <description>
-    <p>Ssh services are implemented as channels that are multiplexed
-    over an ssh connection and communicates via the ssh connection
-    protocol.  This module provides a callback API that takes care of
-    generic channel aspects such as flow control and close messages
-    and lets the callback functions take care of the service specific
-    parts.
+    <p>SSH services (clients and servers) are implemented as channels
+    that are multiplexed over an SSH connection and communicates via
+    the <url href="http://www.ietf.org/rfc/rfc4254.txt"> SSH
+    Connection Protocol </url>.  This module provides a callback API
+    that takes care of generic channel aspects such as flow control
+    and close messages and lets the callback functions take care of
+    the service (application) specific parts. This behavior also ensures
+    that the channel process honors the principal of an OTP-process so
+    that it can be part of a supervisor tree. This is a requirement of
+    channel processes implementing a subsystem that will be added to
+    the SSH applications supervisor tree.
     </p>
+
+    <note> When implementing a SSH subsystem use the
+    <c>-behaviour(ssh_subsystem).</c> instead of  <c>-behaviour(ssh_channel).</c>
+    as the only relevant callback functions for subsystems are
+    init/1, handle_ssh_msg/2, handle_msg/2 and terminate/2, so the ssh_subsystem
+    behaviour is limited version of the ssh_channel behaviour.
+    </note>
   </description>
 
   <section>
-    <title>COMMON DATA TYPES </title>
+    <title>DATA TYPES </title>
 
     <p>Type definitions that are used more than once in this module
     and/or abstractions to indicate the intended use of the data
@@ -56,10 +60,10 @@
     <p><c>string() = list of ASCII characters</c></p>
     <p><c>timeout() =  infinity | integer() - in milliseconds.</c></p>
     <p><c>ssh_connection_ref() - opaque to the user returned by
-    ssh:connect/3 or sent to a ssh channel process</c></p>
+    ssh:connect/3 or sent to an SSH channel process</c></p>
     <p><c>ssh_channel_id() = integer() </c></p>
     <p><c>ssh_data_type_code() = 1 ("stderr") | 0 ("normal") are
-    currently valid values see RFC 4254 section 5.2.</c></p>
+    currently valid values see <url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254  </url> section 5.2.</c></p>
   </section>
 
   <funcs>
@@ -74,13 +78,15 @@
 	<v>Timeout = timeout() </v>
 	<v>Reply = term() </v>
 	<v>Reason = closed | timeout </v>
+
       </type>
       <desc>
 	<p>Makes a synchronous call to the channel process by sending
 	a message and waiting until a reply arrives or a timeout
-	occurs. The channel will call
-	<c>CallbackModule:handle_call/3</c> to handle the message.
-	If the channel process does not exist <c>{error, closed}</c> is returned.
+	occurs. The channel will call <seealso mark =
+	"#Module:handle_call-3">Module:handle_call/3</seealso>
+	to handle the message.  If the channel process does not exist
+	<c>{error, closed}</c> is returned.
 	</p>
       </desc>
     </func>
@@ -98,26 +104,27 @@
 	<p>Sends an asynchronous message to the channel process and
 	returns ok immediately, ignoring if the destination node or
 	channel process does not exist. The channel will call
-	<c>CallbackModule:handle_cast/2</c> to handle the message.
+	<seealso mark = "#Module:handle_cast-3">Module:handle_cast/2</seealso>
+	 to handle the message.
 	</p>
       </desc>
     </func>
 
        <func>
       <name>enter_loop(State) -> _ </name>
-      <fsummary> Makes an existing process into a ssh_channel process. </fsummary>
+      <fsummary> Makes an existing process an ssh_channel process. </fsummary>
       <type>
-	<v> State = term() - as returned by  ssh_channel:init/1</v>
+	<v> State = term() - as returned by <seealso mark = "#init-1">ssh_channel:init/1</seealso></v>
       </type>
       <desc>
-	<p> Makes an existing process into a <c>ssh_channel</c>
+	<p> Makes an existing process an <c>ssh_channel</c>
 	process. Does not return, instead the calling process will
-	enter the <c>ssh_channel</c> process receive loop and become a
+	enter the <c>ssh_channel</c> process receive loop and become an
 	<c>ssh_channel process.</c> The process must have been started using
 	one of the start functions in proc_lib, see <seealso
 	marker="stdlib:proc_lib">proc_lib(3)</seealso>. The
 	user is responsible for any initialization of the process
-	and needs to call ssh_channel:init/1.
+	and needs to call <seealso mark = "#init-1">ssh_channel:init/1</seealso>
 	</p>
       </desc>
     </func>
@@ -126,7 +133,10 @@
       <name>init(Options) -> {ok, State} |  {ok, State, Timeout} | {stop, Reason} </name>
       <fsummary> Initiates a ssh_channel process.</fsummary>
       <type>
-	<v> Options = [{Option, Value}]</v>
+	<v>Options = [{Option, Value}]</v>
+	<v>State = term()</v>
+	<v>Timeout = timeout() </v>
+	<v>Reason = term() </v>
       </type>
       <desc>
 	<p>
@@ -134,24 +144,27 @@
 	</p>
 	  <taglist>
 	  <tag><c><![CDATA[{channel_cb, atom()}]]></c></tag>
-	  <item>The module that implements the channel behavior.</item>
+	  <item>The module that implements the channel behaviour.</item>
 	  
 	  <tag><c><![CDATA[{init_args(), list()}]]></c></tag>
-	  <item> The list of arguments to the callback modules
+	  <item> The list of arguments to the callback module's
 	  init function.</item>
 
 	  <tag><c><![CDATA[{cm, connection_ref()}]]></c></tag>
-	  <item> Reference to the ssh connection.</item>
+	  <item> Reference to the ssh connection as returned by  <seealso
+	  marker="ssh#connect-3">ssh:connect/3</seealso></item>
 	  
 	  <tag><c><![CDATA[{channel_id, channel_id()}]]></c></tag>
 	  <item> Id of the ssh channel.</item>
 	  
 	  </taglist>
 
-	  <note><p>This function is normally not called by the user, it is
-	  only needed if for some reason the channel process needs
-	  to be started with help of <c>proc_lib</c> instead calling
-	  <c>ssh_channel:start/4</c> or <c>ssh_channel:start_link/4</c> </p>
+	  <note><p>This function is normally not called by the
+	  user. The user only needs to call if for some reason the
+	  channel process needs to be started with help of
+	  <c>proc_lib</c> instead of calling
+	  <c>ssh_channel:start/4</c> or
+	  <c>ssh_channel:start_link/4</c> </p>
 	  </note>
       </desc>
     </func>
@@ -167,12 +180,12 @@
         <p>This function can be used by a channel to explicitly send a
         reply to a client that called <c>call/[2,3]</c> when the reply
         cannot be defined in the return value of
-        <c>CallbackModule:handle_call/3</c>.</p>
+	<seealso marker ="#Module:handle_call-3">Module:handle_call/3</seealso>.</p>
         <p><c>Client</c> must be the <c>From</c> argument provided to
           the callback function <c>handle_call/3</c>.
 	  <c>Reply</c> is an arbitrary term,
-          which will be given back to the client as the return value of
-          <c>ssh_channel:call/[2,3].</c></p>
+	  which will be given back to the client as the return value of
+          <seealso marker="#call-2">ssh_channel:call/[2,3].</seealso>></p>
       </desc>
     </func>
     
@@ -180,11 +193,12 @@
       <name>start(SshConnection, ChannelId, ChannelCb, CbInitArgs) -> </name>
       <name>start_link(SshConnection, ChannelId, ChannelCb, CbInitArgs) ->
       {ok, ChannelRef} | {error, Reason}</name>
-      <fsummary> Starts a processes that handles a ssh channel. </fsummary>
+      <fsummary> Starts a processes that handles a SSH channel. </fsummary>
       <type>
 	<v>SshConnection = ssh_connection_ref()</v>
 	<v>ChannelId = ssh_channel_id() </v>
-	<d> As returned by ssh_connection:session_channel/[2,4]</d>
+	<d> As returned by cannot be defined in the return value of
+	<seealso marker ="ssh_connection#session_channel/2">ssh_connection:session_channel/[2,4]</seealso></d>
 	<v>ChannelCb = atom()</v>
 	<d> The name of the module implementing the service specific parts
 	of the channel.</d>
@@ -193,10 +207,10 @@
 	<v>ChannelRef = pid()</v>
       </type>
       <desc>
-	<p>Starts a processes that handles a ssh channel. Will be
-	called internally by the ssh daemon or explicitly by the ssh
-	client implementations. A channel process traps exit signals
-	by default.
+	<p>Starts a processes that handles an SSH channel. It will be
+	called internally by the SSH daemon or explicitly by the SSH
+	client implementations. The behavior will set the
+	<c>trap_exit</c> flag to true.
 	</p>
       </desc>
     </func>
@@ -204,72 +218,61 @@
   </funcs>
   
   <section>
-    <title>CALLBACK FUNCTIONS</title>
-    
-    <p>The functions init/1, terminate/2, handle_ssh_msg/2 and
-    handle_msg/2 are the functions that are required to provide the
-    implementation for a server side channel, such as a ssh subsystem
-    channel that can be plugged into the erlang ssh daemon see
-    <seealso marker="ssh">ssh:daemon/[2, 3]</seealso>. The
-    handle_call/3, handle_cast/2 code_change/3 and enter_loop/1
-    functions are only relevant when implementing a client side
-    channel.</p>
-  </section>
- 
-  <section>
     <marker id="cb_timeouts"></marker>
     <title> CALLBACK TIMEOUTS</title>
-    <p> If an integer timeout value is provided in a return value of
-    one of the callback functions, a timeout will occur unless a
-    message is received within <c>Timeout</c> milliseconds. A timeout
-    is represented by the atom <c>timeout</c> which should be handled
-    by the <seealso marker="#handle_msg">handle_msg/2</seealso>
-    callback function. The atom infinity can be used to wait
-    indefinitely, this is the default value. </p>
+
+    <p>The timeout values that may be returned by the callback functions
+    has the same semantics as in a <seealso marker="stdlib#gen_server">gen_server</seealso>
+    If the timeout occurs <seealso marker="#handle_msg">handle_msg/2</seealso>
+    will be called as <c>handle_msg(timeout, State). </c></p>
   </section>
 
   <funcs>
     <func>
-      <name>CallbackModule:code_change(OldVsn, State, Extra) -> {ok,
+      <name>Module:code_change(OldVsn, State, Extra) -> {ok,
       NewState}</name>
       <fsummary> Converts process state when code is changed.</fsummary>
       <type>
-	<v> Converts process state when code is changed.</v>
+	<v>OldVsn = term()</v>
+	<d>In the case of an upgrade, <c>OldVsn</c> is <c>Vsn</c>, and
+	in the case of a downgrade, <c>OldVsn</c> is
+	<c>{down,Vsn}</c>. <c>Vsn</c> is defined by the <c>vsn</c>
+	attribute(s) of the old version of the callback module
+	<c>Module</c>. If no such attribute is defined, the version is
+	the checksum of the BEAM file.</d>
+	<v>State = term()</v>
+	<d>The internal state of the channel.</d>
+        <v>Extra = term()</v>
+	<d>Passed as-is from the <c>{advanced,Extra}</c>
+	part of the update instruction.</d>
       </type>
       <desc>
-	  <p>This function is called by a client side channel when it
-	  should update its internal state during a release
-	  upgrade/downgrade, i.e. when the instruction
-	  <c>{update,Module,Change,...}</c> where
-	  <c>Change={advanced,Extra}</c> is given in the <c>appup</c>
-	  file. See <seealso
-	  marker="doc/design_principles:release_handling#instr">OTP
-	  Design Principles</seealso> for more information. Any new
-	  connection will benefit from a server side upgrade but
-	  already started connections on the server side will not be
-	  affected.
-	  </p>
+	<p> Converts process state when code is changed.</p>
+
+	<p>This function is called by a client side channel when it
+	should update its internal state during a release
+	upgrade/downgrade, i.e. when the instruction
+	<c>{update,Module,Change,...}</c> where
+	<c>Change={advanced,Extra}</c> is given in the <c>appup</c>
+	file. See <seealso marker="doc/design_principles:release_handling#instr">OTP
+	Design Principles</seealso> for more information.
+	</p>
 
-	  <note><p>If there are long lived ssh connections and more
-	  than one upgrade in a short time this may cause the old
-	  connections to fail as only two versions of the code may
-	  be loaded simultaneously.</p></note>
+	<note><p>Soft upgrade according to the OTP release concept
+	is not straight forward for the server side, as subsystem
+	channel processes are spawned by the SSH application and
+	hence added to its supervisor tree. It could be possible to
+	upgrade the subsystem channels, when upgrading the user
+	application, if the callback functions can handle two
+	versions of the state, but this function can not be used in
+	the normal way.</p>
+	</note>
 	  
-        <p>In the case of an upgrade, <c>OldVsn</c> is <c>Vsn</c>, and
-          in the case of a downgrade, <c>OldVsn</c> is
-          <c>{down,Vsn}</c>. <c>Vsn</c> is defined by the <c>vsn</c>
-          attribute(s) of the old version of the callback module
-          <c>Module</c>. If no such attribute is defined, the version
-          is the checksum of the BEAM file.</p>
-        <p><c>State</c> is the internal state of the channel.</p>
-        <p><c>Extra</c> is passed as-is from the <c>{advanced,Extra}</c>
-          part of the update instruction.</p>
-        <p>The function should return the updated internal state.</p>
       </desc>
     </func>
     
     <func>
-      <name>CallbackModule:init(Args) -> {ok, State} | {ok, State, Timeout} |
+      <name>Module:init(Args) -> {ok, State} | {ok, State, timeout()} |
       {stop, Reason}</name>
       <fsummary> Makes necessary initializations and returns the
       initial channel state if the initializations succeed.</fsummary>
@@ -277,7 +280,6 @@
 	<v> Args = term() </v>
 	<d> Last argument to ssh_channel:start_link/4.</d>
 	<v> State = term() </v>
-	<v>Timeout = timeout() </v>
 	<v> Reason = term() </v>
       </type>
       <desc>
@@ -290,7 +292,7 @@
     </func>
    
     <func>
-      <name>CallbackModule:handle_call(Msg, From, State) -> Result</name>
+      <name>Module:handle_call(Msg, From, State) -> Result</name>
       <fsummary> Handles messages sent by calling
       <c>ssh_channel:call/[2,3]</c></fsummary>
       <type>
@@ -298,17 +300,16 @@
 	<v>From = opaque to the user should be used as argument to
 	ssh_channel:reply/2</v>
 	<v>State = term()</v>
-	<v>Result = {reply, Reply, NewState} | {reply, Reply, NewState, Timeout}
-	| {noreply, NewState} | {noreply , NewState, Timeout}
+	<v>Result = {reply, Reply, NewState} | {reply, Reply, NewState, timeout()}
+	| {noreply, NewState} | {noreply , NewState, timeout()}
 	| {stop, Reason, Reply, NewState} | {stop, Reason, NewState} </v>
 	<v>Reply = term() - will be the return value of ssh_channel:call/[2,3]</v>
-	<v>Timeout = timeout() </v>
-	<v>NewState = term() - a possible updated version of State</v>
+	<v>NewState = term()</v>
 	<v>Reason = term()</v>
       </type>
       <desc>
 	<p>Handles messages sent by calling
-	<c>ssh_channel:call/[2,3]</c>	
+	<seealso marker="#call-2">ssh_channel:call/[2,3]</seealso>
 	</p>
 	<p>For more detailed information on timeouts see the section 
 	<seealso marker="#cb_timeouts">CALLBACK TIMEOUTS</seealso>. </p>
@@ -316,16 +317,15 @@
     </func>
 
     <func>
-      <name>CallbackModule:handle_cast(Msg, State) -> Result</name>
+      <name>Module:handle_cast(Msg, State) -> Result</name>
       <fsummary> Handles messages sent by calling
       <c>ssh_channel:cact/2</c></fsummary>
       <type>
 	<v>Msg = term()</v>
 	<v>State = term()</v>
-	<v>Result = {noreply, NewState} | {noreply, NewState, Timeout}
+	<v>Result = {noreply, NewState} | {noreply, NewState, timeout()}
 	| {stop, Reason, NewState}</v>
-	<v>NewState = term() - a possible updated version of State</v>
-	<v>Timeout = timeout() </v>
+	<v>NewState = term() </v>
 	<v>Reason = term()</v>
       </type>
       <desc>
@@ -339,7 +339,7 @@
     </func>
  
     <func>
-      <name>CallbackModule:handle_msg(Msg, State) -> {ok, State} |
+      <name>Module:handle_msg(Msg, State) -> {ok, State} |
       {stop, ChannelId, State}</name>
 
       <fsummary> Handle other messages than ssh connection protocol,
@@ -359,136 +359,37 @@
 	<taglist>
 	  <tag><c><![CDATA[{ssh_channel_up, ssh_channel_id(), 
 	  ssh_connection_ref()}]]></c></tag>
-	  <item>This is the first messages that will be received
-	  by the channel, it is sent just before
-	  the ssh_channel:init/1 function returns successfully.
-	  This is especially useful if the server wants
-	  to send a message to the client without first receiving
-	  a message from the client. If the message is not useful
-	  for your particular problem just ignore it by immediately
-	  returning {ok, State}.
+	  <item>This is the first messages that will be received by
+	  the channel, it is sent just before the <seealso
+	  marker="#init-2">ssh_channel:init/1</seealso> function
+	  returns successfully.  This is especially useful if the
+	  server wants to send a message to the client without first
+	  receiving a message from it. If the message is not
+	  useful for your particular scenario just ignore it by
+	  immediately returning {ok, State}.
 	  </item>
 	</taglist>
       </desc>
     </func>
 
     <func>
-      <name>CallbackModule:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
+      <name>Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
       ssh_channel_id(), State}</name>
       <fsummary> Handles ssh connection protocol messages. </fsummary>
       <type>
-	<v>Msg = {ssh_cm, ssh_connection_ref(), SshMsg}</v>
-	<v> SshMsg = tuple() - see message list below</v>
+	<v>Msg = <seealso marker="ssh_connection"> ssh_connection:event() </seealso> </v>
 	<v>State = term()</v>
       </type>
       <desc>
 	<p> Handles ssh connection protocol messages that may need
 	service specific attention.
 	</p>
-
-	<p> All channels should handle the following messages.  For
-	channels implementing subsystems the handle_ssh_msg-callback
-	will not be called for any other messages. </p>
-	
-	<taglist>
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(), {data, ssh_channel_id(),
-	  ssh_data_type_code(), binary() = Data}}]]></c></tag>
-	  <item> Data has arrived on the channel.  When the callback
-	  for this message returns the channel behavior will adjust
-	  the ssh flow control window.</item>
-	  
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(), {eof,
-	  ssh_channel_id()}}]]></c></tag>
-	  <item>Indicteas that the other side will not send any more
-	  data.</item>
-	  
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(), {signal,
-	  ssh_channel_id(), ssh_signal()}} ]]></c></tag>
-	  <item>A signal can be delivered to the remote
-	  process/service using the following message.  Some systems
-	  may not implement signals, in which case they should ignore
-	  this message.</item>
-	  
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(),
-	  {exit_signal, ssh_channel_id(), string() = exit_signal,
-	  string() = ErrorMsg, string() =
-	  LanguageString}}]]></c></tag>
-	  <item>A remote execution may terminate violently due to a
-	  signal then this message may be received. For details on valid string
-	  values see RFC 4254 section 6.10</item>
-	  
-	  <tag><c><![CDATA[{ssh_cm,  ssh_connection_ref(), {exit_status,
-	  ssh_channel_id(), integer() = ExitStatus}}]]></c></tag>
-	  <item> When the command running at the other end terminates,
-	  the following message can be sent to return the exit status
-	  of the command. A zero 'exit_status' usually means that the
-	  command terminated successfully.</item>
-	</taglist>
-
-	<p> Channels implementing a shell and command execution on the server side
-	should also handle the following messages. </p>
-	
-	<taglist>
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(), {env, ssh_channel_id(),
-	  boolean() = WantReply, string() = Var, string() = Value}}]]></c></tag>
-	  <item> Environment variables may be passed to the
-	  shell/command to be started later. Note that before the
-	  callback returns it should call the function
-	  ssh_connection:reply_request/4 with the boolean value of <c>
-	  WantReply</c> as the second argument.
-	  </item>
-	  
-	  <tag><c><![CDATA[{ssh_cm, ConnectionRef, {exec, ssh_channel_id(),
-	  boolean() = WantReply, string() = Cmd}}]]></c></tag>
-	  <item> This message will request that the server start the
-	  execution of the given command. Note that before the
-	  callback returns it should call the function
-	  ssh_connection:reply_request/4 with the boolean value of <c>
-	  WantReply</c> as the second argument.</item>
-	  
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(), {pty, ssh_channel_id(),
-	  boolean() = WantReply, {string() = Terminal, integer() = CharWidth,
-	  integer() = RowHeight, integer() = PixelWidth, integer() = PixelHight,
-	  [{atom() | integer() = Opcode,
-	  integer() = Value}] = TerminalModes}}}]]></c></tag>
-	  <item>A pseudo-terminal has been requested for the
-	  session. Terminal is the value of the TERM environment
-	  variable value (e.g., vt100). Zero dimension parameters must
-	  be ignored.  The character/row dimensions override the pixel
-	  dimensions (when nonzero).  Pixel dimensions refer to the
-	  drawable area of the window. The <c>Opcode</c> in the
-	  <c>TerminalModes</c> list is the mnemonic name, represented
-	  as an lowercase erlang atom, defined in RFC 4254 section 8,
-	  or the opcode if the mnemonic name is not listed in the
-	  RFC. Example <c>OP code: 53, mnemonic name ECHO erlang atom:
-	  echo</c>. Note that before the callback returns it should
-	  call the function ssh_connection:reply_request/4 with the
-	  boolean value of <c> WantReply</c> as the second
-	  argument.</item>
-	  
-	  <tag><c><![CDATA[{ssh_cm, ConnectionRef, {shell, boolean() =
-	  WantReply}}]]></c></tag>
-	  <item> This message will request that the user's default
-	  shell be started at the other end.  Note that before the
-	  callback returns it should call the function
-	  ssh_connection:reply_request/4 with the value of <c>
-	  WantReply</c> as the second argument.
-	  </item>
-
-	  <tag><c><![CDATA[ {ssh_cm, ssh_connection_ref(), {window_change,
-	  ssh_channel_id(), integer() = CharWidth, integer() = RowHeight,
-	  integer() = PixWidth, integer() = PixHeight}}]]></c></tag>
-	  <item> When the window (terminal) size changes on the client
-	  side, it MAY send a message to the other side to inform it
-	  of the new dimensions.</item>
-	</taglist>
 	
 	<p> The following message is completely taken care of by the
 	ssh channel behavior</p>
 	
 	<taglist>
-	  <tag><c><![CDATA[{ssh_cm, ssh_connection_ref(), {closed,
-	  ssh_channel_id()}}]]></c></tag>
+	  <tag><c><![CDATA[{closed, ssh_channel_id()}]]></c></tag>
 	  <item> The channel behavior will send a close message to the
 	  other side if such a message has not already been sent and
 	  then terminate the channel with reason normal.</item>
@@ -497,7 +398,7 @@
     </func>
 
     <func>
-      <name>CallbackModule:terminate(Reason, State) -> _</name>
+      <name>Module:terminate(Reason, State) -> _</name>
       <fsummary> </fsummary>
       <type>
 	<v>Reason = term()</v>
@@ -505,12 +406,12 @@
       </type>
       <desc>
 	<p>This function is called by a channel process when it is
-	about to terminate. Before this function is called ssh_connection:close/2
-	will be called if it has not been called earlier.
-	This function should be the opposite of <c>CallbackModule:init/1</c>
-	and do any necessary cleaning up. When it returns, the
-	channel process terminates with reason <c>Reason</c>. The return value is
-	ignored.
+	about to terminate. Before this function is called <seealso
+	marker="ssh_connection#close-2"> ssh_connection:close/2
+	</seealso> will be called if it has not been called earlier.
+	This function should do any necessary cleaning
+	up. When it returns, the channel process terminates with
+	reason <c>Reason</c>. The return value is ignored.
 	</p>
       </desc>
     </func>
diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml
new file mode 100644
index 0000000000..abc1070e78
--- /dev/null
+++ b/lib/ssh/doc/src/ssh_client_key_api.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2012</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>ssh_client_key_api</title>
+  </header>
+  <module>ssh_client_key_api</module>
+  <modulesummary>
+     -behaviour(ssh_client_key_api).
+  </modulesummary>
+  <description>
+    <p> Behavior describing the API for an SSH client's public key handling.
+      By implementing the callbacks defined.
+    in this behavior it is possible to customize the SSH client's public key
+    handling. By default the SSH application implements this behavior
+    with help of the standard openssh files, see <seealso marker="SSH_app"> ssh(6)</seealso>. </p>
+  </description>
+
+  <section>
+    <title>DATA TYPES </title>
+
+    <p>Type definitions that are used more than once in this module
+    and/or abstractions to indicate the intended use of the data
+    type:</p>
+
+    <p> boolean() = true | false</p>
+    <p> string() =  [byte()] </p>
+    <p> public_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
+    <p> private_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
+    <p> public_key_algorithm() =  'ssh-rsa'| 'ssh-dss' | atom()</p>
+
+  </section>
+
+  <funcs>
+    <func>
+      <name>Module:add_host_key(HostNames, Key, ConnectOptions) -> ok | {error, Reason}</name>
+      <fsummary>Adds a host key to the set of trusted host keys</fsummary>
+      <type>
+      <v>HostNames = string()</v>
+      <d>Description of the host that owns the <c>PublicKey</c></d>
+
+      <v>Key = public_key() </v>
+      <d> Normally an RSA or DSA public key but handling of other public keys can be added</d>
+
+      <v>ConnectOptions = proplists:proplist() </v>
+      <d>Options provided to  <seealso marker="ssh#daemon">ssh:connect/[3,4]</seealso></d>
+      <v>Reason = term() </v>
+      </type>
+      <desc>
+	 <p> Adds a host key to the set of trusted host keys</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:is_host_key(Key, Host, Algorithm, ConnectOptions) -> Result</name>
+      <fsummary>Checks if a host key is trusted</fsummary>
+      <type>
+	<v>Key = public_key() </v>
+	<d> Normally an RSA or DSA public key but handling of other public keys can be added</d>
+
+	<v>Host = string()</v>
+	<d>Description of the host</d>
+
+	<v>Algorithm = public_key_algorithm()</v>
+	<d> Host key algorithm. Should support 'ssh-rsa'| 'ssh-dss' but additional algorithms
+	can be handled.</d>
+
+	<v> ConnectOptions = proplists:proplist() </v>
+	<d>Options provided to  <seealso marker="ssh#daemon">ssh:connect/[3,4]</seealso></d>
+
+	<v> Result = boolean()</v>
+      </type>
+      <desc>
+	<p>Checks if a host key is trusted</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:user_key(Algorithm, ConnectOptions) ->
+      {ok,  PrivateKey}  | {error, Reason}</name>
+      <fsummary>Fetches the users "public key" matching the <c>Algorithm</c>.</fsummary>
+      <type>
+	<v>Algorithm = public_key_algorithm()</v>
+	<d> Host key algorithm. Should support 'ssh-rsa'| 'ssh-dss' but additional algorithms
+	can be handled.</d>
+
+	<v> ConnectOptions = proplists:proplist() </v>
+	<d>Options provided to  <seealso marker="ssh#daemon">ssh:connect/[3,4]</seealso></d>
+
+	<v> PrivateKey = private_key()</v>
+	<d> The private key of the user matching the <c>Algorithm</c></d>
+
+	<v>Reason = term() </v>
+      </type>
+
+      <desc>
+	<p>Fetches the users "public key" matching the <c>Algorithm</c>.
+	<note>The private key contains the public key</note>
+	</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+</erlref>
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index a9ae13d556..c66622307f 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,69 +24,178 @@
     </legalnotice>
 
     <title>ssh_connection</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
     <date></date>
-    <rev></rev>
   </header>
   <module>ssh_connection</module>
-  <modulesummary>This module provides an API to the ssh connection protocol.
+  <modulesummary>This module provides API functions to send <url href="http://www.ietf.org/rfc/rfc4254.txt"> SSH Connection Protocol </url>
+  events to the other side of an SSH channel.
   </modulesummary>
+
   <description>
-    <p>This module provides an API to the ssh connection protocol.
-    Not all features of the connection protocol are officially supported yet.
-    Only the ones supported are documented here.</p>
+    <p>The SSH Connection Protocol is used by clients and servers
+    (i.e. SSH channels) to communicate over the SSH connection. The
+    API functions in this module sends SSH Connection Protocol events
+    that are received as messages by the remote channel.
+    In the case that the receiving channel is an Erlang process the
+    message will be on the following format
+    <c><![CDATA[{ssh_cm, ssh_connection_ref(), ssh_event_msg()}]]></c>. If the <seealso
+    marker="ssh_channel">ssh_channel</seealso> behavior is used to
+    implement the channel process these will be handled by
+    <seealso
+	marker="ssh_channel#CallbackModule:handled_ssh_msg-2">handle_ssh_msg/2 </seealso>.</p>
   </description>
 
-   <section>
-    <title>COMMON DATA TYPES </title>
+  <section>
+    <title>DATA TYPES </title>
+
     <p>Type definitions that are used more than once in this module and/or
     abstractions to indicate the intended use of the data type:</p>
-    
+
     <p><c>boolean() = true | false </c></p>
     <p><c>string() = list of ASCII characters</c></p>
     <p><c>timeout() =  infinity | integer() - in milliseconds.</c></p>
     <p><c>ssh_connection_ref() - opaque to the user returned by
-    ssh:connect/3 or sent to a ssh channel processes</c></p>
+    ssh:connect/3 or sent to an SSH channel processes</c></p>
     <p><c>ssh_channel_id() = integer() </c></p>
     <p><c>ssh_data_type_code() = 1 ("stderr") | 0 ("normal") are
-    currently valid values see RFC 4254 section 5.2.</c></p>
+    currently valid values see</c> <url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254  </url> section 5.2.</p>
     <p><c>ssh_request_status() = success | failure</c></p>
-   </section>
+    <p><c>event() = {ssh_cm, ssh_connection_ref(), ssh_event_msg()} </c></p>
+    <p><c>ssh_event_msg()  = data_events() | status_events() | terminal_events() </c></p>
+
+    <taglist>
+      <tag><b>data_events()</b></tag>
+       <item>
+	 <taglist>
+	   <tag><c><![CDATA[{data, ssh_channel_id(), ssh_data_type_code(), binary() = Data}]]></c></tag>
+	   <item> Data has arrived on the channel. This event is sent as
+	   result of calling <seealso marker="#send-3"> ssh_connection:send/[3,4,5] </seealso></item>
+
+	   <tag><c><![CDATA[{eof, ssh_channel_id()}]]></c></tag>
+	   <item>Indicates that the other side will not send any more
+	   data. This event is sent as result of calling <seealso
+	   marker="#send_eof-2"> ssh_connection:send_eof/2</seealso>
+	   </item>
+	 </taglist>
+       </item>
+
+       <tag><b>status_events()</b></tag>
+       <item>
+
+      <taglist>
+	<tag><c><![CDATA[{signal, ssh_channel_id(), ssh_signal()}]]></c></tag>
+	<item>A signal can be delivered to the remote process/service
+	using the following message. Some systems will not support
+	signals, in which case they should ignore this message. There is
+	currently no funtion to generate this event as the signals
+	refered to are on OS-level and not something generated by an
+	Erlang program.</item>
+
+	<tag><c><![CDATA[{exit_signal, ssh_channel_id(), string() = ExitSignal, string() = ErrorMsg,
+	string() = LanguageString}]]></c></tag>
+
+	<item>A remote execution may terminate violently due to a signal
+	then this message may be received. For details on valid string
+	values see  <url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254</url> section 6.10. Special case of the signals
+	mentioned above.</item>
+
+	<tag><c><![CDATA[{exit_status, ssh_channel_id(), integer() = ExitStatus}]]></c></tag>
+	<item> When the command running at the other end terminates, the
+	following message can be sent to return the exit status of the
+	command. A zero 'exit_status' usually means that the command
+	terminated successfully. This event is sent as result of calling
+	<seealso marker="#exit_status">
+	ssh_connection:exit_status/3</seealso></item>
+
+	<tag><c><![CDATA[{closed, ssh_channel_id()}]]></c></tag>
+	<item> This event is sent as result of calling
+	<seealso marker="#close">ssh_connection:close/2</seealso> Both the handling of this
+	event and sending of it will be taken care of by the
+	<seealso marker="ssh_channel">ssh_channel</seealso> behavior.</item>
+
+      </taglist>
+     </item>
 
-   <section>
-     <title>MESSAGES SENT TO CHANNEL PROCESSES</title>
+     <tag><b>terminal_events()</b></tag>
+
+     <item>
+       <p> Channels implementing a shell and command execution on the
+       server side should handle the following messages that may be sent by client channel processes. </p>
+
+       <p><note>Events that includes a  <c> WantReply</c> expects the event handling
+       process to call <seealso marker="#reply_request">ssh_connection:reply_request/4</seealso>
+       with the boolean value of <c> WantReply</c> as the second
+       argument. </note> </p>
+
+       <taglist>
+	 <tag><c><![CDATA[{env, ssh_channel_id(), boolean() = WantReply,
+	 string() = Var, string() = Value}]]></c></tag>
+	 <item> Environment variables may be passed to the shell/command
+	 to be started later. This event is sent as result of calling <seealso
+	 marker="#setenv"> ssh_connection:setenv/5</seealso>
+	 </item>
+
+	 <tag><c><![CDATA[{pty, ssh_channel_id(),
+	 boolean() = WantReply, {string() = Terminal, integer() = CharWidth,
+	 integer() = RowHeight, integer() = PixelWidth, integer() = PixelHight,
+	 [{atom() | integer() = Opcode,
+	 integer() = Value}] = TerminalModes}}]]></c></tag>
+	 <item>A pseudo-terminal has been requested for the
+	 session. Terminal is the value of the TERM environment
+	 variable value (e.g., vt100). Zero dimension parameters must
+	 be ignored.  The character/row dimensions override the pixel
+	 dimensions (when nonzero).  Pixel dimensions refer to the
+	 drawable area of the window. The <c>Opcode</c> in the
+	 <c>TerminalModes</c> list is the mnemonic name, represented
+	 as an lowercase erlang atom, defined in
+	 <url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254  </url> section 8,
+	 or the opcode if the mnemonic name is not listed in the
+	 RFC. Example <c>OP code: 53, mnemonic name ECHO erlang atom:
+	 echo</c>. There is currently no API function to generate this
+	 event.</item>
+
+	 <tag><c><![CDATA[{shell, boolean() = WantReply}]]></c></tag>
+	 <item> This message will request that the user's default shell
+	 be started at the other end. This event is sent as result of calling <seealso
+	 marker="#shell"> ssh_connection:shell/2</seealso>
+	 </item>
+
+	 <tag><c><![CDATA[{window_change, ssh_channel_id(), integer() = CharWidth,
+	 integer() = RowHeight, integer() = PixWidth, integer() = PixHeight}]]></c></tag>
+	 <item> When the window (terminal) size changes on the client
+	 side, it MAY send a message to the server side to inform it of
+	 the new dimensions. There is currently no API function to generate this
+	 event.</item>
      
-     <p>As a result of the ssh connection protocol messages on the form
-     <c><![CDATA[{ssh_cm, ssh_connection_ref(), term()}]]></c>
-     will be sent to a channel process. The term will contain
-     information regarding the ssh connection protocol event,
-     for details see the ssh channel behavior callback <seealso
-     marker="ssh_channel">handle_ssh_msg/2 </seealso> </p>
-   </section>
-   
- <funcs>
+	 <tag><c><![CDATA[{exec, ssh_channel_id(),
+	 boolean() = WantReply, string() = Cmd}]]></c></tag>
+	 <item> This message will request that the server starts
+	 execution of the given command. This event is sent as result of calling <seealso
+	 marker="#exec">ssh_connection:exec/4 </seealso>
+	 </item>
+       </taglist>
+     </item>
+   </taglist>
+ </section>
+
+  <funcs>
    
    <func>
      <name>adjust_window(ConnectionRef, ChannelId, NumOfBytes) -> ok</name>
-     <fsummary>Adjusts the ssh flowcontrol window. </fsummary>
+     <fsummary>Adjusts the SSH flowcontrol window. </fsummary>
      <type>
        <v> ConnectionRef = ssh_connection_ref() </v>
        <v> ChannelId = ssh_channel_id() </v>
        <v> NumOfBytes = integer()</v>
      </type>
       <desc>
-	<p>Adjusts the ssh flowcontrol window. </p>
+	<p>Adjusts the SSH flowcontrol window. This shall be done by both client and server side channel processes.</p>
 	
-	<note><p>This will be taken care of by the ssh_channel
-	behavior when the callback <seealso marker="ssh_channel">
-	handle_ssh_msg/2 </seealso> has returned after processing a
-	{ssh_cm, ssh_connection_ref(), {data, ssh_channel_id(),
-	ssh_data_type_code(), binary()}}
-	message, and should normally not be called explicitly.</p></note>
+	<note><p>Channels implemented with the <seealso marker="ssh_channel"> ssh_channel
+	behavior</seealso> will normaly not need to call this function as flow control
+	will be handled by the behavior. The behavior will adjust the window every time
+	the callback <seealso marker="ssh_channel#handled_ssh_msg-2">
+	handle_ssh_msg/2 </seealso> has returned after processing channel data</p> </note>
       </desc>
    </func>
    
@@ -98,20 +207,19 @@
        <v> ChannelId = ssh_channel_id()</v>
      </type>
      <desc>
-       <p>Sends a close message on the channel <c>ChannelId</c>
+       <p>A server or client channel process can choose to close their session by sending a close event.
        </p>
 
-       <note><p>This function will be called by the ssh channel
+       <note><p>This function will be called by the ssh_channel
        behavior when the channel is terminated see <seealso
-       marker="ssh_channel"> ssh_channel(3) </seealso> and should
-       normally not be called explicitly.</p></note>
+       marker="ssh_channel"> ssh_channel(3) </seealso> so channels implemented with the
+       behavior should not call this function explicitly.</p></note>
      </desc>
    </func>
    
    <func>
      <name>exec(ConnectionRef, ChannelId, Command, TimeOut) -> ssh_request_status()  </name>
-     <fsummary>Will request that the server start the
-     execution of the given command.  </fsummary>
+     <fsummary>Request that the server start the execution of the given command.  </fsummary>
      <type>
        <v> ConnectionRef = ssh_connection_ref() </v>
        <v> ChannelId = ssh_channel_id()</v>
@@ -119,44 +227,39 @@
        <v>Timeout = timeout() </v>
      </type>
      <desc>
-       <p>Will request that the server start the execution of the
-       given command, the result will be received as:</p>
+       <p>Should be called by a client channel process to request that the server starts execution of the
+       given command, the result will be several messages according to the following pattern. Note
+       that the last message will be a channel close message, as the exec request is a one time
+       execution that closes the channel when it is done.</p>
 
        <taglist>
-	 <tag><c> N X {ssh_cm,
-	 ssh_connection_ref(), {data, ssh_channel_id(), ssh_data_type_code(),
-	 binary() = Data}} </c></tag>
+	 <tag><c> N x {ssh_cm, ssh_connection_ref(),
+	 {data, ssh_channel_id(), ssh_data_type_code(), binary() = Data}} </c></tag>
 	 <item>The result of executing the command may be only one line
 	 or thousands of lines depending on the command.</item>
 
-	 <tag><c> 1 X {ssh_cm, ssh_connection_ref(), {eof, ssh_channel_id()}}</c></tag>
+	 <tag><c>0 or 1 x {ssh_cm, ssh_connection_ref(), {eof, ssh_channel_id()}}</c></tag>
 	 <item>Indicates that no more data will be sent.</item>
 
-	 <tag><c>0 or 1 X {ssh_cm,
+	 <tag><c>0 or 1 x {ssh_cm,
 	 ssh_connection_ref(), {exit_signal,
 	 ssh_channel_id(), string() = ExitSignal, string() = ErrorMsg, string() = LanguageString}}</c></tag>
 	 <item>Not all systems send signals. For details on valid string
 	 values see RFC 4254 section 6.10 </item>
 	 
-	  <tag><c>0 or 1 X {ssh_cm, ssh_connection_ref(), {exit_status,
+	  <tag><c>0 or 1 x {ssh_cm, ssh_connection_ref(), {exit_status,
 	  ssh_channel_id(), integer() = ExitStatus}}</c></tag>
 	  <item>It is recommended by the <c>ssh connection protocol</c> that this
 	  message shall be sent, but that may not always be the case.</item>
 
-	  <tag><c> 1 X {ssh_cm, ssh_connection_ref(),
+	  <tag><c> 1 x {ssh_cm, ssh_connection_ref(),
 	  {closed, ssh_channel_id()}}</c></tag>
 	  <item>Indicates that the ssh channel started for the
 	  execution of the command has now been shutdown.</item>
        </taglist>
-       
-       <p> These message should be handled by the
-       client. The <seealso marker="ssh_channel">ssh channel
-       behavior</seealso> can be used when writing a client.
-       </p>
      </desc>
    </func>
 
-
    <func>
      <name>exit_status(ConnectionRef, ChannelId, Status) -> ok</name>
      <fsummary>Sends the exit status of a command to the client.</fsummary>
@@ -166,12 +269,12 @@
        <v> Status = integer()</v>
      </type>
      <desc>
-       <p>Sends the exit status of a command to the client.</p>
+       <p>Should be called by a server channel process to sends the exit status of a command to the client.</p>
      </desc>
- </func>
+   </func>
    
      <func>
-       <name>reply_request(ConnectionRef, WantReply, Status, CannelId) -> ok</name>
+       <name>reply_request(ConnectionRef, WantReply, Status, ChannelId) -> ok</name>
        <fsummary>Send status replies to requests that want such replies. </fsummary>
       <type>
 	<v> ConnectionRef = ssh_connection_ref() </v>
@@ -183,10 +286,9 @@
 	<p>Sends status replies to requests where the requester has
 	stated that they want a status report e.i .<c> WantReply = true</c>,
 	if <c> WantReply</c> is false calling this function will be a
-	"noop". Should be called after handling an ssh connection
+	"noop". Should be called while handling an ssh connection
 	protocol message containing a <c>WantReply</c> boolean
-	value. See the ssh_channel behavior callback <seealso
-	marker="ssh_channel"> handle_ssh_msg/2 </seealso>
+	value.
 	</p>
       </desc>
      </func>
@@ -206,7 +308,7 @@
 	<v> Timeout = timeout()</v>
        </type>
        <desc>
-	 <p>Sends channel data. 
+	 <p>Should be called by client- and server channel processes to send data to each other.
 	 </p>
        </desc>
      </func>
@@ -228,9 +330,7 @@
        <name>session_channel(ConnectionRef, Timeout) -> </name>
        <name>session_channel(ConnectionRef, InitialWindowSize,
        MaxPacketSize, Timeout) -> {ok, ssh_channel_id()} | {error, Reason}</name>
-       <fsummary>Opens a channel for a ssh session. A session is a
-       remote execution of a program. The program may be a shell, an
-       application, a system command, or some built-in subsystem. </fsummary>
+       <fsummary>Opens a channel for a ssh session. </fsummary>
        <type>
 	 <v> ConnectionRef = ssh_connection_ref()</v>
 	 <v> InitialWindowSize = integer() </v>
@@ -239,9 +339,8 @@
 	 <v> Reason = term() </v>
        </type>
        <desc>
-	 <p>Opens a channel for a ssh session. A session is a
-	 remote execution of a program. The program may be a shell, an
-	 application, a system command, or some built-in subsystem.
+	 <p>Opens a channel for an SSH session. The channel id returned from this function
+	 is the id used as input to the other funtions in this module.
 	</p>
        </desc>
      </func>
@@ -258,8 +357,8 @@
 	<v> Timeout = timeout()</v>
       </type>
       <desc>
-	<p> Environment variables may be passed to the shell/command to be
-	started later.
+	<p> Environment variables may be passed before starting the
+	shell/command. Should be called by a client channel processes.
 	</p>
       </desc>
     </func>
@@ -267,17 +366,16 @@
     <func>
       <name>shell(ConnectionRef, ChannelId) -> ssh_request_status()
       </name>
-      <fsummary> Will request that the user's default shell (typically
-      defined in /etc/passwd in UNIX systems) be started at the other
+      <fsummary> Requests that the user's default shell (typically
+      defined in /etc/passwd in UNIX systems) shall be executed at the server
       end. </fsummary>
        <type>
 	 <v> ConnectionRef = ssh_connection_ref() </v>
 	 <v> ChannelId = ssh_channel_id()</v>
        </type>
        <desc>
-	 <p> Will request that the user's default shell (typically
-	 defined in /etc/passwd in UNIX systems) be started at the
-	 other end. 
+	 <p> Should be called by a client channel process to request that the user's default shell (typically
+	 defined in /etc/passwd in UNIX systems) shall be executed at the server end.
 	 </p>
        </desc>
     </func>
@@ -292,7 +390,7 @@
 	 <v> Timeout = timeout()</v>
        </type>
        <desc>
-	 <p> Sends a request to execute a predefined subsystem.
+	 <p> Should be called by a client channel process for requesting to execute a predefined subsystem on the server.
 	 </p>
        </desc>
     </func>
diff --git a/lib/ssh/doc/src/ssh_protocol.xml b/lib/ssh/doc/src/ssh_protocol.xml
new file mode 100644
index 0000000000..28f42f5707
--- /dev/null
+++ b/lib/ssh/doc/src/ssh_protocol.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+<!-- %EricssonCopyright% -->
+<chapter>
+  <header>
+    <copyright>
+      <year>2013</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      The program may be used and/or copied only with the written permission from
+      Ericsson AB, or in accordance with the terms and conditions stipulated in
+      the agreement/contract under which the program has been supplied.
+    </legalnotice>
+    <title>Secure Shell (SSH)</title>
+    <prepared>OTP</prepared>
+    <date></date>
+    <rev>%VSN%</rev>
+    <file>ssh_protocol.xml</file>
+  </header>
+
+  <section>
+    <title>SSH Protocol Overview</title>
+
+    <p> Conceptually the SSH protocol can be partitioned into four
+    layers:</p>
+
+    <image file="SSH_protocols.png">
+      <icaption>SSH Protocol Architecture</icaption>
+    </image>
+
+    <section>
+      <title>Transport Protocol</title>
+
+      <p> The SSH Transport Protocol is a secure, low level transport.
+      It provides strong encryption, cryptographic host
+      authentication and integrity protection. Currently, only a
+      minimum of MAC- (message authentication code, a short piece of
+      information used to authenticate a message) and encryption
+      algorithms are supported see <seealso marker="ssh">ssh(3)</seealso>
+      </p>
+    </section>
+
+    <section>
+      <title>Authentication Protocol</title>
+
+      <p>The SSH authentication protocol is a general-purpose user
+      authentication protocol run over the SSH transport
+      protocol. Erlang SSH supports user authentication using public
+      key technology (RSA and DSA, X509-certificates are currently not
+      supported). It is also possible to use a so called keyboard
+      interactive authentication. This method is suitable for
+      interactive authentication methods that do not need any special
+      software support on the client side. Instead, all authentication
+      data should be entered via the keyboard. It is also possible
+      to use a pure password based authentication scheme, note that in
+      this case the the plain text password will be encrypted before sent
+      over the network. There are several configuration options for
+      authentication handling available in
+      <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>
+      and <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>
+      It is also possible to customize the public key handling
+      by implementing the behaviours <seealso
+      marker="ssh_client_key_api">ssh_client_key_api</seealso> and
+      <seealso
+	  marker="ssh_server_key_api">ssh_server_key_api</seealso>
+      </p>
+    </section>
+
+    <section>
+      <title>Connection Protocol</title>
+
+      <p>The SSH Connection Protocol provides application-support
+      services over the transport pipe, such as channel multiplexing,
+      flow control, remote program execution, signal propagation,
+      connection forwarding, etc.  Functions for handling the SSH
+      Connection Protocol can be found in the module <seealso
+      marker="ssh_connection">ssh_connection</seealso>.
+      </p>
+    </section>
+
+    <section>
+      <title>Channels</title>
+
+      <p>All terminal sessions, forwarded connections etc., are
+      channels.  Multiple channels are multiplexed into a single
+      connection, and all channels are flow-controlled.  Typically an
+      SSH client will open a channel, send data/commands, receive
+      data/"control information" and when it is done close the
+      channel. The <seealso
+      marker="ssh_channel">ssh_channel</seealso> behaviour makes it easy to
+      write your own SSH client/server processes that use flow
+      control. It handles generic parts of SSH channel management and
+      lets you focus on the application logic.
+      </p>
+
+      <p>Channels comes in three flavors</p>
+
+      <list type="bulleted">
+	<item><em>Subsystem</em> - named services that can be run as
+	part of an SSH server such as SFTP <seealso
+	marker="ssh_sftpd">ssh_sftpd</seealso>, that is built in to the
+	SSH daemon (server) by default but may be disabled. The Erlang SSH
+	daemon may be configured to run any Erlang
+	implemented SSH subsystem.
+	</item>
+	<item><em>Shell</em> - interactive shell.  By default the
+	Erlang daemon will run the Erlang shell. It is
+	possible to customize the shell by providing your own
+	read-eval-print loop. It is also possible, but much more work,
+	to provide your own CLI (Command Line Interface) implementation.
+	</item>
+	<item><em>Exec</em> - one-time remote execution of commands. See <seealso
+	marker="ssh_connection#exec-4">ssh_connection:exec/4</seealso></item>
+      </list>
+    </section>
+
+    <p>Channels are flow controlled.  No data may be sent to a channel
+    peer until a message is received to indicate that window space is
+    available.  The 'initial window size' specifies how many bytes of
+    channel data that can be sent to the channel peer without adjusting the
+    window.
+    </p>
+
+    <p>
+      For more detailed information about the SSH protocol, see the
+      following RFCs:
+    </p>
+
+    <list type="bulleted">
+      <item><url href="http://www.ietf.org/rfc/rfc4250.txt">RFC 4250</url> -
+      Protocol Assigned Numbers.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4251.txt">RFC 4251</url> -
+      Protocol Architecture.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4252.txt">RFC 4252</url> -
+      Authentication Protocol.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4253.txt">RFC 4253</url> -
+      Transport Layer Protocol.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254</url> -
+      Connection Protocol.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4255.txt">RFC 4255</url> -
+      Key Fingerprints.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4344.txt">RFC 4344</url> -
+      Transport Layer Encryption Modes.</item>
+      <item><url href="http://www.ietf.org/rfc/rfc4716.txt">RFC 4716</url> -
+      Public Key File Format.</item>
+    </list>
+  </section>
+</chapter>
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
new file mode 100644
index 0000000000..78ff105387
--- /dev/null
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2012</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>ssh_server_key_api</title>
+  </header>
+  <module>ssh_server_key_api</module>
+  <modulesummary>
+    -behaviour(ssh_server_key_api).
+  </modulesummary>
+  <description>
+    <p>  Behaviour describing the API for an SSH server's public key handling.By implementing the callbacks defined
+    in this behavior it is possible to customize the SSH server's public key
+    handling. By default the SSH application implements this behavior
+    with help of the standard openssh files, see <seealso marker="SSH_app"> ssh(6)</seealso>.</p>
+  </description>
+
+  <section>
+    <title>DATA TYPES </title>
+
+    <p>Type definitions that are used more than once in this module
+    and/or abstractions to indicate the intended use of the data
+    type:</p>
+
+    <p> boolean() = true | false</p>
+    <p> string() = [byte()]</p>
+    <p> public_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
+    <p> private_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
+    <p> public_key_algorithm() =  'ssh-rsa'| 'ssh-dss' | atom()</p>
+  </section>
+
+  <funcs>
+    <func>
+      <name>Module:host_key(Algorithm, DaemonOptions) ->
+      {ok, Key} | {error, Reason}</name>
+      <fsummary>Fetches the hosts private key </fsummary>
+      <type>
+	<v>Algorithm = public_key_algorithm()</v>
+	<d> Host key algorithm. Should support 'ssh-rsa'| 'ssh-dss' but additional algorithms
+	can be handled.</d>
+	<v> DaemonOptions = proplists:proplist() </v>
+	<d>Options provided to  <seealso marker="ssh#daemon">ssh:daemon/[2,3]</seealso></d>
+	<v> Key = private_key()</v>
+	<d> The private key of the host matching the <c>Algorithm</c></d>
+	<v>Reason = term() </v>
+      </type>
+      <desc>
+	  <p>Fetches the hosts private key</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:is_auth_key(Key, User, DaemonOptions) -> Result</name>
+      <fsummary> Checks if the user key is authorized</fsummary>
+      <type>
+	<v> Key = public_key() </v>
+	<d> Normally an RSA or DSA public key but handling of other public keys can be added</d>
+	<v> User = string()</v>
+	<d> The user owning the public key</d>
+	<v> DaemonOptions = proplists:proplist() </v>
+	<d> Options provided to  <seealso marker="ssh#daemon">ssh:daemon/[2,3]</seealso></d>
+	<v> Result = boolean()</v>
+      </type>
+      <desc>
+	 <p> Checks if the user key is authorized </p>
+      </desc>
+    </func>
+
+  </funcs>
+
+</erlref>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index c1f75461b1..0d61e57edb 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.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>2005</year><year>2010</year>
+      <year>2005</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,25 +22,20 @@
     </legalnotice>
 
     <title>ssh_sftp</title>
-    <prepared>Jakob Cederlund</prepared>
-    <responsible></responsible>
-    <docno>1</docno>
-    <approved></approved>
-    <checked></checked>
+    <prepared>OTP</prepared>
     <date>2005-09-22</date>
-    <rev>PA1</rev>
     <file>ssh_sftp.sgml</file>
   </header>
   <module>ssh_sftp</module>
   <modulesummary>SFTP client.</modulesummary>
   <description>
     <p>This module implements an SFTP (SSH FTP) client. SFTP is a
-      secure, encrypted file transfer service available for
-      SSH.</p>
+    secure, encrypted file transfer service available for
+    SSH.</p>
   </description>
   
  <section>
-    <title>COMMON DATA TYPES </title>
+    <title>DATA TYPES </title>
     <p>Type definitions that are used more than once in this module
     and/or abstractions to indicate the intended use of the data type:
     </p>
@@ -51,8 +46,8 @@
 
  <section>
     <title>TIMEOUTS </title>
-    <p>If the request functions for the sftp channel return {error, timeout}
-    it does not mean that the request did not reach the server and was
+    <p>If the request functions for the SFTP channel return {error, timeout}
+    it does not guarantee that the request did not reach the server and was
     not performed, it only means that we did not receive an answer from the
     server within the time that was expected.</p>
    </section>
@@ -64,7 +59,7 @@
       <name>start_channel(Host, Options) -></name>
       <name>start_channel(Host, Port, Options) -> {ok, Pid} | {ok, Pid, ConnectionRef} |
       {error, Reason}</name>
-      <fsummary>Starts a sftp client</fsummary>
+      <fsummary>Starts a SFTP client</fsummary>
       <type>
         <v>Host = string()</v>
         <v>ConnectionRef = ssh_connection_ref()</v>
@@ -73,11 +68,11 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-	<p>If not provided, setups a ssh connection in this case a
-	connection reference will be returned too. A ssh channel
-	process is started to handle the communication with the SFTP
-	server, the returned pid for this process should be used as
-	input to all other API functions in this module.</p>
+	<p>If no connection reference is provided, a connection is set
+	up and the new connection is returned.  An SSH channel process
+	is started to handle the communication with the SFTP server.
+	The returned pid for this process should be used as input to
+	all other API functions in this module.</p>
 
 	<p>Options are:</p>
 	<taglist>
@@ -95,13 +90,13 @@
 
     <func>
       <name>stop_channel(ChannelPid) -> ok</name>
-      <fsummary>Stops the sftp client channel.</fsummary>
+      <fsummary>Stops the SFTP client channel.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
       </type>
       <desc>
-	<p>Stops a sftp channel. If the ssh connection should be closed
-	call <seealso marker="ssh">ssh:close/1</seealso>.</p>
+	<p>Stops an SFTP channel. Does not close the SSH connetion.
+	Use <seealso marker="ssh">ssh:close/1</seealso> to close it.</p>
       </desc>
     </func>
   
@@ -133,8 +128,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Writes a file to the server, like <c><![CDATA[file:write_file/2]]></c>.
-          The file is created if it's not there.</p>
+        <p>Writes a file to the server, like
+        <c><![CDATA[file:write_file/2]]></c>.  The file is created if
+        it does not exist or is owerwritten if it does.</p>
       </desc>
     </func>
     <func>
@@ -169,7 +165,7 @@
       </type>
       <desc>
         <p>Opens a file on the server, and returns a handle that
-          is used for reading or writing.</p>
+          can be used for reading or writing.</p>
       </desc>
     </func>
     <func>
@@ -184,7 +180,7 @@
       </type>
       <desc>
         <p>Opens a handle to a directory on the server, the handle
-          is used for reading directory contents.</p>
+          can be used for reading directory contents.</p>
       </desc>
     </func>
     <func>
@@ -218,7 +214,7 @@
       </type>
       <desc>
         <p>Reads <c><![CDATA[Len]]></c> bytes from the file referenced by
-          <c><![CDATA[Handle]]></c>. Returns <c><![CDATA[{ok, Data}]]></c>, or <c><![CDATA[eof]]></c>, or
+          <c><![CDATA[Handle]]></c>. Returns <c><![CDATA[{ok, Data}]]></c>, <c><![CDATA[eof]]></c>, or
           <c><![CDATA[{error, Reason}]]></c>. If the file is opened with <c><![CDATA[binary]]></c>,
           <c><![CDATA[Data]]></c> is a binary, otherwise it is a string.</p>
         <p>If the file is read past eof, only the remaining bytes
@@ -267,9 +263,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Write <c><![CDATA[data]]></c> to the file referenced by <c><![CDATA[Handle]]></c>.
+        <p>Writes<c><![CDATA[data]]></c> to the file referenced by <c><![CDATA[Handle]]></c>.
           The file should be opened with <c><![CDATA[write]]></c> or <c><![CDATA[append]]></c>
-          flag. Returns <c><![CDATA[ok]]></c> if successful and <c><![CDATA[{error, Reason}]]></c>
+          flag. Returns <c><![CDATA[ok]]></c> if successful or S<c><![CDATA[{error, Reason}]]></c>
           otherwise.</p>
         <p>Typical error reasons are:</p>
         <taglist>
@@ -317,14 +313,14 @@
         <v>ChannelPid = pid()</v>
         <v>Handle = term()</v>
         <v>Location = Offset | {bof, Offset} | {cur, Offset} | {eof, Offset} | bof | cur | eof</v>
-        <v>Offset = int()</v>
+        <v>Offset = integer()</v>
 	<v>Timeout = timeout()</v>
         <v>NewPosition = integer()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
         <p>Sets the file position of the file referenced by <c><![CDATA[Handle]]></c>.
-          Returns <c><![CDATA[{ok, NewPosition]]></c> (as an absolute offset) if
+          Returns <c><![CDATA[{ok, NewPosition}]]></c> (as an absolute offset) if
           successful, otherwise <c><![CDATA[{error, Reason}]]></c>. <c><![CDATA[Location]]></c> is
           one of the following:</p>
         <taglist>
@@ -413,7 +409,7 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Read the link target from the symbolic link specified
+        <p>Reads the link target from the symbolic link specified
           by <c><![CDATA[name]]></c>, like <c><![CDATA[file:read_link/1]]></c>.</p>
       </desc>
     </func>
@@ -490,8 +486,9 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Deletes a directory specified by <c><![CDATA[Name]]></c>. The directory
-          should be empty.</p>
+	<p>Deletes a directory specified by <c><![CDATA[Name]]></c>.
+	Note that the directory must be empty before it can be successfully deleted
+	</p>
       </desc>
     </func>
   
diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml
index b3d64e72b4..3666bc7692 100644
--- a/lib/ssh/doc/src/ssh_sftpd.xml
+++ b/lib/ssh/doc/src/ssh_sftpd.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>2005</year><year>2010</year>
+      <year>2005</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,23 +22,17 @@
     </legalnotice>
 
     <title>ssh_sftpd</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible></responsible>
-    <docno>1</docno>
-    <approved></approved>
-    <checked></checked>
     <date>2005-09-22</date>
-    <rev>PA1</rev>
     <file>ssh_sftpd.sgml</file>
   </header>
   <module>ssh_sftpd</module>
-  <modulesummary>Specifies a channel process to handle a sftp subsystem.</modulesummary>
+  <modulesummary>Specifies the channel process to handle an sftp subsystem.</modulesummary>
   <description>
     <p>Specifies a channel process to handle a sftp subsystem.</p>
   </description>
 
   <section>
-    <title>COMMON DATA TYPES </title>
+    <title>DATA TYPES </title>
     <p><c>subsystem_spec() = {subsystem_name(), {channel_callback(), channel_init_args()}} </c></p>
     <p><c>subsystem_name() =  "sftp"</c></p>
     <p><c>channel_callback() = atom()</c> - Name of the erlang module implementing the
@@ -65,27 +59,32 @@
           </item>
           <tag><c><![CDATA[{file_handler, CallbackModule}]]></c></tag>
           <item>
-            <p>Determines which module to call for communicating with
-              the file server. Default value is <c>ssh_sftpd_file</c> that uses the
-              file and filelib API:s to access the standard OTP file
-              server. This option may be used to plug in the use of
-              other file servers.</p>
-          </item>
-          <tag><c><![CDATA[{max_files, Integer}]]></c></tag>
-          <item>
-            <p>The default value is <c>0</c>, which means that there is no upper limit.
-               If supplied, the number of filenames returned to the sftp client per <c>READDIR</c>
-               request, is limited to at most the given value.</p>
-          </item>
+	    <p>Determines which module to call for accessing
+	    the file server. The default value is <c>ssh_sftpd_file</c> that uses the
+	    <seealso marker="kernel#file">file</seealso> and <seealso marker="kernel#filelib">filelib</seealso> API:s to access the standard OTP file
+	    server. This option may be used to plug in
+	    other file servers.</p>
+	  </item>
+	  <tag><c><![CDATA[{max_files, Integer}]]></c></tag>
+	  <item>
+	    <p>The default value is <c>0</c>, which means that there is no upper limit.
+	    If supplied, the number of filenames returned to the sftp client per <c>READDIR</c>
+	    request is limited to at most the given value.</p>
+	  </item>
 	  <tag><c><![CDATA[{root, String}]]></c></tag>
 	  <item>
 	    <p>Sets the sftp root directory. The user will then not be
-	      able to see any files above this root. If for instance
-	      the root is set to <c>/tmp</c> the user will see this
-	      directory as <c>/</c> and if the user does cd <c>/etc</c>
-	      the user will end up in <c>/tmp/etc</c>.
+	    able to see any files above this root. If for instance
+	    the root is set to <c>/tmp</c> the user will see this
+	    directory as <c>/</c> and if the user does cd <c>/etc</c>
+	    the user will end up in <c>/tmp/etc</c>.
 	    </p>
 	  </item>
+	  <tag><c><![CDATA[{sftpd_vsn, integer()}]]></c></tag>
+	  <item>
+	    <p>Sets the sftp version to use, defaults to 5. Version 6 is under
+	    development and limited.</p>
+	  </item>
         </taglist>
       </desc>
     </func>
diff --git a/lib/ssh/doc/src/user_guide.gif b/lib/ssh/doc/src/user_guide.gif
deleted file mode 100644
index e6275a803d..0000000000
--- a/lib/ssh/doc/src/user_guide.gif
+++ /dev/null
diff --git a/lib/ssh/doc/src/usersguide.xml b/lib/ssh/doc/src/usersguide.xml
new file mode 100644
index 0000000000..c818003090
--- /dev/null
+++ b/lib/ssh/doc/src/usersguide.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE part SYSTEM "part.dtd">
+
+<part xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>2012</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>SSH User's Guide</title>
+    <prepared>OTP Team</prepared>
+    <date>2012-10-11</date>
+    <file>usersguide.xml</file>
+  </header>
+  <description>
+    <p>The <em>SSH</em> application implements the SSH (Secure Shell) protocol and
+    provides an SFTP (Secret File Transfer Protocol) client and server.
+    </p>
+  </description>
+  <xi:include href="introduction.xml"/>
+  <xi:include href="ssh_protocol.xml"/>
+  <xi:include href="using_ssh.xml"/>
+</part>
diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml
new file mode 100644
index 0000000000..87b811d591
--- /dev/null
+++ b/lib/ssh/doc/src/using_ssh.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2012</year>
+      <year>2013</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>Getting started</title>
+    <file>using_ssh.xml</file>
+  </header>
+
+  <section>
+    <title> General information</title>
+    <p>The examples in the following sections use the utility function
+    <seealso marker="ssh#start"> ssh:start/0 </seealso> that starts
+    all needed applications (crypto, public_key and ssh). All examples
+    are run in an Erlang shell, or in a bash shell using openssh to
+    illustrate how the erlang ssh application can be used.  The
+    exampels are run as the user otptest on a local network where the
+    user is authorized to login in over ssh to the host "tarlop". If
+    nothing else is stated it is persumed that the otptest user has an
+    entry in tarlop's authorized_keys file (may log in via ssh without
+    entering a password).  Also tarlop is a known host in the user
+    otptest's known_hosts file so that host verification can be done
+    without user interaction.
+    </p>
+  </section>
+
+  <section>
+    <title>Using the Erlang SSH Terminal Client</title>
+
+    <p>The user otptest, that has bash as default shell, uses the
+    ssh:shell/1 client to connect to the openssh daemon running on a
+    host called tarlop. Note that currently this client is very simple
+    and you should not be expected to be as fancy as the openssh
+    client.</p>
+
+    <code type="erl" >
+      1>  ssh:start().
+      ok
+      2> {ok, S} = ssh:shell("tarlop").
+      >pwd
+      /home/otptest
+      >exit
+      logout
+      3>
+    </code>
+  </section>
+
+  <section>
+    <title>Running an Erlang SSH Daemon </title>
+
+    <p> The option system_dir must be a directory containing a host
+    key file and it defaults to /etc/ssh. For details see section
+    Configuration Files in <seealso
+    marker="ssh_app">ssh(6)</seealso>.
+    </p>
+
+    <note><p>Normally the /etc/ssh directory is only readable by root. </p>
+    </note>
+
+    <p> The option user_dir defaults to the users ~/.ssh  directory</p>
+
+    <p>In the following example we generate new keys and host keys as
+    to be able to run the example without having root privilages</p>
+
+    <code>
+      $bash> ssh-keygen -t rsa -f /tmp/ssh_daemon/ssh_host_rsa_key
+      [...]
+      $bash> ssh-keygen -t rsa -f /tmp/otptest_user/.ssh/id_rsa
+      [...]
+    </code>
+
+    <p>Create the file /tmp/otptest_user/.ssh/authrized_keys and add the content
+    of /tmp/otptest_user/.ssh/id_rsa.pub  Now we can do</p>
+
+    <code type="erl">
+      1> ssh:start().
+      ok
+      2> {ok, Sshd} = ssh:daemon(8989,  [{system_dir, "/tmp/ssh_daemon"},
+      {user_dir, "/tmp/otptest_user/.ssh"}]).
+      {ok,&lt;0.54.0>}
+      3>
+    </code>
+
+    <p>Use the openssh client from a shell to connect to the Erlang ssh daemon.</p>
+
+    <code>
+      $bash> ssh tarlop -p 8989  -i /tmp/otptest_user/.ssh/id_rsa\
+             -o UserKnownHostsFile=/tmp/otptest_user/.ssh/known_hosts
+      The authenticity of host 'tarlop' can't be established.
+      RSA key fingerprint is 14:81:80:50:b1:1f:57:dd:93:a8:2d:2f:dd:90:ae:a8.
+      Are you sure you want to continue connecting (yes/no)? yes
+      Warning: Permanently added 'tarlop' (RSA) to the list of known hosts.
+      Eshell V5.10  (abort with ^G)
+      1>
+    </code>
+
+    <p>There are two ways of shutting down an SSH daemon</p>
+
+    <p>1: Stops the listener, but leaves existing connections started by the listener up and running.</p>
+
+    <code type="erl">
+      3> ssh:stop_listener(Sshd).
+      ok
+      4>
+    </code>
+
+    <p>2: Stops the listener and all connections started by the listener.</p>
+
+    <code type="erl">
+      3> ssh:stop_daemon(Sshd)
+      ok
+      4>
+    </code>
+
+  </section>
+
+  <section>
+    <title>One Time Execution</title>
+
+    <p>In the following example the Erlang shell is the client process
+    that receives the channel replies. <note> If you run this example
+    in your environment you may get fewer or more messages back as
+    this depends on the OS and shell on the machine running the ssh
+    daemon. See also <seealso marker="ssh_connection#exec-4">ssh_connection:exec/4</seealso>
+  </note>
+    </p>
+
+    <code type="erl" >
+      1>  ssh:start().
+      ok
+      2> {ok, ConnectionRef} = ssh:connect("tarlop", 22, []).
+      {ok,&lt;0.57.0>}
+      3>{ok, ChannelId} =  ssh_connection:session_channel(ConnectionRef, infinity).
+      {ok,0}
+      4> success = ssh_connection:exec(ConnectionRef, ChannelId, "pwd", infinity).
+      5>  flush().
+      Shell got {ssh_cm,&lt;0.57.0>,{data,0,0,&lt;&lt;"/home/otptest\n">>}}
+      Shell got {ssh_cm,&lt;0.57.0>,{eof,0}}
+      Shell got {ssh_cm,&lt;0.57.0>,{exit_status,0,0}}
+      Shell got {ssh_cm,&lt;0.57.0>,{closed,0}}
+      ok
+      6>
+    </code>
+
+    <p>Note only the channel is closed the connection is still up and can handle other channels</p>
+
+    <code type="erl" >
+      6> {ok, NewChannelId} =  ssh_connection:session_channel(ConnectionRef, infinity).
+        {ok,1}
+	...
+    </code>
+  </section>
+
+  <section>
+    <title>SFTP (SSH File Transport Protocol) server</title>
+
+    <code type="erl" >
+      1> ssh:start().
+      ok
+      2> ssh:daemon(8989,  [{system_dir, "/tmp/ssh_daemon"},
+         {user_dir, "/tmp/otptest_user/.ssh"},
+         {subsystems, [ssh_sftpd:subsystem_spec([{cwd, "/tmp/sftp/example"}])]}]).
+      {ok,&lt;0.54.0>}
+      3>
+    </code>
+
+    <p> Run the openssh sftp client</p>
+
+    <code type="erl">
+      $bash> sftp -oPort=8989 -o IdentityFile=/tmp/otptest_user/.ssh/id_rsa\
+             -o UserKnownHostsFile=/tmp/otptest_user/.ssh/known_hosts tarlop
+      Connecting to tarlop...
+      sftp> pwd
+      Remote working directory: /tmp/sftp/example
+      sftp>
+    </code>
+  </section>
+
+  <section>
+    <title>SFTP (SSH File Transport Protocol) client</title>
+
+    <code type="erl" >
+      1> ssh:start().
+      ok
+      2> {ok, ChannelPid, Connection} = ssh_sftp:start_channel("tarlop", []).
+      {ok,&lt;0.57.0>,&lt;0.51.0>}
+      3>  ssh_sftp:read_file(ChannelPid, "/home/otptest/test.txt").
+      {ok,&lt;&lt;"This is a test file\n">>}
+    </code>
+  </section>
+
+  <section>
+    <title>Creating a subsystem</title>
+
+    <p>A very small SSH subsystem that echos N bytes could be implemented like this.
+    See also <seealso marker="ssh_channel"> ssh_channel(3)</seealso> </p>
+
+    <code type="erl" >
+-module(ssh_echo_server).
+-behaviour(ssh_subsystem).
+-record(state, {
+	  n,
+	  id,
+	  cm
+	 }).
+-export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
+
+init([N]) ->
+    {ok, #state{n = N}}.
+
+handle_msg({ssh_channel_up, ChannelId, ConnectionManager}, State) ->
+    {ok, State#state{id = ChannelId,
+		     cm = ConnectionManager}}.
+
+handle_ssh_msg({ssh_cm, CM, {data, ChannelId, 0, Data}}, #state{n = N} = State) ->
+    M = N - size(Data),
+    case M > 0 of
+	true ->
+	   ssh_connection:send(CM, ChannelId, Data),
+	   {ok, State#state{n = M}};
+	false ->
+	   &lt;&lt;SendData:N/binary, _/binary>> = Data,
+           ssh_connection:send(CM, ChannelId, SendData),
+           ssh_connection:send_eof(CM, ChannelId),
+	   {stop, ChannelId, State}
+    end;
+handle_ssh_msg({ssh_cm, _ConnectionManager,
+		{data, _ChannelId, 1, Data}}, State) ->
+    error_logger:format(standard_error, " ~p~n", [binary_to_list(Data)]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, _ConnectionManager, {eof, _ChannelId}}, State) ->
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, _, {signal, _, _}}, State) ->
+    %% Ignore signals according to RFC 4254 section 6.9.
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, _, _Error, _}},
+	       State) ->
+    {stop, ChannelId,  State};
+
+handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, _Status}}, State) ->
+    {stop, ChannelId, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+ </code>
+
+ <p>And run like this on the host tarlop with the keys generated in section 3.3</p>
+
+ <code type="erl" >
+   1> ssh:start().
+   ok
+   2>  ssh:daemon(8989, [{system_dir, "/tmp/ssh_daemon"},
+   {user_dir, "/tmp/otptest_user/.ssh"}
+   {subsystems, [{"echo_n", {ssh_echo_server, [10]}}]}]).
+   {ok,&lt;0.54.0>}
+   3>
+ </code>
+
+ <code type="erl" >
+   1> ssh:start().
+   ok
+   2>{ok, ConnectionRef} = ssh:connect("tarlop", 8989, [{user_dir, "/tmp/otptest_user/.ssh"}]).
+    {ok,&lt;0.57.0>}
+   3>{ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity).
+   4> success = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity).
+   5> ok = ssh_connection:send(ConnectionRef, ChannelId, "0123456789", infinity).
+   6> flush().
+   {ssh_msg, &lt;0.57.0>, {data, 0, 1, "0123456789"}}
+   {ssh_msg, &lt;0.57.0>, {eof, 0}}
+   {ssh_msg, &lt;0.57.0>, {closed, 0}}
+   7> {error, closed} = ssh_connection:send(ConnectionRef, ChannelId, "10", infinity).
+ </code>
+
+</section>
+
+</chapter>
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index b8eecd3fa2..27e43a88ed 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -41,7 +41,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN)
 BEHAVIOUR_MODULES= \
 	ssh_sftpd_file_api \
         ssh_channel \
-	ssh_key_api
+	ssh_subsystem \
+	ssh_client_key_api \
+	ssh_server_key_api
 
 MODULES= \
 	ssh \
@@ -118,10 +120,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET):	$(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 
 docs:
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 316c09eb06..a0ba7cf7d9 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -10,6 +10,7 @@
 	     ssh_auth,
 	     ssh_bits,
 	     ssh_cli,
+             ssh_client_key_api,
 	     ssh_channel,
 	     ssh_channel_sup,
 	     ssh_connection,
@@ -21,13 +22,14 @@
 	     sshd_sup,
 	     ssh_file,
 	     ssh_io,
-             ssh_key_api,
 	     ssh_math,
 	     ssh_no_io,
+             ssh_server_key_api,
 	     ssh_sftp,
 	     ssh_sftpd,
 	     ssh_sftpd_file,
 	     ssh_sftpd_file_api,
+	     ssh_subsystem,
 	     ssh_subsystem_sup,
 	     ssh_sup,
 	     ssh_system_sup,
@@ -35,7 +37,7 @@
 	     ssh_userreg,
 	     ssh_xfer]},
   {registered, []},
-  {applications, [kernel, stdlib, crypto]},
+  {applications, [kernel, stdlib, crypto, public_key]},
   {env, []},
   {mod, {ssh_app, []}}]}.
 
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 6ba32e018f..cbd8166bb9 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,29 +19,17 @@
 
 {"%VSN%",	
  [
- {<<"2.1.1">>, [{restart_application, ssh}]},
- {<<"2.1">>, [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
-	      {load_module, ssh_connection, soft_purge, soft_purge, []},
-	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
-	      {load_module, ssh_auth, soft_purge, soft_purge, []},
-	      {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-	      {load_module, ssh_channel, soft_purge, soft_purge, []},
-	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
-	      {load_module, ssh, soft_purge, soft_purge, []}]},
+  {<<"2.1.2">>, [{restart_application, ssh}]},
+  {<<"2.1.1">>, [{restart_application, ssh}]},
+  {<<"2.1">>, [{restart_application, ssh}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ],
  [
+  {<<"2.1.2">>, [{restart_application, ssh}]},
   {<<"2.1.1">>, [{restart_application, ssh}]},
-  {<<"2.1">>,[{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
-	      {load_module, ssh_connection, soft_purge, soft_purge, []},
-	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
-	      {load_module, ssh_auth, soft_purge, soft_purge, []},
-	      {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-	      {load_module, ssh_channel, soft_purge, soft_purge, []},
-	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
-	      {load_module, ssh, soft_purge, soft_purge, []}]},
+  {<<"2.1">>,[{restart_application, ssh}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ]
-}.
\ No newline at end of file
+}.
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 719c97e940..193f877b98 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -31,29 +31,28 @@
 	 stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
 	 shell/1, shell/2, shell/3]).
 
--deprecated({sign_data, 2, next_major_release}).
--deprecated({verify_data, 3, next_major_release}).
-
--export([sign_data/2, verify_data/3]).
-
 %%--------------------------------------------------------------------
 %% Function: start([, Type]) -> ok
 %%
 %%  Type =  permanent | transient | temporary
 %%
-%% Description: Starts the inets application. Default type
+%% Description: Starts the ssh application. Default type
 %% is temporary. see application(3)
 %%--------------------------------------------------------------------
 start() ->
+    application:start(crypto),
+    application:start(public_key),
     application:start(ssh).
 
 start(Type) ->
+    application:start(crypto, Type),
+    application:start(public_key, Type),
     application:start(ssh, Type).
 
 %%--------------------------------------------------------------------
 %% Function: stop() -> ok
 %%
-%% Description: Stops the inets application.
+%% Description: Stops the ssh application.
 %%--------------------------------------------------------------------
 stop() ->
     application:stop(ssh).
@@ -76,7 +75,7 @@ connect(Host, Port, Options, Timeout) ->
 	{error, _Reason} = Error ->
 	    Error;
 	{SocketOptions, SshOptions} ->
-	    DisableIpv6 =  proplists:get_value(ip_v6_disabled, SshOptions, false),
+	    DisableIpv6 =  proplists:get_value(ipv6_disabled, SshOptions, false),
 	    Inet = inetopt(DisableIpv6),
 	    do_connect(Host, Port, [Inet | SocketOptions], 
 		       [{user_pid, self()}, {host, Host} | fix_idle_time(SshOptions)], Timeout, DisableIpv6)
@@ -169,7 +168,7 @@ daemon(HostAddr, Port, Options0) ->
 		   _ ->
 		       Options0
 	       end,
-    DisableIpv6 =  proplists:get_value(ip_v6_disabled, Options0, false),
+    DisableIpv6 =  proplists:get_value(ipv6_disabled, Options0, false),
     {Host, Inet, Options} = case HostAddr of
 				any ->
 				    {ok, Host0} = inet:gethostname(), 
@@ -264,7 +263,7 @@ start_daemon(Host, Port, Options, Inet) ->
 do_start_daemon(Host, Port, Options, SocketOptions) ->
     case ssh_system_sup:system_supervisor(Host, Port) of
 	undefined ->
-	    %% TODO: It would proably make more sense to call the
+	    %% It would proably make more sense to call the
 	    %% address option host but that is a too big change at the
 	    %% monent. The name is a legacy name!
 	    try sshd_sup:start_child([{address, Host}, 
@@ -274,7 +273,9 @@ do_start_daemon(Host, Port, Options, SocketOptions) ->
 		{ok, SysSup} ->
 		    {ok, SysSup};
 		{error, {already_started, _}} ->
-		    {error, eaddrinuse}
+		    {error, eaddrinuse};
+		{error, R} ->
+		    {error, R}
 	    catch
 		exit:{noproc, _} ->
 		    {error, ssh_not_started}
@@ -325,8 +326,6 @@ handle_option([{user_passwords, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{pwdfun, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([{user_auth, _} = Opt | Rest],SocketOptions, SshOptions ) ->
-    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{key_cb, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{role, _} = Opt | Rest], SocketOptions, SshOptions) ->
@@ -344,7 +343,10 @@ handle_option([{disconnectfun, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{failfun, _} = Opt | Rest],  SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([{ip_v6_disabled, _} = Opt | Rest], SocketOptions, SshOptions) ->
+%%Backwards compatibility should not be underscore between ip and v6 in API
+handle_option([{ip_v6_disabled, Value} | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option({ipv6_disabled, Value}) | SshOptions]);
+handle_option([{ipv6_disabled, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{transport, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
@@ -364,6 +366,8 @@ handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{rekey_limit, _} = Opt|Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
 
@@ -377,12 +381,16 @@ handle_ssh_option({silently_accept_hosts, Value} = Opt) when Value == true; Valu
     Opt;
 handle_ssh_option({user_interaction, Value} = Opt) when Value == true; Value == false ->
     Opt;
-handle_ssh_option({public_key_alg, Value} = Opt) when Value == ssh_rsa; Value == ssh_dsa ->
+handle_ssh_option({public_key_alg, ssh_dsa}) ->
+    {public_key_alg, 'ssh-dss'};
+handle_ssh_option({public_key_alg, ssh_rsa})  ->
+    {public_key_alg, 'ssh-rsa'};
+handle_ssh_option({public_key_alg, Value} = Opt) when Value == 'ssh-rsa'; Value == 'ssh-dss' ->
     Opt;
 handle_ssh_option({pref_public_key_algs, Value} = Opt) when is_list(Value), length(Value) >= 1 ->
-    case check_pref_algs(Value) of
-	true ->
-	    Opt;
+    case handle_pref_algs(Value, []) of
+	{true, NewOpts} ->
+	    NewOpts;
 	_ ->
 	    throw({error, {eoptions, Opt}})
     end;
@@ -400,8 +408,6 @@ handle_ssh_option({user_passwords, Value} = Opt) when is_list(Value)->
     Opt;
 handle_ssh_option({pwdfun, Value} = Opt) when is_function(Value) ->
     Opt;
-handle_ssh_option({user_auth, Value} = Opt)  when is_function(Value) ->
-    Opt;
 handle_ssh_option({key_cb, Value} = Opt)  when is_atom(Value) ->
     Opt;
 handle_ssh_option({compression, Value} = Opt) when is_atom(Value) ->
@@ -420,7 +426,9 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) ->
     Opt;
 handle_ssh_option({failfun, Value} = Opt) when is_function(Value) ->
     Opt;
-handle_ssh_option({ip_v6_disabled, Value} = Opt) when is_boolean(Value) ->
+
+handle_ssh_option({ipv6_disabled, Value} = Opt) when Value == true;
+						      Value == false ->
     Opt;
 handle_ssh_option({transport, {Protocol, Cb, ClosTag}} = Opt) when is_atom(Protocol),
 								   is_atom(Cb),
@@ -440,6 +448,8 @@ handle_ssh_option({quiet_mode, Value} = Opt) when Value == true;
     Opt;
 handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 ->
     Opt;
+handle_ssh_option({rekey_limit, Value} = Opt) when is_integer(Value) -> 
+    Opt;
 handle_ssh_option(Opt) ->
     throw({error, {eoptions, Opt}}).
 
@@ -448,7 +458,7 @@ handle_inet_option({active, _} = Opt) ->
 		   "and activ is handled internaly user is not allowd"
 		   "to specify this option"}});
 handle_inet_option({inet, _} = Opt) ->
-    throw({error, {{eoptions, Opt},"Is set internaly use ip_v6_disabled to"
+    throw({error, {{eoptions, Opt},"Is set internaly use ipv6_disabled to"
 		   " enforce iv4 in the server, client will fallback to ipv4 if"
 		   " it can not use ipv6"}});
 handle_inet_option({reuseaddr, _} = Opt) ->
@@ -458,14 +468,18 @@ handle_inet_option({reuseaddr, _} = Opt) ->
 handle_inet_option(Opt) ->
     Opt.
 %% Check preferred algs
-check_pref_algs([]) ->
-    true;
-check_pref_algs([H|T]) ->
+handle_pref_algs([], Acc) ->
+    {true, lists:reverse(Acc)};
+handle_pref_algs([H|T], Acc) ->
     case H of
 	ssh_dsa ->
-	    check_pref_algs(T);
+	    handle_pref_algs(T, ['ssh-dss'| Acc]);
 	ssh_rsa ->
-	    check_pref_algs(T);
+	    handle_pref_algs(T, ['ssh-rsa'| Acc]);
+	'ssh-dss' ->
+	    handle_pref_algs(T, ['ssh-dss'| Acc]);
+	'ssh-rsa' ->
+	    handle_pref_algs(T, ['ssh-rsa'| Acc]);
 	_ ->
 	    false
     end.
@@ -484,38 +498,3 @@ inetopt(false) ->
 %%%
 %% Deprecated
 %%%
-
-%%--------------------------------------------------------------------
-%% 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:user_key(Algorithm,[]) of
-	{ok, Key} when Algorithm == "ssh-rsa" ->
-	    public_key:sign(Data, sha, Key);
-	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:user_key(Algorithm, []) of
-	{ok, #'RSAPrivateKey'{publicExponent = E, modulus = N}} when Algorithm == "ssh-rsa" ->
-	    public_key:verify(Data, sha, Signature, #'RSAPublicKey'{publicExponent = E, modulus = N});
-	Error ->
-	    Error
-    end.
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index c436793dc4..cb0c7751f0 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -48,17 +48,18 @@ publickey_msg([Alg, #ssh{user = User,
 
     case KeyCb:user_key(Alg, Opts) of
 	{ok, Key} ->
+	    StrAlgo = algorithm_string(Alg),
 	    PubKeyBlob = encode_public_key(Key),
 	    SigData = build_sig_data(SessionId, 
-				     User, Service, PubKeyBlob, Alg),
+				     User, Service, PubKeyBlob, StrAlgo),
 	    Sig = ssh_transport:sign(SigData, Hash, Key),
-	    SigBlob = list_to_binary([?string(Alg), ?binary(Sig)]),
+	    SigBlob = list_to_binary([?string(StrAlgo), ?binary(Sig)]),
 	    ssh_transport:ssh_packet(
 	      #ssh_msg_userauth_request{user = User,
 					service = Service,
 					method = "publickey",
 					data = [?TRUE,
-						?string(Alg),
+						?string(StrAlgo),
 						?binary(PubKeyBlob),
 						?binary(SigBlob)]},
 	      Ssh);
@@ -120,8 +121,7 @@ init_userauth_request_msg(#ssh{opts = Opts} = Ssh) ->
 					    data = <<>>},
 	    case proplists:get_value(pref_public_key_algs, Opts, false) of
 		false ->
-		    FirstAlg = algorithm(proplists:get_value(public_key_alg, Opts,
-							     ?PREFERRED_PK_ALG)),
+		    FirstAlg = proplists:get_value(public_key_alg, Opts, ?PREFERRED_PK_ALG),
 		    SecondAlg = other_alg(FirstAlg),
 		    AllowUserInt =  proplists:get_value(user_interaction, Opts, true),
 		    Prefs = method_preference(FirstAlg, SecondAlg, AllowUserInt),
@@ -130,7 +130,7 @@ init_userauth_request_msg(#ssh{opts = Opts} = Ssh) ->
 							  userauth_methods = none,
 							  service = "ssh-connection"});
 		Algs ->
-		    FirstAlg = algorithm(lists:nth(1, Algs)),
+		    FirstAlg = lists:nth(1, Algs),
 		    case length(Algs) =:= 2 of
 			true ->
 			    SecondAlg = other_alg(FirstAlg),
@@ -358,7 +358,7 @@ verify_sig(SessionId, User, Service, Alg, KeyBlob, SigWLen, Opts) ->
     {ok, Key} = decode_public_key_v2(KeyBlob, Alg),
     KeyCb =  proplists:get_value(key_cb, Opts, ssh_file),
 
-    case KeyCb:is_auth_key(Key, User, Alg, Opts) of
+    case KeyCb:is_auth_key(Key, User, Opts) of
 	true ->
 	    PlainText = build_sig_data(SessionId, User,
 				       Service, KeyBlob, Alg),
@@ -381,9 +381,9 @@ build_sig_data(SessionId, User, Service, KeyBlob, Alg) ->
 	   ?binary(KeyBlob)],
     list_to_binary(Sig).
 
-algorithm(ssh_rsa) ->
+algorithm_string('ssh-rsa') ->
     "ssh-rsa";
-algorithm(ssh_dsa) ->
+algorithm_string('ssh-dss') ->
      "ssh-dss".
 
 decode_keyboard_interactive_prompts(NumPrompts, Data) ->
@@ -457,10 +457,10 @@ userauth_pk_messages() ->
 	binary]} % key blob
      ].
 
-other_alg("ssh-rsa") ->
-    "ssh-dss";
-other_alg("ssh-dss") ->
-    "ssh-rsa".
+other_alg('ssh-rsa') ->
+    'ssh-dss';
+other_alg('ssh-dss') ->
+    'ssh-rsa'.
 decode_public_key_v2(K_S, "ssh-rsa") ->
     case ssh_bits:decode(K_S,[string,mpint,mpint]) of
 	["ssh-rsa", E, N] ->
diff --git a/lib/ssh/src/ssh_auth.hrl b/lib/ssh/src/ssh_auth.hrl
index e74ee10041..6cd8e6bf14 100644
--- a/lib/ssh/src/ssh_auth.hrl
+++ b/lib/ssh/src/ssh_auth.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The 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 @@
 
 -define(SUPPORTED_AUTH_METHODS, "publickey,keyboard-interactive,password").
 
--define(PREFERRED_PK_ALG, ssh_rsa).
+-define(PREFERRED_PK_ALG, 'ssh-rsa').
 
 -define(SSH_MSG_USERAUTH_REQUEST,  50).
 -define(SSH_MSG_USERAUTH_FAILURE,  51).
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 1938858420..4e8f8538c2 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -23,14 +23,35 @@
 
 -include("ssh_connect.hrl").
 
-%%% Optional callbacks handle_call/3, handle_cast/2, handle_msg/2,
-%%% code_change/3
-%% Should be further specified later
--callback init(Options::list()) ->
-    {ok, State::term()} | {ok, State::term(), Timeout::timeout()} | 
-    {stop, Reason ::term()}. 
-
--callback terminate(term(), term()) -> term().
+-callback init(Args :: term()) ->
+    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
+    {stop, Reason :: term()} | ignore.
+-callback handle_call(Request :: term(), From :: {pid(), Tag :: term()},
+                      State :: term()) ->
+    {reply, Reply :: term(), NewState :: term()} |
+    {reply, Reply :: term(), NewState :: term(), timeout() | hibernate} |
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), Reply :: term(), NewState :: term()} |
+    {stop, Reason :: term(), NewState :: term()}.
+-callback handle_cast(Request :: term(), State :: term()) ->
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), NewState :: term()}.
+
+-callback terminate(Reason :: (normal | shutdown | {shutdown, term()} |
+                               term()),
+                    State :: term()) ->
+    term().
+-callback code_change(OldVsn :: (term() | {down, term()}), State :: term(),
+                      Extra :: term()) ->
+    {ok, NewState :: term()} | {error, Reason :: term()}.
+
+-callback handle_msg(Msg ::term(), State :: term()) ->
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), NewState :: term()}.
+
 
 -callback handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()}, 
  			 State::term()) -> {ok, State::term()} | 
diff --git a/lib/ssh/src/ssh_client_key.erl b/lib/ssh/src/ssh_client_key.erl
new file mode 100644
index 0000000000..2c48884dc2
--- /dev/null
+++ b/lib/ssh/src/ssh_client_key.erl
@@ -0,0 +1,34 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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(ssh_client_key).
+
+-include_lib("public_key/include/public_key.hrl").
+-include("ssh.hrl").
+
+-callback is_host_key(Key :: public_key(), Host :: string(),
+		      Algorithm :: 'ssh-rsa'| 'ssh-dsa'| atom(), Options :: proplists:proplist()) ->
+    boolean().
+
+-callback user_key(Algorithm ::  'ssh-rsa'| 'ssh-dsa'| atom(), Options :: list()) ->
+    {ok,  PrivateKey :: term()} | {error, string()}.
+
+
+-callback add_host_key(Host :: string(), PublicKey :: term(), Options :: list()) ->
+    ok | {error, Error::term()}.
diff --git a/lib/ssh/src/ssh_client_key_api.erl b/lib/ssh/src/ssh_client_key_api.erl
new file mode 100644
index 0000000000..58054a9fc5
--- /dev/null
+++ b/lib/ssh/src/ssh_client_key_api.erl
@@ -0,0 +1,35 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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(ssh_client_key_api).
+
+-include_lib("public_key/include/public_key.hrl").
+-include("ssh.hrl").
+
+-callback is_host_key(PublicKey :: #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term() , Host :: string(),
+		      Algorithm :: 'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplist()) ->
+    boolean().
+
+-callback user_key(Algorithm ::  'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplist()) ->
+    {ok,  PrivateKey :: #'RSAPrivateKey'{}| #'DSAPrivateKey'{} |  term()} | {error, string()}.
+
+
+-callback add_host_key(Host :: string(), PublicKey ::  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term(),
+		       Options :: list()) ->
+    ok | {error, Error::term()}.
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index d8950a7b67..9378686242 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -35,7 +35,8 @@
 
 -export([start_link/4, send/2, renegotiate/1, send_event/2,
 	 connection_info/3,
-	 peer_address/1]).
+	 peer_address/1,
+	 renegotiate_data/1]).
 
 %% gen_fsm callbacks
 -export([hello/2, kexinit/2, key_exchange/2, new_keys/2,
@@ -85,6 +86,8 @@ send(ConnectionHandler, Data) ->
 renegotiate(ConnectionHandler) ->
     send_all_state_event(ConnectionHandler, renegotiate).
  
+renegotiate_data(ConnectionHandler) ->
+    send_all_state_event(ConnectionHandler, data_size).
 connection_info(ConnectionHandler, From, Options) ->
      send_all_state_event(ConnectionHandler, {info, From, Options}).
 
@@ -419,11 +422,15 @@ userauth(#ssh_msg_userauth_failure{authentications = Methodes},
 	 #state{ssh_params = #ssh{role = client,
 				  userauth_methods = none} = Ssh0} = State) ->
     AuthMethods = string:tokens(Methodes, ","),
-    {Msg, Ssh} = ssh_auth:userauth_request_msg(
-	 	   Ssh0#ssh{userauth_methods = AuthMethods}),
-    send_msg(Msg, State),
-    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
-
+    Ssh1 = Ssh0#ssh{userauth_methods = AuthMethods},
+    case ssh_auth:userauth_request_msg(Ssh1) of
+	{disconnect, DisconnectMsg, {Msg, Ssh}} ->
+	    send_msg(Msg, State),
+	    handle_disconnect(DisconnectMsg, State#state{ssh_params = Ssh}); 
+	{Msg, Ssh} ->
+	    send_msg(Msg, State),
+	    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
+    end;
 %% The prefered authentication method failed try next method 
 userauth(#ssh_msg_userauth_failure{},  
 	 #state{ssh_params = #ssh{role = client} = Ssh0} = State) ->
@@ -500,7 +507,22 @@ handle_event(renegotiate, StateName, State) ->
 handle_event({info, From, Options}, StateName,  #state{ssh_params = Ssh} = State) ->
     spawn(?MODULE, ssh_info_handler, [Options, Ssh, From]), 
     {next_state, StateName, State};
-
+handle_event(data_size, connected, #state{ssh_params = Ssh0} = State) ->
+    Sent = inet:getstat(State#state.socket, [send_oct]),
+    MaxSent = proplists:get_value(rekey_limit, State#state.opts, 1024000000),
+    case Sent >= MaxSent of
+	true ->
+	    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh0),
+	    send_msg(SshPacket, State),
+	    {next_state, connected, 
+	     next_packet(State#state{ssh_params = Ssh,
+			     key_exchange_init_msg = KeyInitMsg,
+				     renegotiate = true})};
+	_ ->
+	    {next_state, connected, next_packet(State)}
+    end;
+handle_event(data_size, StateName, State) ->
+    {next_state, StateName, State};
 handle_event({unknown, Data}, StateName, State) ->
     Msg = #ssh_msg_unimplemented{sequence = Data},
     send_msg(Msg, State),
@@ -749,9 +771,9 @@ extract_algs([], NewList) ->
     lists:reverse(NewList);
 extract_algs([H|T], NewList) ->
     case H of
-	ssh_dsa ->
+	'ssh-dss' ->
 	    extract_algs(T, ["ssh-dss"|NewList]);
-	ssh_rsa -> 
+	'ssh-rsa' ->
 	    extract_algs(T, ["ssh-rsa"|NewList])
     end.
 available_host_key(KeyCb, "ssh-dss"= Alg, Opts) ->
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 0c1eee5186..94a9ed505f 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -125,7 +125,8 @@ info(ConnectionManager, ChannelProcess) ->
 %% or amount of data sent counter! 
 renegotiate(ConnectionManager) ->
     cast(ConnectionManager, renegotiate).
-
+renegotiate_data(ConnectionManager) ->
+    cast(ConnectionManager, renegotiate_data).
 connection_info(ConnectionManager, Options) ->
     call(ConnectionManager, {connection_info, Options}).
 
@@ -481,7 +482,9 @@ handle_cast({global_request, _, _, _, _} = Request, State0) ->
 handle_cast(renegotiate, #state{connection = Pid} = State) ->
     ssh_connection_handler:renegotiate(Pid),
     {noreply, State};
-
+handle_cast(renegotiate_data, #state{connection = Pid} = State) ->
+    ssh_connection_handler:renegotiate_data(Pid),
+    {noreply, State};
 handle_cast({adjust_window, ChannelId, Bytes}, 
 	    #state{connection = Pid, connection_state =
 		   #connection{channel_cache = Cache}} = State) ->
@@ -520,6 +523,8 @@ handle_info({start_connection, server,
     Exec = proplists:get_value(exec, Options),
     CliSpec = proplists:get_value(ssh_cli, Options, {ssh_cli, [Shell]}),
     ssh_connection_handler:send_event(Connection, socket_control),
+    erlang:send_after(3600000, self(), rekey),
+    erlang:send_after(60000, self(), rekey_data),
     {noreply, State#state{connection = Connection,
 			  connection_state = 
 			  CState#connection{address = Address,
@@ -536,6 +541,8 @@ handle_info({start_connection, client,
     case (catch ssh_transport:connect(Parent, Address, 
 				      Port, SocketOpts, Options)) of
 	{ok, Connection} ->
+	    erlang:send_after(60000, self(), rekey_data),
+	    erlang:send_after(3600000, self(), rekey),
 	    {noreply, State#state{connection = Connection}};
 	Reason ->
 	    Pid ! {self(), not_connected, Reason},
@@ -568,8 +575,15 @@ handle_info({'DOWN', _Ref, process, ChannelPid, _Reason}, State) ->
 
 %%% So that terminate will be run when supervisor is shutdown
 handle_info({'EXIT', _Sup, Reason}, State) ->
-    {stop, Reason, State}.
-
+    {stop, Reason, State};
+handle_info(rekey, State) ->
+    renegotiate(self()),
+    erlang:send_after(3600000, self(), rekey),
+    {noreply, State};
+handle_info(rekey_data, State) ->
+    renegotiate_data(self()),
+    erlang:send_after(60000, self(), rekey_data),
+    {noreply, State}.
 handle_password(Opts) ->
     handle_rsa_password(handle_dsa_password(handle_normal_password(Opts))).
 handle_normal_password(Opts) ->
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index a6b82a7a13..f115a32710 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -23,7 +23,8 @@
 
 -module(ssh_file).
 
--behaviour(ssh_key_api).
+-behaviour(ssh_server_key_api).
+-behaviour(ssh_client_key_api).
 
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -34,7 +35,7 @@
 	 user_key/2,
 	 is_host_key/4,
 	 add_host_key/3,
-	 is_auth_key/4]).
+	 is_auth_key/3]).
 
 
 -define(PERM_700, 8#700).
@@ -53,8 +54,8 @@ host_key(Algorithm, Opts) ->
     decode(File, Password).
 
 
-is_auth_key(Key, User, Alg, Opts) ->
-    case lookup_user_key(Key, User, Alg, Opts) of
+is_auth_key(Key, User,Opts) ->
+    case lookup_user_key(Key, User, Opts) of
 	{ok, Key} ->
 	    true;
 	_ ->
@@ -138,13 +139,13 @@ add_host_key(Host, Key, Opts) ->
    	    Error
     end.
 
-lookup_user_key(Key, User, Alg, Opts) ->
+lookup_user_key(Key, User, Opts) ->
     SshDir = ssh_dir({remoteuser,User}, Opts),
-    case lookup_user_key_f(Key, User, SshDir, Alg, "authorized_keys", Opts) of
+    case lookup_user_key_f(Key, User, SshDir, "authorized_keys", Opts) of
 	{ok, Key} ->
 	    {ok, Key};
 	_ ->
-	    lookup_user_key_f(Key, User, SshDir, Alg,  "authorized_keys2", Opts)
+	    lookup_user_key_f(Key, User, SshDir, "authorized_keys2", Opts)
     end.
 
 
@@ -213,9 +214,9 @@ do_lookup_host_key(Host, Alg, Opts) ->
 	Error -> Error
     end.
 
-identity_key_filename("ssh-dss") ->
+identity_key_filename('ssh-dss') ->
     "id_dsa";
-identity_key_filename("ssh-rsa") ->
+identity_key_filename('ssh-rsa') ->
     "id_rsa".
 
 identity_pass_phrase("ssh-dss") ->
@@ -261,9 +262,9 @@ host_name(Atom) when is_atom(Atom) ->
 host_name(List) ->
     List.
 
-key_match(#'RSAPublicKey'{}, "ssh-rsa") ->
+key_match(#'RSAPublicKey'{}, 'ssh-rsa') ->
     true;
-key_match({_, #'Dss-Parms'{}}, "ssh-dss") ->
+key_match({_, #'Dss-Parms'{}}, 'ssh-dss') ->
     true;
 key_match(_, _) ->
     false.
@@ -272,11 +273,11 @@ add_key_fd(Fd, Host,Key) ->
     SshBin = public_key:ssh_encode([{Key, [{hostnames, [Host]}]}], known_hosts),
     file:write(Fd, SshBin).
 
-lookup_user_key_f(_, _User, [], _Alg, _F, _Opts) ->
+lookup_user_key_f(_, _User, [], _F, _Opts) ->
     {error, nouserdir};
-lookup_user_key_f(_, _User, nouserdir, _Alg, _F, _Opts) ->
+lookup_user_key_f(_, _User, nouserdir, _F, _Opts) ->
     {error, nouserdir};
-lookup_user_key_f(Key, _User, Dir, _Alg, F, _Opts) ->
+lookup_user_key_f(Key, _User, Dir, F, _Opts) ->
     FileName = filename:join(Dir, F),
     case file:open(FileName, [read, binary]) of
 	{ok, Fd} ->
diff --git a/lib/ssh/src/ssh_key_api.erl b/lib/ssh/src/ssh_key_api.erl
deleted file mode 100644
index 8085c12e21..0000000000
--- a/lib/ssh/src/ssh_key_api.erl
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, 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(ssh_key_api).
-
--include_lib("public_key/include/public_key.hrl"). 
--include("ssh.hrl").
-
--type ssh_algorithm() :: string().
--type file_error()    :: file:posix() | badarg | system_limit | terminated.
-
--callback host_key(Algorithm :: ssh_algorithm(), Options :: list()) -> 
-                      {ok, [{public_key(), Attributes::list()}]} | public_key()
-                          | {error, string()}.
-
--callback user_key(Algorithm :: ssh_algorithm(), Options :: list()) -> 
-                     {ok, [{public_key(), Attributes::list()}]} | public_key()
-                          | {error, string()}.
-
--callback is_host_key(Key :: public_key(), PeerName :: string(), 
-                  Algorithm :: ssh_algorithm(), Options :: list()) ->
-                         boolean().
-
--callback add_host_key(Host :: string(), Key :: public_key(), Options :: list()) ->
-                          ok | {error, file_error()}.
-
--callback is_auth_key(Key :: public_key(), User :: string(),
-                  Algorithm :: ssh_algorithm(), Options :: list()) ->
-                         boolean().
diff --git a/lib/stdlib/test/erl_eval_helper.erl b/lib/ssh/src/ssh_server_key.erl
index 6863b40108..8140114990 100644
--- a/lib/stdlib/test/erl_eval_helper.erl
+++ b/lib/ssh/src/ssh_server_key.erl
@@ -1,28 +1,33 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, 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_helper, [Base]).
-
--export([add/1]).
+-module(ssh_server_key).
 
-add(Arg) ->
-    Base+Arg.
+-include_lib("public_key/include/public_key.hrl").
+-include("ssh.hrl").
 
+-type ssh_algorithm() :: string().
 
+-callback host_key(Algorithm :: ssh_algorithm(), Options :: list()) ->
+    {ok, [{public_key(), Attributes::list()}]} | public_key()
+	| {error, string()}.
 
+-callback is_auth_key(Key :: public_key(), User :: string(),
+		      Algorithm :: ssh_algorithm(), Options :: list()) ->
+    boolean().
diff --git a/lib/compiler/test/compilation_SUITE_data/bad_functional_value.erl b/lib/ssh/src/ssh_server_key_api.erl
index 126a573e83..4fd660ecb5 100644
--- a/lib/compiler/test/compilation_SUITE_data/bad_functional_value.erl
+++ b/lib/ssh/src/ssh_server_key_api.erl
@@ -1,28 +1,30 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, 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(bad_functional_value).
 
--export([?MODULE/0,a/0]).
+-module(ssh_server_key_api).
 
-?MODULE() ->
-    ok.
+-include_lib("public_key/include/public_key.hrl").
+-include("ssh.hrl").
 
-a() ->
-    .list_to_atom("ok").
+-callback host_key(Algorithm :: 'ssh-rsa'| 'ssh-dss'| atom(), DaemonOptions :: proplists:proplist()) ->
+    {ok, PrivateKey :: #'RSAPrivateKey'{}| #'DSAPrivateKey'{} |  term()} | {error, string()}.
 
+-callback is_auth_key(PublicKey :: #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term(),
+		      User :: string(), DaemonOptions :: proplists:proplist()) ->
+    boolean().
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index ec7b76b0b3..c7e8373840 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -24,7 +24,7 @@
 -module(ssh_sftpd).
 
 %%-behaviour(gen_server).
--behaviour(ssh_channel).
+-behaviour(ssh_subsystem).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -36,7 +36,7 @@
 -export([subsystem_spec/1,
 	 listen/1, listen/2, listen/3, stop/1]).
 
--export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2, code_change/3]).
+-export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]).
 
 -record(state, {
 	  xf,   			% [{channel,ssh_xfer states}...]
@@ -119,23 +119,13 @@ init(Options) ->
 		{Root0, State0}
 	end,
     MaxLength = proplists:get_value(max_files, Options, 0),
-
-    Vsn = proplists:get_value(vsn, Options, 5),
-
+    Vsn = proplists:get_value(sftpd_vsn, Options, 5),
     {ok,  State#state{cwd = CWD, root = Root, max_files = MaxLength,
 		      handles = [], pending = <<>>,
 		      xf = #ssh_xfer{vsn = Vsn, ext = []}}}.
 
 
 %%--------------------------------------------------------------------
-%% Function: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: 
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) -> 
-    {ok, State}.
-
-
-%%--------------------------------------------------------------------
 %% Function: handle_ssh_msg(Args) -> {ok, State} | {stop, ChannelId, State}
 %%                        
 %% Description: Handles channel messages
@@ -369,17 +359,21 @@ handle_op(?SSH_FXP_FSETSTAT, ReqId, <<?UINT32(HLen), BinHandle:HLen/binary,
 	    State0
     end;
 handle_op(?SSH_FXP_REMOVE, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>, 
-	  State0 = #state{file_handler = FileMod, file_state = FS0}) ->
+	  State0 = #state{file_handler = FileMod, file_state = FS0, xf = #ssh_xfer{vsn = Vsn}}) ->
     Path = relate_file_name(BPath, State0),
-    %%  case FileMod:is_dir(Path) of %% This version 6 we still have ver 5
-    %% 	true ->
-    %% 	    ssh_xfer:xf_send_status(State#state.xf, ReqId,
-    %% 				    ?SSH_FX_FILE_IS_A_DIRECTORY); 
-    %% 	false ->
-    {Status, FS1} = FileMod:delete(Path, FS0),
-    State1 = State0#state{file_state = FS1},
-    send_status(Status, ReqId, State1);
-    %%end;
+    {IsDir, _FS1} = FileMod:is_dir(Path, FS0),
+    case IsDir of %% This version 6 we still have ver 5
+	true when Vsn > 5 ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+				    ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory"); 
+	true ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+				    ?SSH_FX_FAILURE, "File is a directory"); 
+	false ->
+	    {Status, FS1} = FileMod:delete(Path, FS0),
+	    State1 = State0#state{file_state = FS1},
+	    send_status(Status, ReqId, State1)
+    end;
 handle_op(?SSH_FXP_RMDIR, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>, 
 	  State0 = #state{file_handler = FileMod, file_state = FS0}) ->
     Path = relate_file_name(BPath, State0),
@@ -637,31 +631,34 @@ open(Vsn, ReqId, Data, State) when Vsn >= 4 ->
     do_open(ReqId, State, Path, Flags).
 
 do_open(ReqId, State0, Path, Flags) ->
-    #state{file_handler = FileMod, file_state = FS0, root = Root} = State0,
+    #state{file_handler = FileMod, file_state = FS0, root = Root, xf = #ssh_xfer{vsn = Vsn}} = State0,
     XF = State0#state.xf,
     F = [binary | Flags],
-    %%   case FileMod:is_dir(Path) of %% This is version 6 we still have 5
-    %% 	true ->
-    %% 	    ssh_xfer:xf_send_status(State#state.xf, ReqId,
-    %% 				    ?SSH_FX_FILE_IS_A_DIRECTORY);
-    %% 	false ->
-    
-    AbsPath = case Root of
-		  "" ->
-		      Path;
-		  _ ->
-		      relate_file_name(Path, State0)  
-	      end,
-
-    {Res, FS1} = FileMod:open(AbsPath, F, FS0),
-    State1 = State0#state{file_state = FS1},
-    case Res of
-	{ok, IoDevice} ->
-	    add_handle(State1, XF, ReqId, file, {Path,IoDevice});
-	{error, Error} ->
-	    ssh_xfer:xf_send_status(State1#state.xf, ReqId,
-				    ssh_xfer:encode_erlang_status(Error)),
-	    State1
+    {IsDir, _FS1} = FileMod:is_dir(Path, FS0),
+    case IsDir of 
+	true when Vsn > 5 ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+    				    ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory");
+	true ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+    				    ?SSH_FX_FAILURE, "File is a directory");
+	false ->
+	    AbsPath = case Root of
+			  "" ->
+			      Path;
+			  _ ->
+			      relate_file_name(Path, State0)  
+		      end,
+	    {Res, FS1} = FileMod:open(AbsPath, F, FS0),
+	    State1 = State0#state{file_state = FS1},
+	    case Res of
+		{ok, IoDevice} ->
+		    add_handle(State1, XF, ReqId, file, {Path,IoDevice});
+		{error, Error} ->
+		    ssh_xfer:xf_send_status(State1#state.xf, ReqId,
+					    ssh_xfer:encode_erlang_status(Error)),
+		    State1
+	    end
     end.
 
 %% resolve all symlinks in a path
diff --git a/lib/ssh/src/ssh_subsystem.erl b/lib/ssh/src/ssh_subsystem.erl
new file mode 100644
index 0000000000..5a9fa32668
--- /dev/null
+++ b/lib/ssh/src/ssh_subsystem.erl
@@ -0,0 +1,47 @@
+-module(ssh_subsystem).
+
+%% API to special server side channel that can be pluged into the erlang ssh daemeon
+-callback init(Args :: term()) ->
+    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
+    {stop, Reason :: term()} | ignore.
+
+-callback terminate(Reason :: (normal | shutdown | {shutdown, term()} |
+                               term()),
+                    State :: term()) ->
+    term().
+
+-callback handle_msg(Msg ::term(), State :: term()) ->
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), NewState :: term()}.
+
+-callback handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()},
+			 State::term()) -> {ok, State::term()} |
+					   {stop, ChannelId::integer(),
+					    State::term()}.
+
+%%% API
+-export([start/4, start/5, start_link/4, start_link/5, enter_loop/1]).
+
+%% gen_server callbacks
+-export([init/1, terminate/2]).
+
+start(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
+    ssh_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+
+start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
+    ssh_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
+
+start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
+    ssh_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+
+start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
+    ssh_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
+
+enter_loop(State) ->
+    ssh_channel:enter_loop(State).
+
+init(Args) ->
+    ssh_channel:init(Args).
+terminate(Reason, State) ->
+    ssh_channel:terminate(Reason, State).
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 7f6e7d9946..1abb69921d 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -449,7 +449,7 @@ verify_host_key_rsa(SSH, K_S, H, H_SIG) ->
 		false ->
 		    {error, bad_signature};
 		true ->
-		    known_host_key(SSH, Public, "ssh-rsa")
+		    known_host_key(SSH, Public, 'ssh-rsa')
 	    end;
 	_ ->
 	    {error, bad_format}
@@ -464,7 +464,7 @@ verify_host_key_dss(SSH, K_S, H, H_SIG) ->
 		false ->
 		    {error, bad_signature};
 		true ->
-		    known_host_key(SSH, Public, "ssh-dss")
+		    known_host_key(SSH, Public, 'ssh-dss')
 	    end;
 	_ ->
 	    {error, bad_host_key_format}
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index d5b6dd03d1..4dfd9ed8b0 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -383,6 +383,8 @@ decode_status(Status) ->
 	?SSH_FX_UNKNOWN_PRINCIPLE -> unknown_principle;
 	?SSH_FX_LOCK_CONFlICT -> lock_conflict;
 	?SSH_FX_NOT_A_DIRECTORY -> not_a_directory;
+	?SSH_FX_FILE_IS_A_DIRECTORY -> file_is_a_directory;
+	?SSH_FX_CANNOT_DELETE -> cannot_delete;
 	_ -> {error,Status}
     end.
 
@@ -392,6 +394,9 @@ encode_erlang_status(Status) ->
 	eof -> ?SSH_FX_EOF;
 	enoent -> ?SSH_FX_NO_SUCH_FILE;
 	eacces -> ?SSH_FX_PERMISSION_DENIED;
+	eisdir -> ?SSH_FX_FILE_IS_A_DIRECTORY;
+	eperm -> ?SSH_FX_CANNOT_DELETE;
+	eexist -> ?SSH_FX_FILE_ALREADY_EXISTS;
 	_ -> ?SSH_FX_FAILURE
     end.
 
diff --git a/lib/ssh/src/ssh_xfer.hrl b/lib/ssh/src/ssh_xfer.hrl
index c13950eb6e..0d85cf2094 100644
--- a/lib/ssh/src/ssh_xfer.hrl
+++ b/lib/ssh/src/ssh_xfer.hrl
@@ -58,7 +58,6 @@
 %%% #   SSH_FX_xxx
 %%% Description: Response packet types for file transfer protocol.
 %%%----------------------------------------------------------------------
-
 -define(SSH_FX_OK,			0).
 -define(SSH_FX_EOF,			1).
 -define(SSH_FX_NO_SUCH_FILE,		2).
@@ -79,7 +78,18 @@
 -define(SSH_FX_LOCK_CONFlICT,           17).
 -define(SSH_FX_DIR_NOT_EMPTY,           18).
 -define(SSH_FX_NOT_A_DIRECTORY,         19).
+-define(SSH_FX_INVALID_FILENAME,        20).
+-define(SSH_FX_LINK_LOOP,               21).
+-define(SSH_FX_CANNOT_DELETE,           22).
+-define(SSH_FX_INVALID_PARAMETER,       23).
 -define(SSH_FX_FILE_IS_A_DIRECTORY,     24). 
+-define(SSH_FX_BYTE_RANGE_LOCK_CONFLICT,25).
+-define(SSH_FX_BYTE_RANGE_LOCK_REFUSED, 26).
+-define(SSH_FX_DELETE_PENDING,          27).
+-define(SSH_FX_FILE_CORRUPT,            28).
+-define(SSH_FX_OWNER_INVALID,           29).
+-define(SSH_FX_GROUP_INVALID,           30).
+-define(SSH_FX_NO_MATCHING_BYTE_RANGE_LOCK,31).
 
 %%%----------------------------------------------------------------------
 %%% #   SSH_FILEXFER_xxx
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 5fec7f0cd7..efcb11f88f 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -42,15 +42,14 @@ all() ->
      {group, dsa_pass_key},
      {group, rsa_pass_key},
      {group, internal_error},
-     {group, idle_time},
      daemon_already_started,
      server_password_option,
      server_userpassword_option,
      close].
 
 groups() -> 
-    [{dsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time]},
-     {rsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time]},
+    [{dsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time, rekey]},
+     {rsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time, rekey]},
      {dsa_pass_key, [], [pass_phrase]},
      {rsa_pass_key, [], [pass_phrase]},
      {internal_error, [], [internal_error]}
@@ -247,7 +246,8 @@ idle_time(Config) ->
     ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user_dir, UserDir},
-					  {user_interaction, false}]),
+					  {user_interaction, false},
+					  {idle_time, 2000}]),
     {ok, Id} = ssh_connection:session_channel(ConnectionRef, 1000),
     ssh_connection:close(ConnectionRef, Id),
     receive
@@ -256,6 +256,28 @@ idle_time(Config) ->
     end,
     ssh:stop_daemon(Pid).
 %%--------------------------------------------------------------------
+rekey(doc) ->
+    ["Idle timeout test"];
+rekey(Config) ->
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
+
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+					     {failfun, fun ssh_test_lib:failfun/2},
+					     {rekey_limit, 0}]),
+    ConnectionRef =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+					  {user_interaction, false},
+					  {rekey_limit, 0}]),
+    receive
+    after 15000 ->
+	    %%By this time rekeying would have been done
+	    ssh:close(ConnectionRef),
+	    ssh:stop_daemon(Pid)
+    end.
+%%--------------------------------------------------------------------
 shell(doc) ->
     ["Test that ssh:shell/2 works"];
 shell(Config) when is_list(Config) ->
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl
index 739aabe6fb..007b00c373 100644
--- a/lib/ssh/test/ssh_echo_server.erl
+++ b/lib/ssh/test/ssh_echo_server.erl
@@ -21,7 +21,7 @@
 
 %%% Description: Example ssh server
 -module(ssh_echo_server).
--behaviour(ssh_channel).
+-behaviour(ssh_subsytem).
 -record(state, {
 	  n,
 	  id,
@@ -50,7 +50,7 @@ handle_ssh_msg({ssh_cm, CM, {data, ChannelId, 0, Data}}, #state{n = N} = State)
     end;
 handle_ssh_msg({ssh_cm, _ConnectionManager,
 		{data, _ChannelId, 1, Data}}, State) ->
-    error_logger:format("ssh: STDERR: ~s\n", [binary_to_list(Data)]),
+    error_logger:format(standard_error, " ~p~n", [binary_to_list(Data)]),
     {ok, State};
 
 handle_ssh_msg({ssh_cm, _ConnectionManager, {eof, _ChannelId}}, State) ->
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index b995eb9f0e..5aa46872ee 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -58,7 +58,8 @@ all() ->
      links,
      ver3_rename, 
      relpath, 
-     sshd_read_file].
+     sshd_read_file,
+     ver6_basic].
 
 groups() -> 
     [].
@@ -106,12 +107,18 @@ init_per_testcase(TestCase, Config) ->
     SystemDir = filename:join(?config(priv_dir, Config), system),
 
     Port = ssh_test_lib:inet_port(node()),
-
-    {ok, Sftpd} =
-	ssh_sftpd:listen(Port, [{system_dir, SystemDir},
-				      {user_dir, PrivDir},
-				      {user_passwords,[{?USER, ?PASSWD}]},
-				      {pwdfun, fun(_,_) -> true end}]),
+    Options = [{system_dir, SystemDir},
+	       {user_dir, PrivDir},
+	       {user_passwords,[{?USER, ?PASSWD}]},
+	       {pwdfun, fun(_,_) -> true end}],
+    {ok, Sftpd} = case TestCase of
+		      ver6_basic ->
+			  SubSystems = [ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}])],
+			  ssh:daemon(Port, [{subsystems, SubSystems}|Options]);
+		      _ ->
+			  SubSystems = [ssh_sftpd:subsystem_spec([])],
+			  ssh:daemon(Port, [{subsystems, SubSystems}|Options])
+		  end,
     
     Cm = ssh_test_lib:connect(Port,
 			      [{user_dir, ClientUserDir},
@@ -341,7 +348,7 @@ mk_rm_dir(Config) when is_list(Config) ->
 	  _/binary>>, _} = mkdir(DirName, Cm, Channel, ReqId),
 
     NewReqId = 1,
-    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FAILURE),
+    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FILE_ALREADY_EXISTS),
 	  _/binary>>, _} = mkdir(DirName, Cm, Channel, NewReqId),
 
     NewReqId1 = 2,
@@ -591,7 +598,18 @@ sshd_read_file(Config) when is_list(Config) ->
 	read_file(Handle, 100, 0, Cm, Channel, NewReqId),
 
     {ok, Data} = file:read_file(FileName).
-
+ver6_basic(doc) ->
+    ["Test SFTP Version 6"];
+ver6_basic(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    %FileName = filename:join(PrivDir, "test.txt"),
+    {Cm, Channel} = ?config(sftp, Config),
+    ReqId = 0,
+    {ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),  % Ver 6 we have 5
+	   ?UINT32(?SSH_FX_FILE_IS_A_DIRECTORY), _/binary>>, _} =
+	open_file(PrivDir, Cm, Channel, ReqId,
+		  ?ACE4_READ_DATA  bor ?ACE4_READ_ATTRIBUTES,
+		  ?SSH_FXF_OPEN_EXISTING).
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 7fc2312661..8f722941d4 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -42,7 +42,8 @@ all() ->
      quit, 
      file_cb,
      root_dir, 
-     list_dir_limited].
+     list_dir_limited,
+     ver6_basic].
 
 groups() -> 
     [].
@@ -112,7 +113,12 @@ init_per_testcase(TestCase, Config) ->
 		[{system_dir, SystemDir},
 		 {user_dir, PrivDir},
 		 {subsystems, [Spec]}];
-
+	    "ver6_basic" ->
+		Spec =
+		    ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}]),
+		[{system_dir, SystemDir},
+		 {user_dir, PrivDir},
+		 {subsystems, [Spec]}];
 	    _ ->
 		[{user_dir, PrivDir},
 		 {system_dir, SystemDir}]
@@ -232,7 +238,7 @@ file_cb(Config) when is_list(Config) ->
     NewDir = filename:join(PrivDir, "testdir"),
     ok =  ssh_sftp:make_dir(Sftp, NewDir),
     alt_file_handler_check(alt_make_dir),
-
+	
     ok = ssh_sftp:del_dir(Sftp, NewDir),
     alt_file_handler_check(alt_read_link_info),
     alt_file_handler_check(alt_write_file_info),
@@ -260,6 +266,15 @@ list_dir_limited(Config) when is_list(Config) ->
 	ssh_sftp:list_dir(Sftp, "."),
     ct:pal("Listing: ~p~n", [Listing]).
 
+ver6_basic(doc) ->
+    ["Test some version 6 features"];
+ver6_basic(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    NewDir = filename:join(PrivDir, "testdir2"),
+    {Sftp, _} = ?config(sftp, Config),
+    ok =  ssh_sftp:make_dir(Sftp, NewDir),
+    %%Test file_is_a_directory
+    {error, file_is_a_directory} = ssh_sftp:delete(Sftp, NewDir).
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl
index 9e119c4929..9f8a7c496c 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl
@@ -48,7 +48,7 @@ get_cwd(State) ->
     {file:get_cwd(), State}.
 
 is_dir(AbsPath, State) ->
-    sftpd_file_alt_tester ! alt_is_dir,
+    %sftpd_file_alt_tester ! alt_is_dir,
     {filelib:is_dir(AbsPath), State}.
 
 list_dir(AbsPath, State) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 921ec2206a..71666a3179 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.1.2
+SSH_VSN = 2.1.3
 APP_VSN    = "ssh-$(SSH_VSN)"
 
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 49bbd5d27d..73cda03b2f 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2012</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,10 +22,6 @@
     </legalnotice>
 
     <title>SSL Release Notes</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-08-03</date>
-    <rev>G</rev>
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the SSL application.</p>
@@ -605,1285 +601,7 @@
       </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>
-      <list>
-        <item>
-          <p>
-            Fixes handling of the option fail_if_no_peer_cert and
-            some undocumented options. Thanks to Rory Byrne.</p>
-          <p>
-            Own Id: OTP-8557</p>
-        </item>
-      </list>
-    </section>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            Support for Diffie-Hellman. ssl-3.11 requires
-            public_key-0.6.</p>
-          <p>
-            Own Id: OTP-7046</p>
-        </item>
-        <item>
-          <p>
-            New ssl now properly handles ssl renegotiation, and
-            initiates a renegotiation if ssl/ltls-sequence numbers
-            comes close to the max value. However RFC-5746 is not yet
-            supported, but will be in an upcoming release.</p>
-          <p>
-            Own Id: OTP-8517</p>
-        </item>
-        <item>
-          <p>
-            When gen_tcp is configured with the {packet,http} option,
-            it automatically switches to expect HTTP Headers after a
-            HTTP Request/Response line has been received. This update
-            fixes ssl to behave in the same way. Thanks to Rory
-            Byrne.</p>
-          <p>
-            Own Id: OTP-8545</p>
-        </item>
-        <item>
-          <p>
-            Ssl now correctly verifies the extended_key_usage
-            extension and also allows the user to verify application
-            specific extensions by supplying an appropriate fun.</p>
-          <p>
-            Own Id: OTP-8554 Aux Id: OTP-8553 </p>
-        </item>
-        <item>
-          <p>
-            Fixed ssl:transport_accept/2 to return properly when
-            socket is closed. Thanks to Rory Byrne.</p>
-          <p>
-            Own Id: OTP-8560</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            Fixed a crash in the certificate certification part.</p>
-          <p>
-            Own Id: OTP-8510 Aux Id: seq11525 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.8</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-            <p><c>ssl:send/2</c> ignored packet option, fix provided
-            by YAMASHINA Hio.</p>
-            <p>Fixed a file cache bug which caused problems when the
-            same file was used for both cert and cacert.</p>
-            <p>Allow <c>ssl:listen/2</c> to be called with option
-            {ssl_imp, old}.</p>
-            <p> Fixed ssl:setopts(Socket, binary) which didn't work
-            for 'new' ssl.</p>.
-          <p>
-            Own Id: OTP-8441</p>
-        </item>
-        <item>
-          <p>
-            Do a controlled shutdown if a non ssl packet arrives as
-            the first packet.</p>
-          <p>
-            Own Id: OTP-8459 Aux Id: seq11505 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-            <p>Fixed session reuse (in new_ssl), thanks Wil Tan.</p>
-            <p>Send CA list during Certificate Request (in new_ssl) ,
-            thanks Wil Tan.</p> <p><c>NOTE</c>: SSL (new_ssl)
-            requires public_key-0.5.</p>
-          <p>
-            Own Id: OTP-8372</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            A ticker process could potentially be blocked
-            indefinitely trying to send a tick to a node not
-            responding. If this happened, the connection would not be
-            brought down as it should.</p>
-	  <p> This requires erts-5.7.4 and kernel-2.13.4 or later 
-	    to be able to get the erlang distribution over ssl to work.</p>
-          <p>
-            Own Id: OTP-8218</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            The documentation is now built with open source tools
-            (xsltproc and fop) that exists on most platforms. One
-            visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8250</p>
-        </item>
-        <item>
-          <p>
-            Code cleanup from Kostis.</p>
-          <p>
-            Own Id: OTP-8260</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.6</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            The ssl:ssl_accept/3 issue was not properly fixed in the
-            previous patch, see OTP-8244.</p>
-          <p>
-            Own Id: OTP-8275 Aux Id: seq11451 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.5</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            Allow clients to not send certificates if option
-            <c>fail_if_no_peer_cert</c> was not set.</p>
-          <p>
-            Own Id: OTP-8224</p>
-        </item>
-        <item>
-            <p>An ssl:ssl_accept/3 could crash a connection if the
-            timing was wrong.</p> <p>Removed info message if the
-            socket closed without a proper disconnect from the ssl
-            layer. </p> <p>ssl:send/2 is now blocking until the
-            message is sent.</p>
-          <p>
-            Own Id: OTP-8244 Aux Id: seq11420 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            A client could avoid a certificate check if the client
-            code didn't send the requested certificate.</p>
-          <p>
-            Own Id: OTP-8137</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SSL 3.10.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-            <p>Packet handling was not implemented correctly.</p>
-            <p>Inet option handling support have been improved.</p>
-            <p>The <c>verify_fun</c> is now invoked even if
-            verify_peer is used, that implies that by default
-            {bad_cert,unknown_ca} is an accepted fault during the
-            client connection phase. The check can still be done by
-            suppling another verify_fun.</p>
-          <p>
-            Own Id: OTP-8011 Aux Id: seq11287 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-
-<section><title>SSL 3.10.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            A "new_ssl" socket was not closed if the controlling
-            process died without calling ssl:close/1.</p>
-          <p>
-            Own Id: OTP-7963 Aux Id: seq11276 </p>
-        </item>
-      </list>
     </section>
-
-</section>
-
-<section><title>SSL 3.10.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            Fixed bug that caused the ssl handshake finished message
-            to be calculated wrongly under the circumstances that the
-            server did not send the trusted cert and that the
-            previous cert did not have the extension telling us the
-            trusted certs name. This manifested it self as
-            bad_record_mac alert from the server.</p>
-          <p>
-            Own Id: OTP-7878</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            The cacertsfile option is now optional for ssl servers.</p>
-          <p>
-            Own Id: OTP-7656</p>
-        </item>
-        <item>
-          <p>
-            For the ssl client the options cacertfile, certfile and
-            keyfile are now optional as they are not always needed
-            depending on configuration of the client itself and the
-            configuration of the server. Also as PEM-files may
-            contain more than one entry the keyfile option will
-            default to the same file as given by the certfile option.</p>
-          <p>
-            Own Id: OTP-7870</p>
-        </item>
-        <item>
-          <p>
-            Added new ssl client option verify_fun.</p>
-          <p>
-            Own Id: OTP-7871</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-    
-  <section><title>SSL 3.10</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            Error log entries are now formatted correctly.</p>
-          <p>
-            Own Id: OTP-7258</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            All handling of X509-certificates and public keys have
-            been moved to the new application public_key.</p>
-          <p>
-            Own Id: OTP-6894</p>
-        </item>
-        <item>
-          <p>
-            New ssl now supports SSL-3.0 and TLS-1.0</p>
-          <p>
-            Own Id: OTP-7037</p>
-        </item>
-        <item>
-          <p>
-            New ssl now supports all inet-packet types.</p>
-          <p>
-            Own Id: OTP-7039</p>
-        </item>
-        <item>
-          <p>
-            The new ssl-server is now able to send a certificate
-            request to the client. However new options may be
-            introduced later to fully support all features regarding
-            certificate requests.</p>
-          <p>
-            Own Id: OTP-7150</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Known Bugs and Problems</title>
-      <list>
-        <item>
-          <p>
-            Running erlang distribution over ssl don't work as
-            described in the documentation.</p>
-          <p>
-            Own Id: OTP-7536</p>
-        </item>
-      </list>
-    </section>
-    
-  </section>
-
-    
-  <section><title>SSL 3.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            ssl_prim.erl was passing an FD rather than an #sslsocket
-            to ssl_broker:ssl_accept_prim. This could cause problems
-            in the deprecated accept function, this will not cause
-            any more problems however this function is deprecated!</p>
-          <p>
-            Own Id: OTP-6926</p>
-        </item>
-        <item>
-          <p>
-            Erlang distribution over ssl was broken after R11B-0,
-            this has now been fixed.</p>
-          <p>
-            Own Id: OTP-7004</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            All inet options are available in the new ssl
-            implementation that is released as a alfa in ssl-3.9 and
-            will replace the old implementation in ssl-4.0. This will
-            not be fixed in the old implementation.</p>
-          <p>
-            Own Id: OTP-4677</p>
-        </item>
-        <item>
-          <p>
-            The new ssl implementation released as a alfa in this
-            version supports upgrading of a tcp connection to an ssl
-            connection so that http client and servers may implement
-            RFC 2817.</p>
-          <p>
-            Own Id: OTP-5510</p>
-        </item>
-        <item>
-            <p>A new implementation of ssl is released as a alfa
-            version in ssl-3.9 it will later replace the old
-            implementation in ssl-4.0. 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 an ssl connection. The alfa version has a
-            few limitations that will be removed before the ssl-4.0
-            release. Main differences and limitations in the alfa 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>Diffie-Hellman keyexchange is
-            not supported.</item> <item>Not all inet packet types are
-            supported.</item> <item>CRL and policy certificate
-            extensions are not supported.</item> <item>In this alfa
-            only sslv3 is enabled, although tlsv1 and tlsv1.1
-            versions are implemented and will be supported in future
-            versions.</item> <item>For security reasons sslv2 is not
-            supported.</item> </list> 
-          <p>
-            Own Id: OTP-6619</p>
-        </item>
-        <item>
-          <p>
-            New ssl implementation, released as alfa in ssl-3.9,
-            supports ipv6. It will not be supported in the old
-            implementation.</p>
-          <p>
-            Own Id: OTP-6637 Aux Id: OTP-6636 </p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section>
-    <title>SSL 3.1.1.1</title>
-
-    <section>
-      <title>Minor Makefile changes</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed use of <c>erl_flags</c> from Makefile.</p>
-          <p>Own Id: OTP-6689</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.1.1</title>
-
-    <section>
-      <title>Crash on error in ssl_accept</title>
-      <list type="bulleted">
-        <item>
-          <p>A bug in ssl_accept could cause all ssl
-            connections to hang when a connection
-            attempt was closed by the client while
-            the server was in <c>ssl_accept</c>.</p>
-          <p>Own Id: OTP-6612 Aux Id: seq10599</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>SSL now uses a two-phase accept, with a separate accept
-            calls for the socket and the ssl protocol. This avoids
-            timeouts when a client doesn't initiate ssl handshake.</p>
-          <p>With the old implementation of accept, the server
-            was locked by a client, if the client didn't do
-            proper ssl handshake.</p>
-          <p>Own Id: OTP-6418 Aux Id: seq10105</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.12</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>An integer array pointing to a struct pollfd array, is
-            now reset before file descriptors are collected to be
-            included in a call to poll(). This is to prevent file
-            descriptors to be mixed up.</p>
-          <p>Own Id: OTP-6084</p>
-        </item>
-        <item>
-          <p>The generation of the module ssl_pkix_oid contained
-            multiple identifiers, which made the mapping between
-            atoms and identifiers not one-to-one.</p>
-          <p>Own Id: OTP-6085</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.11</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The state of a connection in active mode could be in a
-            restrictive state, so that an internal tcp_closed message
-            was incorrectly considered illegal, resulting in a
-            premature termination of the connection process.</p>
-          <p>Own Id: OTP-5972 Aux Id: seq10188 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.10</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Erlang distribution over SSL was broken. Corrected.
-            (Thanks to Fredrik Thulin.)</p>
-          <p>Own Id: OTP-5863</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.9</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The port program for the ssl application could waste huge
-            amounts of CPU time if a write could not be completed
-            directly and was put in the write queue. (Only on platforms
-            where poll() is used, such as Solaris and Linux.)</p>
-          <p>Own Id: OTP-5784</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.8</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>A process reading only a portion of a sufficiently large
-            amount of data from an accepted socket, and then quering
-            the ssl library (e.g. ssl:getpeername()), would cause a
-            global deadlock in the esock port program.</p>
-          <p>Own Id: OTP-5702</p>
-        </item>
-        <item>
-          <p>A spelling error in the module <c>ssl_pkix</c> caused the
-            call to <c>ssl:peercert/2</c> to fail when the option
-            <c>subject</c> was used.</p>
-          <p>Own Id: OTP-5708</p>
-        </item>
-        <item>
-          <p>Because fopen() on Solaris 8 can't handle file
-            descriptor numbers above 255, reading of certificate
-            files would fail if all file descriptors below 256 were
-            in use (typically, if many connections were open). This
-            problem has been worked around.</p>
-          <p>The ssl application's port program used to use
-            select(), which meant that it could not handle more than
-            FD_SETSIZE file descriptors (usually 1024). To eliminate
-            that limitation, poll() is now used on all platforms that
-            support it.</p>
-          <p>Solaris/Sparc, 64-bit emulator: The SO_REUSEADDR
-            option was not set for listen sockets, which essentially
-            made the ssl application unusable. Corrected.</p>
-          <p>The default listen queue size for ssl port program was
-            changed to 128 (from 5).</p>
-          <p>Own Id: OTP-5755 Aux Id: seq10068 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Ssl 3.0.7</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The R/W buffer length i esock.c was too small. It has
-            been increased from 4k to 32k.</p>
-          <p>Own Id: OTP-5620</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Ssl 3.0.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>A configuration option for choosing protocol versions has
-            been added (<c>sslv2</c>, <c>sslv3</c>, and
-            <c>tlsv1</c>).</p>
-          <p>Own Id: OTP-5429 Aux Id: seq9755 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Ssl 3.0.5</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Linked in drivers in the crypto, and asn1 applications
-            are now compiled with the -D_THREAD_SAFE and -D_REENTRANT
-            switches on unix when the emulator has thread support
-            enabled.</p>
-          <p>Linked in drivers on MacOSX are not compiled with the
-            undocumented -lbundle1.o switch anymore. Thanks to Sean
-            Hinde who sent us a patch.</p>
-          <p>Linked in driver in crypto, and port programs in ssl, now
-            compiles on OSF1.</p>
-          <p>Minor makefile improvements in runtime_tools.</p>
-          <p>Own Id: OTP-5346</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Ssl 3.0.4</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p><c>ssl:recv/3</c> with finite timeout value, closed the
-            connection at timeout.</p>
-          <p>Own Id: OTP-4882</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Ssl 3.0.3</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <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>
-        </item>
-        <item>
-          <p>When the number of open file descriptors reached
-            FD_SETSIZE, the SSL port program entered a busy loop.</p>
-          <p>Own Id: OTP-5094 Aux Id: seq8806 </p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The SSL application now supports SSL sessions for
-            servers, which typically speeds up HTTP requests from
-            browsers.</p>
-          <p>Own Id: OTP-5095</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The UTF8String type is now defined in asn1-1.4.4.2 and
-            later.  Therefore the definitions of UTF8String has been
-            removed from the ASN.1 modules PKIX1Explicit88.asn1 and
-            PKIXAttributeCertificate.asn1. The SSL application can now
-            only be built using asn-1.4.4.2 or later.</p>
-          <p>OwnId: OTP-4971.</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <p>See SSL-3.0.
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>An unexpected object identifier would crash <c>ssl:peercert</c>. </p>
-          <p>OwnId: OTP-4771.</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <p>See SSL-3.0.
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 3.0</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The <c>cache_timout</c> option was silently ignored. It had 
-            to do with SSL sessions, where multiple connections can occur.
-            Since the Erlang SSL application does not support sessions the
-            option is still ignored, and consequently  the documentation 
-            about it has been removed.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>The Erlang SSL application is now based on OpenSSL version
-            0.9.7a. OpenSSL 0.9.6 should also work.</p>
-          <p>OwnId: OTP-4002</p>
-        </item>
-        <item>
-          <p>When connecting it is now possible to bind to a local address
-            and local port. </p>
-          <p>OwnId: OTP-4675</p>
-        </item>
-        <item>
-          <p>The <c>ssl_esock</c> port program is now part of the
-            distribution and thus does not have to be created
-            explicitly.  It is dynamically linked to OpenSSL
-            libraries in a "standard" location (typically
-            <c>/usr/local/lib</c> on UNIX; in the path on Win32).</p>
-          <p>OwnId:
-            OTP-4676</p>
-        </item>
-        <item>
-          <p>The new functions <c>ssl:peercert/1/2</c> provide information
-            from the certificate of a peer of a connection.</p>
-          <p>OwnId: OTP-4680 
-                        <br></br>
-Aux Id: seq7688</p>
-        </item>
-        <item>
-          <p>The function <c>ssl:port/1</c> has been removed from the 
-            documentation, but not from the <c>ssl</c> interface module. 
-            The recommendation is to use <c>ssl:peername/1</c>
-            instead, which provides both address and port of the peer.</p>
-          <p>OwnId: OTP-4681 </p>
-        </item>
-        <item>
-          <p>New User's Guide documentation has been added.</p>
-          <p>OwnId: OTP-4682 </p>
-        </item>
-        <item>
-          <p>The old <c>ssl_socket</c> interface has been removed and also
-            the documentation of it. </p>
-          <p>OwnId: OTP-4683 </p>
-        </item>
-        <item>
-          <p>The use of ephemeral RSA keys is now supported. It is
-            a global configuration option (see the ssl(6) manual page).</p>
-          <p>OwnId: OTP-4691.</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The option <c>cacertfile</c> is now in effect, and can
-            therefore no longer be set with the OS environment
-            variable SSL_CERT_FILE (which did set the same value for
-            all connections).  </p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>There was a synchronization error at closing of an SSL 
-            connection. </p>
-          <p>OwnId: OTP-4435
-                        <br></br>
-Aux Id: seq7534</p>
-        </item>
-        <item>
-          <p>C macros in <c>debuglog.c</c> were not ANSI C compliant.</p>
-          <p>OwnId: OTP-4674</p>
-        </item>
-        <item>
-          <p>The <c>binary</c> option was not properly handled.</p>
-          <p>OwnId: OTP-4678</p>
-        </item>
-        <item>
-          <p>The <c>ssl:format_error/1</c> did not consider <c>inet</c>
-            error codes, nor did it have a catch all for unknown error
-            codes.</p>
-          <p>OwnId: OTP-4679</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <list type="bulleted">
-        <item>
-          <p>Change of controlling process in not OTP compliant. </p>
-          <p>OwnId; OTP-4712</p>
-        </item>
-        <item>
-          <p>There is still no way to restrict the cipher sizes. </p>
-          <p>OwnId: OTP-4712</p>
-        </item>
-        <item>
-          <p>The <c>keep_alive</c> and <c>reuse_addr</c> options will be
-            added in a future release.  </p>
-          <p>OwnId: OTP-4677</p>
-        </item>
-        <item>
-          <p>There is currently no way to restrict the SSL/TLS
-            protocol versions to use. In a future release this will be
-            supported as a configuration option, and as an option for
-            each connection as well.  </p>
-          <p>OwnId: OTP-4711.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3.6</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>There was a synchronization error at closing, which could 
-            result in that an SSL socket was removed prematurely, resulting
-            in that a user process referring to it received an unexpected
-            exit.</p>
-          <p>OwnId: OTP-4435
-                        <br></br>
-Aux Id: seq7600</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <p>See SSL 2.2 .  </p>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3.5</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Setting of the option `nodelay' caused the SSL port program
-            to dump core.</p>
-          <p>OwnId: OTP-4380
-                        <br></br>
-Aux Id: -</p>
-        </item>
-        <item>
-          <p>Setting of the option '{active, once}' in <c>setopts</c> was 
-            wrong, causing a correct socket message to be regarded as
-            erroneous. </p>
-          <p>OwnId: OTP-4380 
-                        <br></br>
-Aux Id: -</p>
-        </item>
-        <item>
-          <p>A self-signed peer certificate was always rejected with the
-            error `eselfsignedcert', irrespective of the `depth' value. </p>
-          <p>OwnId: OTP-4374
-                        <br></br>
-Aux Id: seq7417</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <p>See SSL 2.2 .  </p>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>All TCP options allowed in gen_tcp, are now also allowed in
-            SSL, except the option <c>{reuseaddr, Boolean}</c>. A new
-            function <c>getopts</c> has been added to the SSL interface
-            module <c>ssl</c>. </p>
-          <p>OwnId: OTP-4305, OTP-4159</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3.3</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The roles of the SSLeay and OpenSSL packages has been
-            clarified in the ssl(6) application manual page. Also
-            the URLs from which to download SSLeay has been updated.</p>
-          <p>OwnId: OTP-4002
-                        <br></br>
-Aux Id: seq5269</p>
-        </item>
-        <item>
-          <p>A call to <c>ssl:listen(Port, Options)</c> with
-            <c>Options = []</c> resulted in the cryptic <c>{error, ebadf}</c> return value. The return value has been changed
-            to <c>{error, enooptions}</c>, and the behaviour has been
-            documented in the <c>listen/2</c> function.</p>
-          <p>OwnId: OTP-4016 
-                        <br></br>
-Aux Id: seq7006</p>
-        </item>
-        <item>
-          <p>Use of the option <c>{nodelay, boolean()}</c> crashed
-            the <c>ssl_server</c>.</p>
-          <p>OwnId: OTP-4070
-                        <br></br>
-Aux Id:</p>
-        </item>
-        <item>
-          <p>A bug caused the Erlang distribution over ssl to fail.
-            This bug has now been fixed.</p>
-          <p>OwnId: OTP-4072
-                        <br></br>
-Aux Id:</p>
-        </item>
-        <item>
-          <p>On Windows when the SSL port program encountered an
-            error code not anticipated it crashed.  </p>
-          <p>OwnId: OTP-4132
-                        <br></br>
-Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The <c>ssl:accept/1-2</c> function sometimes returned
-            <c>{error, {What, Where}}</c> instead of <c>{error, What}</c>, where <c>What</c> is an atom.  </p>
-          <p>OwnId: OTP-3775
-                        <br></br>
-Aux Id: seq4991</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Sometimes the SSL portprogram would loop in an accept
-            loop, without terminating even when the SSL application
-            was stopped..  </p>
-          <p>OwnId: OTP-3691</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.3</title>
-    <p>Functions have been added to SSL to experimentally support 
-      Erlang distribution.
-      </p>
-  </section>
-
-  <section>
-    <title>SSL 2.2.1</title>
-    <p>The 2.2.1 version of SSL provides code replacement in runtime
-      by upgrading from, or downgrading to, versions 2.1 and 2.2.
-      </p>
-  </section>
-
-  <section>
-    <title>SSL 2.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The restriction that only the creator of an SSL socket can
-            read from and write to the socket has been lifted.</p>
-          <p>OwnId: OTP-3301</p>
-        </item>
-        <item>
-          <p>The option <c>{packet, cdr}</c> for SSL sockets has been added,
-            which means that SSL sockets also supports CDR encoded packets.</p>
-          <p>OwnId: OTP-3302</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <list type="bulleted">
-        <item>
-          <p>Setting of a CA certificate file with the <c>cacertfile</c>
-            option (in calls to <c>ssl:accept/1/2</c> or 
-            <c>ssl:connect/3/4</c>) does not work due to weaknesses
-            in the SSLeay package. </p>
-          <p>A work-around is to set the OS environment variable
-            <c>SSL_CERT_FILE</c> before SSL is started. However, then
-            the CA certificate file will be global for all connections.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>When changing controlling process of an SSL socket, a 
-            temporary process is started, which is not gen_server
-            compliant.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>Although there is a <c>cache</c> timeout option, it is
-            silently ignored.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>There is currently no way to restrict the cipher sizes.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The set of possible error reasons has been extended to
-            contain diagnostics on erroneous certificates and failures
-            to verify certificates.</p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-        <item>
-          <p>The maximum number of simultaneous SSL connections on
-            Windows has been increased from 31 to 127.</p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>A dead-lock occurring when write queues are not empty has 
-            been removed.  </p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-        <item>
-          <p>Error reasons have been unified and changed.</p>
-          <p>(** POTENTIAL INCOMPATIBILITY **)</p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-        <item>
-          <p>On Windows a check of the existence of the environment
-            variable <c>ERLSRV_SERVICE_NAME</c> has been added. If
-            that variable is defined, the port program of the SSL
-            application will not terminated when a user logs off.</p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-        <item>
-          <p>An error in the setting of the <c>nodelay</c> option 
-            has been corrected.</p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-        <item>
-          <p>The confounded notions of verify mode and verify depth has
-            been corrected. The option <c>verifydepth</c> has been 
-            removed, and the two separate options <c>verify</c> and
-            <c>depth</c> has been added.</p>
-          <p>(** POTENTIAL INCOMPATIBILITY **)</p>
-          <p>OwnId: OTP-3145</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Known Bugs and Problems</title>
-      <list type="bulleted">
-        <item>
-          <p>Setting of a CA certificate file with the <c>cacertfile</c>
-            option (in calls to <c>ssl:accept/1/2</c> or 
-            <c>ssl:connect/3/4</c>) does not work due to weaknesses
-            in the SSLeay package. </p>
-          <p>A work-around is to set the OS environment variable
-            <c>SSL_CERT_FILE</c> before SSL is started. However, then
-            the CA certificate file will be global for all connections.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>When changing controlling process of an SSL socket, a 
-            temporary process is started, which is not gen_server
-            compliant.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>Although there is a <c>cache</c> timeout option, it is
-            silently ignored.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-        <item>
-          <p>There is currently no way to restrict the cipher sizes.</p>
-          <p>OwnId: OTP-3146</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>SSL 2.0</title>
-    <p>A complete new version of SSL with separate I/O channels
-      for all connections with non-blocking I/O multiplexing.</p>
-  </section>
 </chapter>
 
 
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index f0eac76264..e45a4c774f 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -36,8 +36,8 @@
 
     <list type="bulleted">
       <item>ssl requires the crypto and public_key applications.</item>
-      <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0, experimental
-      support for TLS-1.1 and TLS-1.2 is also available (no support for elliptic curve cipher suites yet).</item>
+      <item>Supported SSL/TLS-versions are SSL-3.0, TLS-1.0,
+      TLS-1.1 and TLS-1.2 (no support for elliptic curve cipher suites yet).</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>
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 2ba6f48611..178bbcaebb 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
@@ -29,7 +29,17 @@
   sockets.</appsummary>
 
   <section>
-    <title>Environment</title>
+    <title>DEPENDENCIES</title>
+    <p>The ssl application uses the Erlang applications public_key and
+    crypto to handle public keys and encryption, hence these
+    applications needs to be loaded for the ssl application to work. In
+    an embedded environment that means they need to be started with
+    application:start/[1,2] before the ssl application is started.
+    </p>
+  </section>
+
+  <section>
+    <title>ENVIRONMENT</title>
     <p>The following application environment configuration parameters
       are defined for the SSL application. Refer to application(3) for
       more information about configuration parameters.
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 17268a634d..f540dc999b 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -25,9 +25,8 @@
     <file>ssl_protocol.xml</file>
   </header>
   
-  <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>The erlang SSL application currently implements the protocol SSL/TLS
+  for currently supported versions see <seealso marker="ssl">ssl(3)</seealso>
   </p>
 
   <p>By default erlang SSL is run over the TCP/IP protocol even
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 6be8a1456e..043645be41 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -108,10 +108,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET):	$(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 9b1227fa7f..76e14860ec 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,13 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"5.1.1", [{restart_application, ssl}]
-  },
-  {"5.1", [
-	   {load_module, ssl_connection, soft_purge, soft_purge, []}
-	  ]
-  },
+  {<<"5.1\\*">>, [{restart_application, ssl}]},
   {<<"5.0\\*">>, [{restart_application, ssl}]},
   {<<"4\\.*">>, [{restart_application, ssl}]},
   {<<"3\\.*">>, [{restart_application, ssl}]}
  ], 
  [
-  {"5.1.1", [{restart_application, ssl}]
-  },
-  {"5.1", [
-	   {load_module, ssl_connection, soft_purge, soft_purge, []}
-	  ]
-  },
-  {"5.1", [{restart_application, ssl}]},
+  {<<"5.1\\*">>, [{restart_application, ssl}]},
   {<<"5.0\\*">>, [{restart_application, ssl}]},
   {<<"4\\.*">>, [{restart_application, ssl}]},
   {<<"3\\.*">>, [{restart_application, ssl}]}
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 6224334a6e..09f2819ca8 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -28,14 +28,11 @@
 	 cipher_suites/0, cipher_suites/1, suite_definition/1,
 	 close/1, shutdown/2,
 	 connect/3, connect/2, connect/4, connection_info/1,
-	 controlling_process/2, listen/2, pid/1, peername/1, peercert/1,
+	 controlling_process/2, listen/2, peername/1, peercert/1,
 	 recv/2, recv/3, send/2, getopts/2, setopts/2, sockname/1,
 	 versions/0, session_info/1, format_error/1,
 	 renegotiate/1, prf/5, clear_pem_cache/0, random_bytes/1, negotiated_next_protocol/1]).
 
-
--deprecated({pid, 1, next_major_release}).
-
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
@@ -956,12 +953,3 @@ make_next_protocol_selector({server, AllProtocols, DefaultProtocol}) ->
             PreferredProtocol -> PreferredProtocol
         end
     end.
-                                
-%% Only used to remove exit messages from old ssl
-%% First is a nonsense clause to provide some
-%% backward compatibility for orber that uses this
-%% function in a none recommended way, but will
-%% work correctly if a valid pid is returned.
-%% Deprcated to be removed in r16
-pid(#sslsocket{})->
-    whereis(ssl_connection_sup).
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index 222b3f1ad7..f94a1136a0 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The 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,7 @@
 %% Internal application API
 %%====================================================================
 %%--------------------------------------------------------------------
--spec reason_code(#alert{}, client | server) -> closed | esslconnect |
-						esslaccept | string().
+-spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
 %%
 %% Description: Returns the error reason that will be returned to the
 %% user.
@@ -45,12 +44,8 @@
 
 reason_code(#alert{description = ?CLOSE_NOTIFY}, _) ->
     closed;
-reason_code(#alert{description = ?HANDSHAKE_FAILURE}, client) ->
-    esslconnect;
-reason_code(#alert{description = ?HANDSHAKE_FAILURE}, server) ->
-    esslaccept;
 reason_code(#alert{description = Description}, _) ->
-    description_txt(Description).
+    {essl, description_txt(Description)}.
 
 %%--------------------------------------------------------------------
 -spec alert_txt(#alert{}) -> string().
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index cde13069b5..68f6a4d4c1 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1135,7 +1135,7 @@ init_certificates(#ssl_options{cacerts = CaCerts,
 	    {ok, _, _, _, _, _} = ssl_manager:connection_init(Certs, Role)
 	catch
 	    Error:Reason ->
-		handle_file_error(?LINE, Error, Reason, CACertFile, ecacertfile,
+		handle_file_error(?LINE, Error, Reason, CACertFile, {ecacertfile, Reason},
 				  erlang:get_stacktrace())
 	end,
     init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, CertFile, Role).
@@ -1157,7 +1157,7 @@ init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHan
 	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, OwnCert}
     catch
 	Error:Reason ->
-	    handle_file_error(?LINE, Error, Reason, CertFile, ecertfile,
+	    handle_file_error(?LINE, Error, Reason, CertFile, {ecertfile, Reason},
 			      erlang:get_stacktrace())
     end;
 init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, _, _) ->
@@ -1176,7 +1176,7 @@ init_private_key(DbHandle, undefined, KeyFile, Password, _) ->
 	private_key(public_key:pem_entry_decode(PemEntry, Password))
     catch 
 	Error:Reason ->
-	    handle_file_error(?LINE, Error, Reason, KeyFile, ekeyfile,
+	    handle_file_error(?LINE, Error, Reason, KeyFile, {ekeyfile, Reason},
 			      erlang:get_stacktrace()) 
     end;
 
@@ -1234,7 +1234,7 @@ init_diffie_hellman(DbHandle,_, DHParamFile, server) ->
     catch
 	Error:Reason ->
 	    handle_file_error(?LINE, Error, Reason, 
-			      DHParamFile, edhfile,  erlang:get_stacktrace()) 
+			      DHParamFile, {edhfile, Reason},  erlang:get_stacktrace()) 
     end.
 
 sync_send_all_state_event(FsmPid, Event) ->
@@ -1628,78 +1628,49 @@ 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,
-		       hashsign = HashSign},
-  #state{negotiated_version = Version,
-	 public_key_info = PubKeyInfo,
-	 connection_states = ConnectionStates} = State) ->
-     
-    PLen = size(P),
-    GLen = size(G),
-    YLen = size(ServerPublicDhKey),
-    HashAlgo = connection_hash_algo(HashSign, State),
+handle_server_key(#server_key_exchange{exchange_keys = Keys},
+		  #state{key_algorithm = KeyAlg,
+			 negotiated_version = Version} = State) ->
+    Params = ssl_handshake:decode_server_key(Keys, KeyAlg, Version),
+    HashSign = connection_hashsign(Params#server_key_params.hashsign, State),
+    case HashSign of
+	{_, anon} ->
+	    server_master_secret(Params#server_key_params.params, State);
+	_ ->
+	    verify_server_key(Params, HashSign, State)
+    end.
 
-    ConnectionState = 
+verify_server_key(#server_key_params{params = Params,
+				     params_bin = EncParams,
+				     signature = Signature},
+		  HashSign = {HashAlgo, _},
+		  #state{negotiated_version = Version,
+			 public_key_info = PubKeyInfo,
+			 connection_states = ConnectionStates} = State) ->
+    ConnectionState =
 	ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = ConnectionState#connection_state.security_parameters,
     #security_parameters{client_random = ClientRandom,
 			 server_random = ServerRandom} = SecParams, 
     Hash = ssl_handshake:server_key_exchange_hash(HashAlgo,
-						  <<ClientRandom/binary, 
-						   ServerRandom/binary, 
-						   ?UINT16(PLen), P/binary, 
-						   ?UINT16(GLen), G/binary,
-						   ?UINT16(YLen),
-						   ServerPublicDhKey/binary>>),
-
-    case verify_dh_params(Version, Signed, Hash, HashAlgo, PubKeyInfo) of
+						  <<ClientRandom/binary,
+						    ServerRandom/binary,
+						    EncParams/binary>>),
+    case ssl_handshake:verify_signature(Version, Hash, HashSign, Signature, PubKeyInfo) of
 	true ->
-	    dh_master_secret(P, G, ServerPublicDhKey, undefined, State);
+	    server_master_secret(Params, State);
 	false ->
 	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
     end.
 
-verify_dh_params({3, Minor}, Signed, Hashes, HashAlgo, {?rsaEncryption, PubKey, _PubKeyParams})
-  when Minor >= 3 ->
-    public_key:verify({digest, Hashes}, HashAlgo, Signed, PubKey);
-verify_dh_params(_Version, Signed, Hashes, _HashAlgo, {?rsaEncryption, PubKey, _PubKeyParams}) ->
-    case public_key:decrypt_public(Signed, PubKey, 
-				   [{rsa_pad, rsa_pkcs1_padding}]) of
-	Hashes ->
-	    true;
-	_ ->
-	    false
-    end;
-verify_dh_params(_Version, Signed, Hash, HashAlgo, {?'id-dsa', PublicKey, PublicKeyParams}) ->
-    public_key:verify({digest, Hash}, HashAlgo, 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});
+server_master_secret(#server_dh_params{dh_p = P, dh_g = G, dh_y = ServerPublicDhKey},
+		     State) ->
+    dh_master_secret(P, G, ServerPublicDhKey, undefined, State).
 
-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]),
+master_from_premaster_secret(PremasterSecret,
+			     #state{session = Session,
+				    negotiated_version = Version, role = Role,
+				    connection_states = ConnectionStates0} = State) ->
     case ssl_handshake:master_secret(Version, PremasterSecret,
 				     ConnectionStates0, Role) of
 	{MasterSecret, ConnectionStates} ->
@@ -1711,6 +1682,19 @@ dh_master_secret(PMpint, GMpint, PublicDhKey, PrivateDhKey,
 	    Alert
     end.
 
+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) ->
+    PremasterSecret =
+	crypto:dh_compute_key(mpint_binary(PublicDhKey), PrivateDhKey,
+			      [PMpint, GMpint]),
+    master_from_premaster_secret(PremasterSecret, State).
+
 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,
@@ -2485,10 +2469,10 @@ get_pending_connection_state_prf(CStates, Direction) ->
 	CS = ssl_record:pending_connection_state(CStates, Direction),
 	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
 
-connection_hash_algo({HashAlgo, _}, _State) ->
-    HashAlgo;
-connection_hash_algo(_, #state{hashsign_algorithm = {HashAlgo, _}}) ->
-    HashAlgo.
+connection_hashsign(HashSign = {_, _}, _State) ->
+    HashSign;
+connection_hashsign(_, #state{hashsign_algorithm = HashSign}) ->
+    HashSign.
 
 %% RFC 5246, Sect. 7.4.1.4.1.  Signature Algorithms
 %% If the client does not send the signature_algorithms extension, the
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index db21dac942..1929370991 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -32,10 +32,10 @@
 
 -export([master_secret/4, client_hello/8, server_hello/5, hello/4,
 	 hello_request/0, certify/7, certificate/4,
-	 client_certificate_verify/6, certificate_verify/6,
+	 client_certificate_verify/6, certificate_verify/6, verify_signature/5,
 	 certificate_request/3, key_exchange/3, server_key_exchange_hash/2,
 	 finished/5, verify_connection/6, get_tls_handshake/3,
-	 decode_client_key/3, server_hello_done/0,
+	 decode_client_key/3, decode_server_key/3, server_hello_done/0,
 	 encode_handshake/2, init_handshake_history/0, update_handshake_history/2,
 	 decrypt_premaster_secret/2, prf/5, next_protocol/1]).
 
@@ -320,25 +320,36 @@ client_certificate_verify(OwnCert, MasterSecret, Version,
 %%
 %% Description: Checks that the certificate_verify message is valid.
 %%--------------------------------------------------------------------
-certificate_verify(Signature, {?'rsaEncryption', PublicKey, _}, Version,
-		   {HashAlgo, _SignAlgo}, MasterSecret, {_, Handshake}) ->
-    Hashes = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
-    case certificate_verify_rsa(Hashes, HashAlgo, Signature, PublicKey, Version) of
+certificate_verify(Signature, PublicKeyInfo, Version,
+		   HashSign = {HashAlgo, _}, MasterSecret, {_, Handshake}) ->
+    Hash = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
+    case verify_signature(Version, Hash, HashSign, Signature, PublicKeyInfo) of
 	true ->
 	    valid;
 	_ ->
-	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
-    end;
-certificate_verify(Signature, {?'id-dsa', PublicKey, PublicKeyParams}, Version,
-		   {HashAlgo, _SignAlgo}, MasterSecret, {_, Handshake}) ->
-    Hashes = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
-    case public_key:verify({digest, Hashes}, sha, Signature, {PublicKey, PublicKeyParams}) of
-	true ->
-	    valid;
-	false ->
     	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
     end.
 
+%%--------------------------------------------------------------------
+-spec verify_signature(tls_version(), binary(), {term(), term()}, binary(),
+				   public_key_info()) -> true | false.
+%%
+%% Description: Checks that a public_key signature is valid.
+%%--------------------------------------------------------------------
+verify_signature(_Version, _Hash, {_HashAlgo, anon}, _Signature, _) ->
+    true;
+verify_signature({3, Minor}, Hash, {HashAlgo, rsa}, Signature, {?rsaEncryption, PubKey, _PubKeyParams})
+  when Minor >= 3 ->
+    public_key:verify({digest, Hash}, HashAlgo, Signature, PubKey);
+verify_signature(_Version, Hash, _HashAlgo, Signature, {?rsaEncryption, PubKey, _PubKeyParams}) ->
+    case public_key:decrypt_public(Signature, PubKey,
+				   [{rsa_pad, rsa_pkcs1_padding}]) of
+	Hash -> true;
+	_    -> false
+    end;
+verify_signature(_Version, Hash, {HashAlgo, dsa}, Signature, {?'id-dsa', PublicKey, PublicKeyParams}) ->
+    public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams}).
+
 
 %%--------------------------------------------------------------------
 -spec certificate_request(#connection_states{}, db_handle(), certdb_ref()) ->
@@ -382,31 +393,33 @@ key_exchange(client, _Version, {dh, <<?UINT32(Len), PublicKey:Len/binary>>}) ->
 
 key_exchange(server, Version, {dh, {<<?UINT32(Len), PublicKey:Len/binary>>, _},
 		      #'DHParameter'{prime = P, base = G},
-		      {HashAlgo, SignAlgo}, ClientRandom, ServerRandom, PrivateKey}) ->
+		      HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
     <<?UINT32(_), PBin/binary>> = crypto:mpint(P),
     <<?UINT32(_), GBin/binary>> = crypto:mpint(G),
-    PLen = byte_size(PBin),
-    GLen = byte_size(GBin),
-    YLen = byte_size(PublicKey),
     ServerDHParams = #server_dh_params{dh_p = PBin, 
 				       dh_g = GBin, dh_y = PublicKey},    
+    enc_server_key_exchange(Version, ServerDHParams, HashSign,
+			    ClientRandom, ServerRandom, PrivateKey).
 
+enc_server_key_exchange(Version, Params, {HashAlgo, SignAlgo},
+			ClientRandom, ServerRandom, PrivateKey) ->
+    EncParams = enc_server_key(Params),
     case HashAlgo of
 	null ->
-	    #server_key_exchange{params = ServerDHParams,
-				 signed_params = <<>>,
-				 hashsign = {null, anon}};
+	    #server_key_params{params = Params,
+			       params_bin = EncParams,
+			       hashsign = {null, anon},
+			       signature = <<>>};
 	_ ->
 	    Hash =
 		server_key_exchange_hash(HashAlgo, <<ClientRandom/binary,
-						    ServerRandom/binary,
-						    ?UINT16(PLen), PBin/binary,
-						    ?UINT16(GLen), GBin/binary,
-						    ?UINT16(YLen), PublicKey/binary>>),
-	    Signed = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
-	    #server_key_exchange{params = ServerDHParams,
-				 signed_params = Signed,
-				 hashsign = {HashAlgo, SignAlgo}}
+						     ServerRandom/binary,
+						     EncParams/binary>>),
+	    Signature = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
+	    #server_key_params{params = Params,
+			       params_bin = EncParams,
+			       hashsign = {HashAlgo, SignAlgo},
+			       signature = Signature}
     end.
 
 %%--------------------------------------------------------------------
@@ -523,6 +536,15 @@ decode_client_key(ClientKey, Type, Version) ->
     dec_client_key(ClientKey, key_exchange_alg(Type), Version).
 
 %%--------------------------------------------------------------------
+-spec decode_server_key(binary(), key_algo(), tls_version()) ->
+			       #server_key_params{}.
+%%
+%% Description: Decode server_key data and return appropriate type
+%%--------------------------------------------------------------------
+decode_server_key(ServerKey, Type, Version) ->
+    dec_server_key(ServerKey, key_exchange_alg(Type), Version).
+
+%%--------------------------------------------------------------------
 -spec init_handshake_history() -> tls_handshake_history().
 
 %%
@@ -975,31 +997,8 @@ dec_hs(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
        next_protocol_negotiation = NextProtocolNegotiation};
 dec_hs(_Version, ?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
     #certificate{asn1_certificates = certs_to_list(ASN1Certs)};
-
-dec_hs(_Version, ?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
-			      ?UINT16(GLen), G:GLen/binary,
-			      ?UINT16(YLen), Y:YLen/binary,
-			       ?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 = <<>>, hashsign = {null, anon}};
-dec_hs({Major, Minor}, ?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
-			      ?UINT16(GLen), G:GLen/binary,
-			      ?UINT16(YLen), Y:YLen/binary,
-			      ?BYTE(HashAlgo), ?BYTE(SignAlgo),
-			      ?UINT16(Len), Sig:Len/binary>>)
-  when Major == 3, Minor >= 3 ->
-    #server_key_exchange{params = #server_dh_params{dh_p = P,dh_g = G,
-						    dh_y = Y},
-			 signed_params = Sig,
-			 hashsign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)}};
-dec_hs(_Version, ?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, hashsign = undefined};
+dec_hs(_Version, ?SERVER_KEY_EXCHANGE, Keys) ->
+    #server_key_exchange{exchange_keys = Keys};
 dec_hs({Major, Minor}, ?CERTIFICATE_REQUEST,
        <<?BYTE(CertTypesLen), CertTypes:CertTypesLen/binary,
 	?UINT16(HashSignsLen), HashSigns:HashSignsLen/binary,
@@ -1039,6 +1038,42 @@ dec_client_key(<<?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
 	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
     #client_diffie_hellman_public{dh_public = DH_Y}.
 
+dec_ske_params(Len, Keys, Version) ->
+    <<Params:Len/bytes, Signature/binary>> = Keys,
+    dec_ske_signature(Params, Signature, Version).
+
+dec_ske_signature(Params, <<?BYTE(HashAlgo), ?BYTE(SignAlgo),
+			    ?UINT16(0)>>, {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    HashSign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)},
+    {Params, HashSign, <<>>};
+dec_ske_signature(Params, <<?BYTE(HashAlgo), ?BYTE(SignAlgo),
+			    ?UINT16(Len), Signature:Len/binary>>, {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    HashSign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)},
+    {Params, HashSign, Signature};
+dec_ske_signature(Params, <<>>, _) ->
+    {Params, {null, anon}, <<>>};
+dec_ske_signature(Params, <<?UINT16(0)>>, _) ->
+    {Params, {null, anon}, <<>>};
+dec_ske_signature(Params, <<?UINT16(Len), Signature:Len/binary>>, _) ->
+    {Params, undefined, Signature};
+dec_ske_signature(_, _, _) ->
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
+
+dec_server_key(<<?UINT16(PLen), P:PLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, Version) ->
+    Params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
+    {BinMsg, HashSign, Signature} = dec_ske_params(PLen + GLen + YLen + 6, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(_, _, _) ->
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
+
 dec_hello_extensions(<<>>) ->
     [];
 dec_hello_extensions(<<?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
@@ -1156,18 +1191,12 @@ 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, hashsign = HashSign}, Version) ->
-    PLen = byte_size(P),
-    GLen = byte_size(G),
-    YLen = byte_size(Y),
-    Signature = enc_sign(HashSign, SignedParams, Version),
-    {?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P/binary, 
-			    ?UINT16(GLen), G/binary,
-			    ?UINT16(YLen), Y/binary,
-			    Signature/binary>>
-    };
+enc_hs(#server_key_exchange{exchange_keys = Keys}, _Version) ->
+    {?SERVER_KEY_EXCHANGE, Keys};
+enc_hs(#server_key_params{params_bin = Keys, hashsign = HashSign,
+			  signature = Signature}, Version) ->
+    EncSign = enc_sign(HashSign, Signature, Version),
+    {?SERVER_KEY_EXCHANGE, <<Keys/binary, EncSign/binary>>};
 enc_hs(#certificate_request{certificate_types = CertTypes,
 			    hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSignAlgos},
 			    certificate_authorities = CertAuths},
@@ -1211,6 +1240,14 @@ enc_cke(#client_diffie_hellman_public{dh_public = DHPublic}, _) ->
     Len = byte_size(DHPublic),
     <<?UINT16(Len), DHPublic/binary>>.
 
+enc_server_key(#server_dh_params{dh_p = P, dh_g = G, dh_y = Y}) ->
+    PLen = byte_size(P),
+    GLen = byte_size(G),
+    YLen = byte_size(Y),
+    <<?UINT16(PLen), P/binary, ?UINT16(GLen), G/binary, ?UINT16(YLen), Y/binary>>.
+
+enc_sign({_, anon}, _Sign, _Version) ->
+    <<>>;
 enc_sign({HashAlg, SignAlg}, Signature, _Version = {Major, Minor})
   when Major == 3, Minor >= 3->
 	SignLen = byte_size(Signature),
@@ -1328,8 +1365,8 @@ certificate_authorities_from_db(CertDbHandle, CertDbRef) ->
 
 digitally_signed({3, Minor}, Hash, HashAlgo, Key) when Minor >= 3 ->
     public_key:sign({digest, Hash}, HashAlgo, Key);
-digitally_signed(_Version, Hash, _HashAlgo, #'DSAPrivateKey'{} = Key) ->
-    public_key:sign({digest, Hash}, sha, Key);
+digitally_signed(_Version, Hash, HashAlgo, #'DSAPrivateKey'{} = Key) ->
+    public_key:sign({digest, Hash}, HashAlgo, Key);
 digitally_signed(_Version, Hash, _HashAlgo, #'RSAPrivateKey'{} = Key) ->
     public_key:encrypt_private(Hash, Key,
 			       [{rsa_pad, rsa_pkcs1_padding}]).
@@ -1378,19 +1415,6 @@ apply_user_fun(Fun, OtpCert, ExtensionOrError, UserState0, SslState) ->
 	    {unknown, {SslState, UserState}}
     end.
 
-certificate_verify_rsa(Hashes, sha, Signature, PublicKey, {Major, Minor})
-  when Major == 3, Minor >= 3 ->
-    public_key:verify({digest, Hashes}, sha, Signature, PublicKey);
-certificate_verify_rsa(Hashes, HashAlgo, Signature, PublicKey, {Major, Minor})
-  when Major == 3, Minor >= 3 ->
-    public_key:verify({digest, Hashes}, HashAlgo, Signature, PublicKey);
-certificate_verify_rsa(Hashes, _HashAlgo, Signature, PublicKey, _Version) ->
-    case public_key:decrypt_public(Signature, PublicKey,
-				   [{rsa_pad, rsa_pkcs1_padding}]) of
-	Hashes -> true;
-	_      -> false
-    end.
-
 -define(TLSEXT_SIGALG_RSA(MD), {MD, rsa}).
 -define(TLSEXT_SIGALG_DSA(MD), {MD, dsa}).
 
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index 9af6511d68..2414d5b666 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -141,9 +141,14 @@
 	 }).
   
 -record(server_key_exchange, {
+	  exchange_keys
+	 }).
+
+-record(server_key_params, {
 	  params, %% #server_rsa_params{} | #server_dh_params{}
-	  signed_params, %% #signature{}
-	  hashsign %% term(atom(), atom())
+	  params_bin,
+	  hashsign, %% term(atom(), atom())
+	  signature %% #signature{}
 	 }).
 	
 %% enum { anonymous, rsa, dsa } SignatureAlgorithm;
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index a5db2dcee7..ed0dc34adf 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -69,8 +69,8 @@
 -define(TRUE, 0).
 -define(FALSE, 1).
 
--define(DEFAULT_SUPPORTED_VERSIONS, [tlsv1, sslv3]). %% Add 'tlsv1.1' in R16
 -define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
+-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
 
 -record(ssl_options, {
 	  versions,   % 'tlsv1.2' | 'tlsv1.1' | tlsv1 | sslv3
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 13689ce7d8..14fba72d86 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -142,8 +142,14 @@ lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) ->
 new_session_id(Port) ->
     call({new_session_id, Port}).
 
+%%--------------------------------------------------------------------
+-spec clean_cert_db(reference(), binary()) -> term().
+%%
+%% Description: Send clean request of cert db to ssl_manager process should
+%% be called by ssl-connection processes. 
+%%--------------------------------------------------------------------
 clean_cert_db(Ref, File) ->
-    erlang:send_after(?CLEAN_CERT_DB, self(), {clean_cert_db, Ref, File}).
+    erlang:send_after(?CLEAN_CERT_DB, get(ssl_manager), {clean_cert_db, Ref, File}).
 
 %%--------------------------------------------------------------------
 -spec register_session(inet:port_number(), #session{}) -> ok.
@@ -320,19 +326,12 @@ handle_info(clear_pem_cache, #state{certificate_db = [_,_,PemChace]} = State) ->
 
 handle_info({clean_cert_db, Ref, File},
 	    #state{certificate_db = [CertDb,RefDb, PemCache]} = State) ->
-    case ssl_certificate_db:ref_count(Ref, RefDb, 0) of
-	0 ->
-	    MD5 = crypto:md5(File),
-	    case ssl_certificate_db:lookup_cached_pem(PemCache, MD5) of
-		[{Content, Ref}] ->
-		    ssl_certificate_db:insert(MD5, Content, PemCache);
-		undefined ->
-		    ok
-	    end,
-	    ssl_certificate_db:remove(Ref, RefDb),
-	    ssl_certificate_db:remove_trusted_certs(Ref, CertDb);
+    
+    case ssl_certificate_db:lookup(Ref, RefDb) of
+	undefined -> %% Alredy cleaned
+	    ok;
 	_ ->
-	    ok
+	    clean_cert_db(Ref, CertDb, RefDb, PemCache, File)
     end,
     {noreply, State};
 
@@ -464,3 +463,19 @@ new_id(Port, Tries, Cache, CacheCb) ->
 	_ ->
 	    new_id(Port, Tries - 1, Cache, CacheCb)
     end.
+
+clean_cert_db(Ref, CertDb, RefDb, PemCache, File) ->
+    case ssl_certificate_db:ref_count(Ref, RefDb, 0) of
+	0 ->	  
+	    MD5 = crypto:md5(File),
+	    case ssl_certificate_db:lookup_cached_pem(PemCache, MD5) of
+		[{Content, Ref}] ->
+		    ssl_certificate_db:insert(MD5, Content, PemCache);		
+		_ ->
+		    ok
+	    end,
+	    ssl_certificate_db:remove(Ref, RefDb),
+	    ssl_certificate_db:remove_trusted_certs(Ref, CertDb);
+	_ ->
+	    ok
+    end.
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 8e93ce4634..173b9611c6 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -463,10 +463,9 @@ supported_protocol_versions() ->
 supported_protocol_versions([]) ->
     Vsns = case sufficient_tlsv1_2_crypto_support() of
 	       true ->
-		   %%?ALL_SUPPORTED_VERSIONS; %% Add TlS-1.2 as default in R16
-		   ?DEFAULT_SUPPORTED_VERSIONS;
+		   ?ALL_SUPPORTED_VERSIONS;
 	       false ->
-		   ?DEFAULT_SUPPORTED_VERSIONS
+		   ?MIN_SUPPORTED_VERSIONS
 	   end,
     application:set_env(ssl, protocol_version, Vsns),
     Vsns;
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index d36dcb588b..847907cde8 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -37,15 +37,16 @@ VSN=$(GS_VSN)
 MODULES = \
 	ssl_test_lib \
 	ssl_basic_SUITE \
-	ssl_handshake_SUITE \
-	ssl_packet_SUITE \
 	ssl_cipher_SUITE \
-	ssl_payload_SUITE \
-	ssl_to_openssl_SUITE \
-	ssl_session_cache_SUITE	\
+	ssl_certificate_verify_SUITE\
 	ssl_dist_SUITE \
+	ssl_handshake_SUITE \
 	ssl_npn_hello_SUITE \
 	ssl_npn_handshake_SUITE \
+	ssl_packet_SUITE \
+	ssl_payload_SUITE \
+	ssl_session_cache_SUITE	\
+	ssl_to_openssl_SUITE \
 	make_certs\
 	erl_make_certs
 
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index faed91e559..df84acacdc 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The 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,127 +41,10 @@
 -define(RENEGOTIATION_DISABLE_TIME, 12000).
 -define(CLEAN_SESSION_DB, 60000).
 
-%% 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),
-    catch crypto:stop(),
-    try crypto:start() of
-	ok ->
-	    application:start(public_key),
-
-	    %% 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]
-    catch _:_ ->
-	    {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
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-init_per_testcase(no_authority_key_identifier, Config) ->
-    %% Clear cach so that root cert will not
-    %% be found.
-    ssl:clear_pem_cache(),
-    Config;
 
-init_per_testcase(protocol_versions, Config)  ->
-    ssl:stop(),
-    application:load(ssl),
-    %% For backwards compatibility sslv2 should be filtered out.
-    application:set_env(ssl, protocol_version, [sslv2, sslv3, tlsv1]),
-    ssl:start(),
-    Config;
-
-init_per_testcase(reuse_session_expired, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, session_lifetime, ?EXPIRE),
-    application:set_env(ssl, session_delay_cleanup_time, 500),
-    ssl:start(),
-    Config;
-
-init_per_testcase(empty_protocol_versions, Config)  ->
-    ssl:stop(),
-    application:load(ssl),
-    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) ->
-    test_server:format("TLS/SSL version ~p~n ", [ssl_record:supported_protocol_versions()]),
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
-   [{watchdog, Dog} | Config].
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(reuse_session_expired, Config) ->
-    application:unset_env(ssl, session_lifetime),
-    application:unset_env(ssl, session_delay_cleanup_time),
-    end_per_testcase(default_action, Config);
-
-end_per_testcase(_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() -> 
@@ -183,7 +66,6 @@ groups() ->
      {'tlsv1', [], all_versions_groups() ++ rizzo_tests()},
      {'sslv3', [], all_versions_groups() ++ rizzo_tests()},
      {api,[], api_tests()},
-     {certificate_verify, [], certificate_verify_tests()},
      {session, [], session_tests()},
      {renegotiate, [], renegotiate_tests()},
      {ciphers, [], cipher_tests()},
@@ -192,36 +74,18 @@ groups() ->
 
 all_versions_groups ()->
     [{group, api},
-     {group, certificate_verify},
      {group, renegotiate},
      {group, ciphers},
      {group, error_handling_tests}].
 
-init_per_group(GroupName, Config) ->
-    case ssl_test_lib:is_tls_version(GroupName) of
-	true ->
-	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
-		true ->
-		    ssl_test_lib:init_tls_version(GroupName),
-		    Config;
-		false ->
-		    {skip, "Missing crypto support"}
-	    end;
-	_ ->
-	    ssl:start(),
-	    Config
-    end.
-
-
-end_per_group(_GroupName, Config) ->
-    Config.
 
 basic_tests() ->
     [app,
      alerts,
      send_close,
      connect_twice,
-     connect_dist
+     connect_dist,
+     clear_pem_cache
     ].
 
 options_tests() ->
@@ -242,7 +106,8 @@ options_tests() ->
      protocol_versions,
      empty_protocol_versions,
      ipv6,
-     reuseaddr].
+     reuseaddr,
+     tcp_reuseaddr].
 
 api_tests() ->
     [connection_info,
@@ -264,38 +129,6 @@ api_tests() ->
      ssl_recv_timeout
     ].
 
-certificate_verify_tests() ->
-    [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,
-     new_server_wants_peer_cert,
-     client_verify_none_passive,
-     client_verify_none_active,
-     client_verify_none_active_once,
-     extended_key_usage_verify_peer,
-     extended_key_usage_verify_none,
-     invalid_signature_client,
-     invalid_signature_server,
-     cert_expired,
-     client_with_cert_cipher_suites_handshake,
-     verify_fun_always_run_client,
-     verify_fun_always_run_server,
-     unknown_server_ca_fail,
-     unknown_server_ca_accept_verify_none,
-     unknown_server_ca_accept_verify_peer,
-     unknown_server_ca_accept_backwardscompatibility,
-     no_authority_key_identifier
-    ].
-
 session_tests() ->
     [reuse_session,
      reuse_session_expired,
@@ -335,19 +168,109 @@ rizzo_tests() ->
     [rizzo,
      no_rizzo_rc4].
 
-%% Test cases starts here.
 %%--------------------------------------------------------------------
-app(doc) ->
-    "Test that the ssl app file is ok";
-app(suite) ->
-    [];
+init_per_suite(Config0) ->
+    Dog = ct:timetrap(?LONG_TIMEOUT *2),
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    application:start(public_key),
+
+	    %% make rsa certs using oppenssl
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config0),
+				      ?config(priv_dir, Config0))),
+	    ct:print("Make certs  ~p~n", [Result]),
+
+	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+	    Config = ssl_test_lib:cert_options(Config1),
+	    [{watchdog, Dog} | Config]
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+init_per_testcase(no_authority_key_identifier, Config) ->
+    %% Clear cach so that root cert will not
+    %% be found.
+    ssl:clear_pem_cache(),
+    Config;
+
+init_per_testcase(protocol_versions, Config)  ->
+    ssl:stop(),
+    application:load(ssl),
+    %% For backwards compatibility sslv2 should be filtered out.
+    application:set_env(ssl, protocol_version, [sslv2, sslv3, tlsv1]),
+    ssl:start(),
+    Config;
+
+init_per_testcase(reuse_session_expired, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, session_lifetime, ?EXPIRE),
+    application:set_env(ssl, session_delay_cleanup_time, 500),
+    ssl:start(),
+    Config;
+
+init_per_testcase(empty_protocol_versions, Config)  ->
+    ssl:stop(),
+    application:load(ssl),
+    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) ->
+    ct:print("TLS/SSL version ~p~n ", [ssl_record:supported_protocol_versions()]),
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+   [{watchdog, Dog} | Config].
+
+end_per_testcase(reuse_session_expired, Config) ->
+    application:unset_env(ssl, session_lifetime),
+    application:unset_env(ssl, session_delay_cleanup_time),
+    end_per_testcase(default_action, Config);
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+app() ->
+    [{doc, "Test that the ssl app file is ok"}].
 app(Config) when is_list(Config) ->
-    ok = test_server:app_test(ssl).
+    ok = ?t:app_test(ssl).
 %%--------------------------------------------------------------------
-alerts(doc) ->
-    "Test ssl_alert:alert_txt/1";
-alerts(suite) ->
-    [];
+alerts() ->
+    [{doc, "Test ssl_alert:alert_txt/1"}].
 alerts(Config) when is_list(Config) ->
     Descriptions = [?CLOSE_NOTIFY, ?UNEXPECTED_MESSAGE, ?BAD_RECORD_MAC,
 		    ?DECRYPTION_FAILED, ?RECORD_OVERFLOW, ?DECOMPRESSION_FAILURE,
@@ -364,14 +287,12 @@ alerts(Config) when is_list(Config) ->
 			    Txt when is_list(Txt) ->
 				ok;
 			    Other ->
-				test_server:fail({unexpected, Other})
+				ct:fail({unexpected, Other})
 			end 
 		  end, Alerts).
 %%--------------------------------------------------------------------
-connection_info(doc) -> 
-    ["Test the API function ssl:connection_info/1"];
-connection_info(suite) -> 
-    [];
+connection_info() ->
+    [{doc,"Test the API function ssl:connection_info/1"}].
 connection_info(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -390,7 +311,7 @@ connection_info(Config) when is_list(Config) ->
 			    [{ciphers,[{rsa,rc4_128,sha,no_export}]} | 
 			     ClientOpts]}]),
     
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     Version = 
@@ -403,58 +324,23 @@ connection_info(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-connection_info_result(Socket) ->                                            
-    ssl:connection_info(Socket).
-
 %%--------------------------------------------------------------------
-
-protocol_versions(doc) -> 
-    ["Test to set a list of protocol versions in app environment."];
-
-protocol_versions(suite) -> 
-    [];
+protocol_versions() ->
+    [{doc,"Test to set a list of protocol versions in app environment."}].
 
 protocol_versions(Config) when is_list(Config) -> 
     basic_test(Config).
-
-empty_protocol_versions(doc) -> 
-    ["Test to set an empty list of protocol versions in app environment."];
-
-empty_protocol_versions(suite) -> 
-    [];
+%%--------------------------------------------------------------------
+empty_protocol_versions() ->
+    [{doc,"Test to set an empty list of protocol versions in app environment."}].
 
 empty_protocol_versions(Config) when is_list(Config) -> 
     basic_test(Config).
 
-
-basic_test(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, ClientOpts}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 
-controlling_process(doc) -> 
-    ["Test API function controlling_process/2"];
-
-controlling_process(suite) -> 
-    [];
+controlling_process() ->
+    [{doc,"Test API function controlling_process/2"}].
 
 controlling_process(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -478,7 +364,7 @@ controlling_process(Config) when is_list(Config) ->
 							       ClientMsg]}},
 			   {options, ClientOpts}]),
    
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
     
     receive 
@@ -497,46 +383,15 @@ controlling_process(Config) when is_list(Config) ->
 		      ok
 	      end;
 	Unexpected ->
-	    test_server:fail(Unexpected)
+	    ct:fail(Unexpected)
     end,
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-controlling_process_result(Socket, Pid, Msg) ->
-    ok = ssl:controlling_process(Socket, Pid),
-    %% Make sure other side has evaluated controlling_process
-    %% before message is sent
-    test_server:sleep(?SLEEP),
-    ssl:send(Socket, Msg),
-    no_result_msg.
-
-receive_s_rizzo_duong_beast() ->
-    receive 
-	{ssl, _, "erver hello"} ->
-	    receive 
-		{ssl, _, "C"} ->
-		    receive
-			{ssl, _, "lient hello"} ->
-			    ok
-		    end
-	    end
-    end.
-receive_c_rizzo_duong_beast() ->
-    receive 
-	{ssl, _, "lient hello"} ->
-	    receive
-		{ssl, _, "S"} ->
-		    receive
-			{ssl, _, "erver hello"} ->
-			    ok
-		    end
-	    end
-    end.
 %%--------------------------------------------------------------------
-controller_dies(doc) -> 
-    ["Test that the socket is closed after controlling process dies"];
-controller_dies(suite) -> [];
+controller_dies() ->
+    [{doc,"Test that the socket is closed after controlling process dies"}].
 controller_dies(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -559,8 +414,8 @@ controller_dies(Config) when is_list(Config) ->
 									    ClientMsg]}},
 					{options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", [self(), Client, Server]),
-    test_server:sleep(?SLEEP), %% so that they are connected
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n", [self(), Client, Server]),
+    ct:sleep(?SLEEP), %% so that they are connected
     
     process_flag(trap_exit, true),
 
@@ -577,7 +432,7 @@ controller_dies(Config) when is_list(Config) ->
 		      %% Make sure server finishes and verification
 		      %% and is in coonection state before
 		      %% killing client
-		      test_server:sleep(?SLEEP),
+		      ct:sleep(?SLEEP),
 		      Pid ! {self(), connected, Socket},
 		      receive die_nice -> normal end
 	      end,
@@ -597,13 +452,13 @@ controller_dies(Config) when is_list(Config) ->
 	    Client3 ! die_nice 
     end,
 
-    test_server:format("Wating on exit ~p~n",[Client3]),
+    ct:print("Wating on exit ~p~n",[Client3]),
     receive {'EXIT', Client3, normal} -> ok end,
     
     receive   %% Client3 is dead but that doesn't matter, socket should not be closed.
 	Unexpected ->
-	    test_server:format("Unexpected ~p~n",[Unexpected]),
-	    test_server:fail({line, ?LINE-1})
+	    ct:print("Unexpected ~p~n",[Unexpected]),
+	    ct:fail({line, ?LINE-1})
     after 1000 ->
 	    ok
     end,
@@ -619,39 +474,17 @@ controller_dies(Config) when is_list(Config) ->
 						   controller_dies_result, [self(),
 									    ClientMsg]}},
 					    {options, [{reuseaddr,true}|ClientOpts]}]),
-    test_server:sleep(?SLEEP), %% so that they are connected
+    ct:sleep(?SLEEP), %% so that they are connected
     
     exit(Server, killed),
     get_close(Server, ?LINE),
     process_flag(trap_exit, false),
     ssl_test_lib:close(LastClient).
 
-controller_dies_result(_Socket, _Pid, _Msg) ->
-    receive Result -> Result end.
-
-get_close(Pid, Where) ->
-    receive 
-	{'EXIT', Pid, _Reason} ->
-	    receive 
-		{_, {ssl_closed, Socket}} ->
-		    test_server:format("Socket closed ~p~n",[Socket]);
-		Unexpected ->
-		    test_server:format("Unexpected ~p~n",[Unexpected]),
-		    test_server:fail({line, ?LINE-1})
-	    after 5000 ->
-		    test_server:fail({timeout, {line, ?LINE, Where}})
-	    end;
-	Unexpected ->
-	    test_server:format("Unexpected ~p~n",[Unexpected]),
-	    test_server:fail({line, ?LINE-1})
-    after 5000 ->
-	    test_server:fail({timeout, {line, ?LINE, Where}})
-    end.  
-
 %%--------------------------------------------------------------------
-client_closes_socket(doc) -> 
-    ["Test what happens when client closes socket before handshake is compleated"];
-client_closes_socket(suite) -> [];
+client_closes_socket() ->
+    [{doc,"Test what happens when client closes socket before handshake is compleated"}].
+
 client_closes_socket(Config) when is_list(Config) -> 
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -668,7 +501,7 @@ client_closes_socket(Config) when is_list(Config) ->
 					      [Hostname, Port, TcpOpts]),	      
 		      %% Make sure that ssl_accept is called before 
 		      %% client process ends and closes socket.
-		      test_server:sleep(?SLEEP)
+		      ct:sleep(?SLEEP)
 	      end,
     
     _Client = spawn_link(Connect),
@@ -676,11 +509,8 @@ client_closes_socket(Config) when is_list(Config) ->
     ssl_test_lib:check_result(Server, {error,closed}).
 
 %%--------------------------------------------------------------------
-connect_dist(doc) -> 
-    ["Test a simple connect as is used by distribution"];
-
-connect_dist(suite) -> 
-    [];
+connect_dist() ->
+    [{doc,"Test a simple connect as is used by distribution"}].
 
 connect_dist(Config) when is_list(Config) -> 
     ClientOpts0 = ?config(client_kc_opts, Config),
@@ -706,22 +536,36 @@ connect_dist(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-connect_dist_s(S) ->
-    Msg = term_to_binary({erlang,term}),
-    ok = ssl:send(S, Msg).
-
-connect_dist_c(S) ->
-    Test = binary_to_list(term_to_binary({erlang,term})),
-    {ok, Test} = ssl:recv(S, 0, 10000),
-    ok.
+%%--------------------------------------------------------------------
 
+clear_pem_cache() ->
+    [{doc,"Test that internal reference tabel is cleaned properly even when "
+     " the PEM cache is cleared" }].
+clear_pem_cache(Config) when is_list(Config) -> 
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    [_,FilRefDb, _] = element(5, State),
+    {Server, Client} = basic_verify_test_no_close(Config),
+    2 = ets:info(FilRefDb, size), 
+    ssl:clear_pem_cache(),
+    _ = sys:get_status(whereis(ssl_manager)),
+    {Server1, Client1} = basic_verify_test_no_close(Config),
+    4 = ets:info(FilRefDb, size), 
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    ct:sleep(5000),
+    _ = sys:get_status(whereis(ssl_manager)),
+    2 = ets:info(FilRefDb, size),
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1),
+    ct:sleep(5000),
+    _ = sys:get_status(whereis(ssl_manager)),
+    0 = ets:info(FilRefDb, size).
 
 %%--------------------------------------------------------------------
-peername(doc) -> 
-    ["Test API function peername/1"];
-
-peername(suite) -> 
-    [];
+peername() ->
+    [{doc,"Test API function peername/1"}].
 
 peername(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -744,7 +588,7 @@ peername(Config) when is_list(Config) ->
     ServerMsg = {ok, {ClientIp, ClientPort}},
     ClientMsg = {ok, {ServerIp, Port}},
 	
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 		   
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
@@ -752,14 +596,9 @@ peername(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-peername_result(S) ->
-    ssl:peername(S).
-
 %%--------------------------------------------------------------------
-peercert(doc) ->
-    [""];
-peercert(suite) ->
-    [];
+peercert() ->
+    [{doc,"Test API function peercert/1"}].
 peercert(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -782,7 +621,7 @@ peercert(Config) when is_list(Config) ->
     ServerMsg = {error, no_peercert},
     ClientMsg = {ok, BinCert},
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
@@ -794,10 +633,8 @@ peercert_result(Socket) ->
     ssl:peercert(Socket).
 %%--------------------------------------------------------------------
 
-peercert_with_client_cert(doc) ->
-    [""];
-peercert_with_client_cert(suite) ->
-    [];
+peercert_with_client_cert() ->
+    [{doc,"Test API function peercert/1"}].
 peercert_with_client_cert(Config) when is_list(Config) ->
     ClientOpts = ?config(client_dsa_opts, Config),
     ServerOpts = ?config(server_dsa_verify_opts, Config),
@@ -822,7 +659,7 @@ peercert_with_client_cert(Config) when is_list(Config) ->
     ServerMsg = {ok, ClientBinCert},
     ClientMsg = {ok, ServerBinCert},
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
@@ -831,12 +668,8 @@ peercert_with_client_cert(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-sockname(doc) -> 
-    ["Test API function sockname/1"];
-
-sockname(suite) -> 
-    [];
-
+sockname() ->
+    [{doc,"Test API function sockname/1"}].
 sockname(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -858,7 +691,7 @@ sockname(Config) when is_list(Config) ->
     ServerMsg = {ok, {ServerIp, Port}},
     ClientMsg = {ok, {ClientIp, ClientPort}},
 			   
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 			 [self(), Client, Server]),
     
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
@@ -870,11 +703,8 @@ sockname_result(S) ->
     ssl:sockname(S).
 
 %%--------------------------------------------------------------------
-cipher_suites(doc) -> 
-    ["Test API function cipher_suites/0"];
-
-cipher_suites(suite) -> 
-    [];
+cipher_suites() ->
+    [{doc,"Test API function cipher_suites/0"}].
 
 cipher_suites(Config) when is_list(Config) -> 
     MandatoryCipherSuite = {rsa,'3des_ede_cbc',sha},
@@ -884,11 +714,8 @@ cipher_suites(Config) when is_list(Config) ->
     [_|_] =ssl:cipher_suites(openssl).
 
 %%--------------------------------------------------------------------
-socket_options(doc) -> 
-    ["Test API function getopts/2 and setopts/2"];
-
-socket_options(suite) -> 
-    [];
+socket_options() ->
+    [{doc,"Test API function getopts/2 and setopts/2"}].
 
 socket_options(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -937,16 +764,13 @@ socket_options_result(Socket, Options, DefaultValues, NewOptions, NewValues) ->
     ssl:setopts(Socket, [{nodelay, true}]),
     {ok,[{nodelay, true}]} = ssl:getopts(Socket, [nodelay]),
     {ok, All} = ssl:getopts(Socket, []),
-    test_server:format("All opts ~p~n", [All]),
+    ct:print("All opts ~p~n", [All]),
     ok.
 
 
 %%--------------------------------------------------------------------
-invalid_inet_get_option(doc) ->
-    ["Test handling of invalid inet options in getopts"];
-
-invalid_inet_get_option(suite) ->
-    [];
+invalid_inet_get_option() ->
+    [{doc,"Test handling of invalid inet options in getopts"}].
 
 invalid_inet_get_option(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -963,24 +787,16 @@ invalid_inet_get_option(Config) when is_list(Config) ->
 			   {mfa, {ssl_test_lib, no_result, []}},
 			   {options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-
-get_invalid_inet_option(Socket) ->
-    {error, {eoptions, {inet_option, foo, _}}} = ssl:getopts(Socket, [foo]),
-    ok.
-
 %%--------------------------------------------------------------------
-invalid_inet_get_option_not_list(doc) ->
-    ["Test handling of invalid type in getopts"];
-
-invalid_inet_get_option_not_list(suite) ->
-    [];
+invalid_inet_get_option_not_list() ->
+    [{doc,"Test handling of invalid type in getopts"}].
 
 invalid_inet_get_option_not_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -997,7 +813,7 @@ invalid_inet_get_option_not_list(Config) when is_list(Config) ->
 			   {mfa, {ssl_test_lib, no_result, []}},
 			   {options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
     
     ssl_test_lib:check_result(Server, ok),
@@ -1011,11 +827,8 @@ get_invalid_inet_option_not_list(Socket) ->
      ok.
 
 %%--------------------------------------------------------------------
-invalid_inet_get_option_improper_list(doc) ->
-    ["Test handling of invalid type in getopts"];
-
-invalid_inet_get_option_improper_list(suite) ->
-    [];
+invalid_inet_get_option_improper_list() ->
+    [{doc,"Test handling of invalid type in getopts"}].
 
 invalid_inet_get_option_improper_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1032,7 +845,7 @@ invalid_inet_get_option_improper_list(Config) when is_list(Config) ->
 			   {mfa, {ssl_test_lib, no_result, []}},
 			   {options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ok),
@@ -1045,11 +858,8 @@ get_invalid_inet_option_improper_list(Socket) ->
     ok.
 
 %%--------------------------------------------------------------------
-invalid_inet_set_option(doc) ->
-    ["Test handling of invalid inet options in setopts"];
-
-invalid_inet_set_option(suite) ->
-    [];
+invalid_inet_set_option() ->
+    [{doc,"Test handling of invalid inet options in setopts"}].
 
 invalid_inet_set_option(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1066,7 +876,7 @@ invalid_inet_set_option(Config) when is_list(Config) ->
 			   {mfa, {ssl_test_lib, no_result, []}},
 			   {options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ok),
@@ -1080,11 +890,8 @@ set_invalid_inet_option(Socket) ->
     {error, {eoptions, {inet_opt, {mode, foo}}}}   = ssl:setopts(Socket, [{mode, foo}]),
     ok.
 %%--------------------------------------------------------------------
-invalid_inet_set_option_not_list(doc) ->
-    ["Test handling of invalid type in setopts"];
-
-invalid_inet_set_option_not_list(suite) ->
-    [];
+invalid_inet_set_option_not_list() ->
+    [{doc,"Test handling of invalid type in setopts"}].
 
 invalid_inet_set_option_not_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1101,7 +908,7 @@ invalid_inet_set_option_not_list(Config) when is_list(Config) ->
 			   {mfa, {ssl_test_lib, no_result, []}},
 			   {options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ok),
@@ -1115,11 +922,8 @@ set_invalid_inet_option_not_list(Socket) ->
     ok.
 
 %%--------------------------------------------------------------------
-invalid_inet_set_option_improper_list(doc) ->
-    ["Test handling of invalid tye in setopts"];
-
-invalid_inet_set_option_improper_list(suite) ->
-    [];
+invalid_inet_set_option_improper_list() ->
+    [{doc,"Test handling of invalid tye in setopts"}].
 
 invalid_inet_set_option_improper_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1136,7 +940,7 @@ invalid_inet_set_option_improper_list(Config) when is_list(Config) ->
 			   {mfa, {ssl_test_lib, no_result, []}},
 			   {options, ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ok),
@@ -1149,11 +953,8 @@ set_invalid_inet_option_improper_list(Socket) ->
     ok.
 
 %%--------------------------------------------------------------------
-misc_ssl_options(doc) ->
-    ["Test what happens when we give valid options"];
-
-misc_ssl_options(suite) ->
-    [];
+misc_ssl_options() ->
+    [{doc,"Test what happens when we give valid options"}].
 
 misc_ssl_options(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1171,17 +972,17 @@ misc_ssl_options(Config) when is_list(Config) ->
    Server = 
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 				   {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result_active, []}},
+				   {mfa, {ssl_test_lib, send_recv_result_active, []}},
 				   {options,  TestOpts ++ ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Client = 
 	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 				   {host, Hostname},
 				   {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result_active, []}},
+				   {mfa, {ssl_test_lib, send_recv_result_active, []}},
 				   {options, TestOpts ++ ClientOpts}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 			 [self(), Client, Server]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
@@ -1189,23 +990,16 @@ misc_ssl_options(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-versions(doc) -> 
-    ["Test API function versions/0"];
-
-versions(suite) -> 
-    [];
+versions() ->
+    [{doc,"Test API function versions/0"}].
 
 versions(Config) when is_list(Config) -> 
     [_|_] = Versions = ssl:versions(),
-    test_server:format("~p~n", [Versions]).
+    ct:print("~p~n", [Versions]).
 
 %%--------------------------------------------------------------------
-send_recv(doc) -> 
-    [""];
-
-send_recv(suite) -> 
-    [];
-
+send_recv() ->
+    [{doc,""}].
 send_recv(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1213,17 +1007,17 @@ send_recv(Config) when is_list(Config) ->
     Server = 
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 				   {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options,  [{active, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     Client = 
 	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 				   {host, Hostname},
 				   {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options, [{active, false} | ClientOpts]}]),
     
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 			 [self(), Client, Server]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
@@ -1232,12 +1026,8 @@ send_recv(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-send_close(doc) -> 
-    [""];
-
-send_close(suite) -> 
-    [];
-
+send_close() ->
+    [{doc,""}].
 send_close(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1245,7 +1035,7 @@ send_close(Config) when is_list(Config) ->
     Server = 
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 				   {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options,  [{active, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     {ok, TcpS} = rpc:call(ClientNode, gen_tcp, connect, 
@@ -1253,7 +1043,7 @@ send_close(Config) when is_list(Config) ->
     {ok, SslS} = rpc:call(ClientNode, ssl, connect, 
 			  [TcpS,[{active, false}|ClientOpts]]),
     
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), self(), Server]),
     ok = ssl:send(SslS, "Hello world"),      
     {ok,<<"Hello world">>} = ssl:recv(SslS, 11),    
@@ -1261,11 +1051,8 @@ send_close(Config) when is_list(Config) ->
     {error, _} = ssl:send(SslS, "Hello world").
 
 %%--------------------------------------------------------------------
-close_transport_accept(doc) ->
-    ["Tests closing ssl socket when waiting on ssl:transport_accept/1"];
-
-close_transport_accept(suite) ->
-    [];
+close_transport_accept() ->
+    [{doc,"Tests closing ssl socket when waiting on ssl:transport_accept/1"}].
 
 close_transport_accept(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
@@ -1275,7 +1062,7 @@ close_transport_accept(Config) when is_list(Config) ->
     Opts = [{active, false} | ServerOpts],
     {ok, ListenSocket} = rpc:call(ServerNode, ssl, listen, [Port, Opts]),
     spawn_link(fun() ->
-			test_server:sleep(?SLEEP),
+			ct:sleep(?SLEEP),
 			rpc:call(ServerNode, ssl, close, [ListenSocket])
 	       end),
     case rpc:call(ServerNode, ssl, transport_accept, [ListenSocket]) of
@@ -1286,11 +1073,8 @@ close_transport_accept(Config) when is_list(Config) ->
     end.
 
 %%--------------------------------------------------------------------
-dh_params(doc) -> 
-    ["Test to specify DH-params file in server."];
-
-dh_params(suite) -> 
-    [];
+dh_params() ->
+    [{doc,"Test to specify DH-params file in server."}].
 
 dh_params(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1302,13 +1086,13 @@ dh_params(Config) when is_list(Config) ->
     
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
-			   {mfa, {?MODULE, send_recv_result_active, []}},
+			   {mfa, {ssl_test_lib, send_recv_result_active, []}},
 			   {options, [{dhfile, DHParamFile} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
 			   {from, self()}, 
-			   {mfa, {?MODULE, send_recv_result_active, []}},
+			   {mfa, {ssl_test_lib, send_recv_result_active, []}},
 			   {options,
 			    [{ciphers,[{dhe_rsa,aes_256_cbc,sha,ignore}]} | 
 				       ClientOpts]}]),
@@ -1319,11 +1103,8 @@ dh_params(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-upgrade(doc) -> 
-    ["Test that you can upgrade an tcp connection to an ssl connection"];
-
-upgrade(suite) -> 
-    [];
+upgrade() ->
+    [{doc,"Test that you can upgrade an tcp connection to an ssl connection"}].
 
 upgrade(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1347,7 +1128,7 @@ upgrade(Config) when is_list(Config) ->
 				   {tcp_options, TcpOpts},
 				   {ssl_options, ClientOpts}]),
     
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
@@ -1371,11 +1152,8 @@ upgrade_result(Socket) ->
     end.
 
 %%--------------------------------------------------------------------
-upgrade_with_timeout(doc) -> 
-    ["Test ssl_accept/3"];
-
-upgrade_with_timeout(suite) -> 
-    [];
+upgrade_with_timeout() ->
+    [{doc,"Test ssl_accept/3"}].
 
 upgrade_with_timeout(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1400,7 +1178,7 @@ upgrade_with_timeout(Config) when is_list(Config) ->
 						{tcp_options, TcpOpts},
 						{ssl_options, ClientOpts}]),
     
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
@@ -1409,11 +1187,8 @@ upgrade_with_timeout(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-tcp_connect(doc) ->
-    ["Test what happens when a tcp tries to connect, i,e. a bad (ssl) packet is sent first"];
-
-tcp_connect(suite) ->
-    [];
+tcp_connect() ->
+    [{doc,"Test what happens when a tcp tries to connect, i,e. a bad (ssl) packet is sent first"}].
 
 tcp_connect(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
@@ -1429,22 +1204,19 @@ tcp_connect(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(Server),
 
     {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]),
-    test_server:format("Testcase ~p connected to Server ~p ~n", [self(), Server]),
+    ct:print("Testcase ~p connected to Server ~p ~n", [self(), Server]),
     gen_tcp:send(Socket, "<SOME GARBLED NON SSL MESSAGE>"),
 
     receive 
 	{tcp_closed, Socket} ->
 	    receive 
 		{Server, {error, Error}} ->
-		    test_server:format("Error ~p", [Error])
+		    ct:print("Error ~p", [Error])
 	    end
     end.
-
-tcp_connect_big(doc) ->
-    ["Test what happens when a tcp tries to connect, i,e. a bad big (ssl) packet is sent first"];
-
-tcp_connect_big(suite) ->
-    [];
+%%--------------------------------------------------------------------
+tcp_connect_big() ->
+    [{doc,"Test what happens when a tcp tries to connect, i,e. a bad big (ssl) packet is sent first"}].
 
 tcp_connect_big(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
@@ -1460,7 +1232,7 @@ tcp_connect_big(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(Server),
 
     {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]),
-    test_server:format("Testcase ~p connected to Server ~p ~n", [self(), Server]),
+    ct:print("Testcase ~p connected to Server ~p ~n", [self(), Server]),
 
     Rand = crypto:rand_bytes(?MAX_CIPHER_TEXT_LENGTH+1),
     gen_tcp:send(Socket, <<?BYTE(0),
@@ -1470,24 +1242,16 @@ tcp_connect_big(Config) when is_list(Config) ->
 	{tcp_closed, Socket} ->
 	    receive
 		{Server, {error, timeout}} ->
-		    test_server:fail("hangs");
+		    ct:fail("hangs");
 		{Server, {error, Error}} ->
-		    test_server:format("Error ~p", [Error])
+		    ct:print("Error ~p", [Error])
 	    end
     end.
 
-dummy(_Socket) ->
-    %% Should not happen as the ssl connection will not be established
-    %% due to fatal handshake failiure
-    exit(kill).
-
 %%--------------------------------------------------------------------
 ipv6() ->
-    [{require, ipv6_hosts}].
-ipv6(doc) ->
-    ["Test ipv6."];
-ipv6(suite) ->
-    [];
+    [{require, ipv6_hosts},
+     {doc,"Test ipv6."}].
 ipv6(Config) when is_list(Config) ->
     {ok, Hostname0} = inet:gethostname(),
     
@@ -1499,18 +1263,18 @@ ipv6(Config) when is_list(Config) ->
 		ssl_test_lib:run_where(Config, ipv6),
 	    Server = ssl_test_lib:start_server([{node, ServerNode}, 
 				   {port, 0}, {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options,  
 				    [inet6, {active, false} | ServerOpts]}]),
 	    Port = ssl_test_lib:inet_port(Server), 
 	    Client = ssl_test_lib:start_client([{node, ClientNode}, 
 				   {port, Port}, {host, Hostname},
 				   {from, self()}, 
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options, 
 				    [inet6, {active, false} | ClientOpts]}]),
 	    
-	    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
+	    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 			       [self(), Client, Server]),
 	    
 	    ssl_test_lib:check_result(Server, ok, Client, ok),
@@ -1523,12 +1287,8 @@ ipv6(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-ekeyfile(doc) -> 
-    ["Test what happens with an invalid key file"];
-
-ekeyfile(suite) -> 
-    [];
-
+ekeyfile() ->
+    [{doc,"Test what happens with an invalid key file"}].
 ekeyfile(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     BadOpts = ?config(server_bad_key, Config),
@@ -1551,11 +1311,8 @@ ekeyfile(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-ecertfile(doc) -> 
-    ["Test what happens with an invalid cert file"];
-
-ecertfile(suite) -> 
-    [];
+ecertfile() ->
+    [{doc,"Test what happens with an invalid cert file"}].
 
 ecertfile(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1580,11 +1337,8 @@ ecertfile(Config) when is_list(Config) ->
     
 
 %%--------------------------------------------------------------------
-ecacertfile(doc) ->
-    ["Test what happens with an invalid cacert file"];
-
-ecacertfile(suite) ->
-    [];
+ecacertfile() ->
+    [{doc,"Test what happens with an invalid cacert file"}].
 
 ecacertfile(Config) when is_list(Config) ->
     ClientOpts    = [{reuseaddr, true}|?config(client_opts, Config)],
@@ -1632,12 +1386,9 @@ ecacertfile(Config) when is_list(Config) ->
     
 
 %%--------------------------------------------------------------------
-eoptions(doc) -> 
-    ["Test what happens when we give invalid options"];
+eoptions() ->
+    [{doc,"Test what happens when we give invalid options"}].
        
-eoptions(suite) -> 
-    [];
-
 eoptions(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1694,12 +1445,8 @@ eoptions(Config) when is_list(Config) ->
     ok.
 
 %%--------------------------------------------------------------------
-shutdown(doc) -> 
-    [""];
-       
-shutdown(suite) -> 
-    [];
-
+shutdown() ->
+    [{doc,"Test API function ssl:shutdown/2"}].
 shutdown(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),  
@@ -1724,25 +1471,9 @@ shutdown(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-shutdown_result(Socket, server) ->
-    ssl:send(Socket, "Hej"),
-    ssl:shutdown(Socket, write),
-    {ok, "Hej hopp"} = ssl:recv(Socket, 8),
-    ok;
-
-shutdown_result(Socket, client) ->    
-    {ok, "Hej"} = ssl:recv(Socket, 3),
-    ssl:send(Socket, "Hej hopp"),
-    ssl:shutdown(Socket, write),
-    ok.
-
 %%--------------------------------------------------------------------
-shutdown_write(doc) -> 
-    [""];
-       
-shutdown_write(suite) -> 
-    [];
-
+shutdown_write() ->
+    [{doc,"Test API function ssl:shutdown/2 with option write."}].
 shutdown_write(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),  
@@ -1759,20 +1490,10 @@ shutdown_write(Config) when is_list(Config) ->
 			   {options, [{active, false} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Server, ok, Client, {error, closed}).
-    
-shutdown_write_result(Socket, server) ->
-    test_server:sleep(?SLEEP),
-    ssl:shutdown(Socket, write);
-shutdown_write_result(Socket, client) ->    
-    ssl:recv(Socket, 0).
 
 %%--------------------------------------------------------------------
-shutdown_both(doc) -> 
-    [""];
-       
-shutdown_both(suite) -> 
-    [];
-
+shutdown_both() ->
+    [{doc,"Test API function ssl:shutdown/2 with option both."}].
 shutdown_both(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),  
@@ -1790,19 +1511,9 @@ shutdown_both(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok, Client, {error, closed}).
 
-shutdown_both_result(Socket, server) ->
-    test_server:sleep(?SLEEP),
-    ssl:shutdown(Socket, read_write);
-shutdown_both_result(Socket, client) ->    
-    ssl:recv(Socket, 0).
-
 %%--------------------------------------------------------------------
-shutdown_error(doc) -> 
-    [""];
-       
-shutdown_error(suite) -> 
-    [];
-
+shutdown_error() ->
+    [{doc,"Test ssl:shutdown/2 error handling"}].
 shutdown_error(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
     Port = ssl_test_lib:inet_port(node()),
@@ -1812,141 +1523,60 @@ shutdown_error(Config) when is_list(Config) ->
     {error, closed} = ssl:shutdown(Listen, read_write).
 
 %%-------------------------------------------------------------------
-ciphers_rsa_signed_certs(doc) -> 
-    ["Test all rsa ssl cipher suites in highest support ssl/tls version"];
+ciphers_rsa_signed_certs() ->
+    [{doc,"Test all rsa ssl cipher suites in highest support ssl/tls version"}].
        
-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(),
-    test_server:format("~p erlang cipher suites ~p~n", [Version, Ciphers]),
+    ct:print("~p erlang cipher suites ~p~n", [Version, Ciphers]),
     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() ->
+    [{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]),
+    ct:print("tls1 openssl cipher suites ~p~n", [Ciphers]),
     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() ->
+    [{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("~p erlang cipher suites ~p~n", [Version, Ciphers]),
+    ct:print("~p erlang cipher suites ~p~n", [Version, Ciphers]),
     run_suites(Ciphers, Version, Config, dsa).
-
-ciphers_dsa_signed_certs_openssl_names(doc) -> 
-    ["Test all dsa ssl cipher suites in highest support ssl/tls version"];
+%%-------------------------------------------------------------------
+ciphers_dsa_signed_certs_openssl_names() ->
+    [{doc,"Test all dsa ssl cipher suites in highest support ssl/tls version"}].
        
-ciphers_dsa_signed_certs_openssl_names(suite) -> 
-    [];
-
 ciphers_dsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
     Ciphers = ssl_test_lib:openssl_dsa_suites(),
-    test_server:format("tls1 openssl cipher suites ~p~n", [Ciphers]),
+    ct:print("tls1 openssl cipher suites ~p~n", [Ciphers]),
     run_suites(Ciphers, Version, Config, dsa).
-
-anonymous_cipher_suites(doc)->
-    ["Test the anonymous ciphersuites"];
-anonymous_cipher_suites(suite) ->
-    [];
+%%-------------------------------------------------------------------
+anonymous_cipher_suites()->
+    [{doc,"Test the anonymous ciphersuites"}].
 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, ClientOpts, ServerOpts) 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.
-
-erlang_cipher_suite(Suite) when is_list(Suite)->
-    ssl:suite_definition(ssl_cipher:openssl_suite(Suite));
-erlang_cipher_suite(Suite) ->
-    Suite.
-
-cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->   
-    %% process_flag(trap_exit, true),
-    test_server:format("Testing CipherSuite ~p~n", [CipherSuite]),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    ErlangCipherSuite = erlang_cipher_suite(CipherSuite),
-
-    ConnectionInfo = {ok, {Version, ErlangCipherSuite}},
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
-			   {options, 
-			    [{ciphers,[CipherSuite]} | 
-			     ClientOpts]}]), 
-  			   
-    Result = ssl_test_lib:wait_for_result(Server, ok, Client, ok),   
- 
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-
-    case Result of
-	ok ->
-	    [];
-	Error ->
-	    [{ErlangCipherSuite, Error}]
-    end.
-
 %%--------------------------------------------------------------------
-default_reject_anonymous(doc)->
-    ["Test that by default anonymous cipher suites are rejected "];
-default_reject_anonymous(suite) ->
-    [];
+default_reject_anonymous()->
+    [{doc,"Test that by default anonymous cipher suites are rejected "}].
 default_reject_anonymous(Config) when is_list(Config) ->
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     ClientOpts = ?config(client_opts, Config),
@@ -1965,16 +1595,12 @@ default_reject_anonymous(Config) when is_list(Config) ->
 			    [{ciphers,[Cipher]} |
 			     ClientOpts]}]),
 
-    ssl_test_lib:check_result(Server, {error, "insufficient security"},
-			      Client, {error, "insufficient security"}).
+    ssl_test_lib:check_result(Server, {error, {essl, "insufficient security"}},
+			      Client, {error, {essl, "insufficient security"}}).
 
 %%--------------------------------------------------------------------
-reuse_session(doc) -> 
-    ["Test reuse of sessions (short handshake)"];
-
-reuse_session(suite) -> 
-    [];
-
+reuse_session() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
 reuse_session(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2000,7 +1626,7 @@ reuse_session(Config) when is_list(Config) ->
     Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
 
     Client1 =
 	ssl_test_lib:start_client([{node, ClientNode},
@@ -2011,9 +1637,9 @@ reuse_session(Config) when is_list(Config) ->
 	{Client1, SessionInfo} ->
 	    ok;
 	{Client1, Other} ->
-	    test_server:format("Expected: ~p,  Unexpected: ~p~n", 
+	    ct:print("Expected: ~p,  Unexpected: ~p~n",
 			       [SessionInfo, Other]),
-	    test_server:fail(session_not_reused)
+	    ct:fail(session_not_reused)
     end,
     
     Server !  {listen, {mfa, {ssl_test_lib, no_result, []}}},
@@ -2026,7 +1652,7 @@ reuse_session(Config) when is_list(Config) ->
 						  | ClientOpts]}]),   
     receive
 	{Client2, SessionInfo} ->
-	    test_server:fail(
+	    ct:fail(
 	      session_reused_when_session_reuse_disabled_by_client);
 	{Client2, _} ->
 	    ok
@@ -2056,7 +1682,7 @@ reuse_session(Config) when is_list(Config) ->
     Server1 ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
 
     Client4 = 
 	ssl_test_lib:start_client([{node, ClientNode}, 
@@ -2066,10 +1692,10 @@ reuse_session(Config) when is_list(Config) ->
     
     receive
 	{Client4, SessionInfo1} ->
-	    test_server:fail(
+	    ct:fail(
 	      session_reused_when_session_reuse_disabled_by_server);
 	{Client4, _Other} ->
-	    test_server:format("OTHER: ~p ~n", [_Other]),
+	    ct:print("OTHER: ~p ~n", [_Other]),
 	    ok
     end,
 
@@ -2081,12 +1707,8 @@ reuse_session(Config) when is_list(Config) ->
     ssl_test_lib:close(Client4).
 
 %%--------------------------------------------------------------------
-reuse_session_expired(doc) -> 
-    ["Test sessions is not reused when it has expired"];
-
-reuse_session_expired(suite) -> 
-    [];
-
+reuse_session_expired() ->
+    [{doc,"Test sessions is not reused when it has expired"}].
 reuse_session_expired(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2112,7 +1734,7 @@ reuse_session_expired(Config) when is_list(Config) ->
     Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
 
     Client1 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
@@ -2123,15 +1745,15 @@ reuse_session_expired(Config) when is_list(Config) ->
 	{Client1, SessionInfo} ->
 	    ok;
 	{Client1, Other} ->
-	    test_server:format("Expected: ~p,  Unexpected: ~p~n", 
+	    ct:print("Expected: ~p,  Unexpected: ~p~n",
 			       [SessionInfo, Other]),
-	    test_server:fail(session_not_reused)
+	    ct:fail(session_not_reused)
     end,
     
     Server ! listen,
 
     %% Make sure session is unregistered due to expiration
-    test_server:sleep((?EXPIRE+1)),
+    ct:sleep((?EXPIRE+1)),
     [{session_id, Id} |_] = SessionInfo,
 
     make_sure_expired(Hostname, Port, Id),
@@ -2143,7 +1765,7 @@ reuse_session_expired(Config) when is_list(Config) ->
 				   {from, self()}, {options, ClientOpts}]),   
     receive
 	{Client2, SessionInfo} ->
-	    test_server:fail(session_reused_when_session_expired);
+	    ct:fail(session_reused_when_session_expired);
 	{Client2, _} ->
 	    ok
     end,
@@ -2165,17 +1787,13 @@ make_sure_expired(Host, Port, Id) ->
 	#session{is_resumable = false} ->
 	   ok;
 	_ ->
-	    test_server:sleep(?SLEEP),
+	    ct:sleep(?SLEEP),
 	    make_sure_expired(Host, Port, Id)
     end.     
 
 %%--------------------------------------------------------------------
-server_does_not_want_to_reuse_session(doc) -> 
-    ["Test reuse of sessions (short handshake)"];
-
-server_does_not_want_to_reuse_session(suite) -> 
-    [];
-
+server_does_not_want_to_reuse_session() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
 server_does_not_want_to_reuse_session(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2204,7 +1822,7 @@ server_does_not_want_to_reuse_session(Config) when is_list(Config) ->
     Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
     ssl_test_lib:close(Client0),
 
     Client1 =
@@ -2214,7 +1832,7 @@ server_does_not_want_to_reuse_session(Config) when is_list(Config) ->
 		      {from, self()},  {options, ClientOpts}]),    
     receive
 	{Client1, SessionInfo} ->
-	    test_server:fail(session_reused_when_server_does_not_want_to);
+	    ct:fail(session_reused_when_server_does_not_want_to);
 	{Client1, _Other} ->
 	   ok
     end,
@@ -2223,512 +1841,55 @@ server_does_not_want_to_reuse_session(Config) when is_list(Config) ->
     ssl_test_lib:close(Client1).
 
 %%--------------------------------------------------------------------
-
-server_verify_peer_passive(doc) -> 
-    ["Test server option verify_peer"];
-
-server_verify_peer_passive(suite) -> 
-    [];
-
-server_verify_peer_passive(Config) when is_list(Config) ->
-    ClientOpts = ?config(client_verification_opts, 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, []}},
-			   {options, [{active, false}, {verify, verify_peer} 
-				      | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, 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).
-
-%%--------------------------------------------------------------------
-
-server_verify_peer_active(doc) -> 
-    ["Test server option verify_peer"];
-
-server_verify_peer_active(suite) -> 
-    [];
-
-server_verify_peer_active(Config) when is_list(Config) ->
-    ClientOpts = ?config(client_verification_opts, 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}, {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, []}},
-			   {options, [{active, true} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-server_verify_peer_active_once(doc) -> 
-    ["Test server option verify_peer"];
-
-server_verify_peer_active_once(suite) -> 
-    [];
-
-server_verify_peer_active_once(Config) when is_list(Config) ->
-    ClientOpts = ?config(client_verification_opts, 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_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} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-server_verify_none_passive(doc) -> 
-    ["Test server option verify_none"];
-
-server_verify_none_passive(suite) -> 
-    [];
-
-server_verify_none_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),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, send_recv_result, []}},
-			   {options, [{active, false}, {verify, verify_none} 
-				      | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?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).
-
-%%--------------------------------------------------------------------
-
-server_verify_none_active(doc) -> 
-    ["Test server option verify_none"];
-
-server_verify_none_active(suite) -> 
-    [];
-
-server_verify_none_active(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, [{active, true}, {verify, verify_none} | 
-				      ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?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).
-
-%%--------------------------------------------------------------------
-server_verify_none_active_once(doc) -> 
-    ["Test server option verify_none"];
-
-server_verify_none_active_once(suite) -> 
-    [];
-
-server_verify_none_active_once(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_once, []}},
-			   {options, [{active, once}, {verify, verify_none} 
-				      | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, send_recv_result_active_once, []}},
-			   {options, [{active, once} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-server_verify_client_once_passive(doc) -> 
-    ["Test server option verify_client_once"];
-
-server_verify_client_once_passive(suite) -> 
-    [];
-
-server_verify_client_once_passive(Config) when is_list(Config) ->
-    ClientOpts =  ?config(client_opts, 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, []}},
-					{options, [{active, false}, {verify, verify_peer},
-						   {verify_client_once, true}
-						   | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client0 = 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, Client0, ok),
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    ssl_test_lib:close(Client0),
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, result_ok, []}},
-					{options, [{active, false} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client1, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-
-server_verify_client_once_active(doc) -> 
-    ["Test server option verify_client_once"];
-
-server_verify_client_once_active(suite) -> 
-    [];
-
-server_verify_client_once_active(Config) when is_list(Config) ->
-    ClientOpts =  ?config(client_opts, 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}, {verify, verify_peer},
-						   {verify_client_once, true}
-						   | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client0 = 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, Client0, ok),
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    ssl_test_lib:close(Client0),
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, result_ok, []}},
-					{options, [{active, true} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client1, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client1).
-    
-%%--------------------------------------------------------------------
-
-server_verify_client_once_active_once(doc) -> 
-    ["Test server option verify_client_once"];
-
-server_verify_client_once_active_once(suite) -> 
-    [];
-
-server_verify_client_once_active_once(Config) when is_list(Config) ->
-    ClientOpts =  ?config(client_opts, 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_once, []}},
-					{options, [{active, once}, {verify, verify_peer},
-						   {verify_client_once, true}
-						   | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, send_recv_result_active_once, []}},
-					{options, [{active, once} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client0, ok),
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    ssl_test_lib:close(Client0),
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {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) -> 
-    ["Test server must have cacerts if it wants to verify client"];
-
-server_verify_no_cacerts(suite) -> 
-    [];
-server_verify_no_cacerts(Config) when is_list(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()}, 
-					      {options, [{verify, verify_peer} 
-							 | ServerOpts]}]),
-        
-    ssl_test_lib:check_result(Server, {error, {eoptions, {cacertfile, ""}}}).
-
-%%--------------------------------------------------------------------
-
-server_require_peer_cert_ok(doc) ->
-    ["Test server option fail_if_no_peer_cert when peer sends cert"];
-
-server_require_peer_cert_ok(suite) ->
-    [];
-
-server_require_peer_cert_ok(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ?config(server_verification_opts, Config)],
-    ClientOpts = ?config(client_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, 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).
-
-%%--------------------------------------------------------------------
-
-server_require_peer_cert_fail(doc) ->
-    ["Test server option fail_if_no_peer_cert when peer doesn't send cert"];
-
-server_require_peer_cert_fail(suite) ->
-    [];
-
-server_require_peer_cert_fail(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ?config(server_verification_opts, Config)],
-    BadClientOpts = ?config(client_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-			   {options, [{active, false} | ServerOpts]}]),
-
-    Port  = ssl_test_lib:inet_port(Server),
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {options, [{active, false} | BadClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, {error, esslaccept},
-			      Client, {error, esslconnect}).
-
-%%--------------------------------------------------------------------
-
-client_verify_none_passive(doc) -> 
-    ["Test client option verify_none"];
-
-client_verify_none_passive(suite) -> 
-    [];
-
-client_verify_none_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),
-    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}, 
-						   {verify, verify_none}
-						   | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-client_verify_none_active(doc) -> 
-    ["Test client option verify_none"];
-
-client_verify_none_active(suite) -> 
-    [];
-
-client_verify_none_active(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, [{active, true} 
-						   | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       send_recv_result_active, []}},
-					{options, [{active, true}, 
-						   {verify, verify_none}
-						   | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-client_verify_none_active_once(doc) -> 
-    ["Test client option verify_none"];
-
-client_verify_none_active_once(suite) -> 
-    [];
-
-client_verify_none_active_once(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_once, []}},
-			   {options, [{active, once} | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       send_recv_result_active_once, 
-					       []}},
-					{options, [{active, once}, 
-						   {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."];
-
-client_renegotiate(suite) -> 
-    [];
-
+client_renegotiate() ->
+    [{doc,"Test ssl:renegotiate/1 on client."}].
 client_renegotiate(Config) when is_list(Config) ->
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From erlang to erlang",
 
-    Server = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 				   {from, self()},
 				   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
- 
+
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
+					{from, self()},
+					{mfa, {?MODULE,
 					       renegotiate, [Data]}},
 					{options, [{reuse_sessions, false} | ClientOpts]}]),
     
-    ssl_test_lib:check_result(Client, ok, Server, ok), 
+    ssl_test_lib:check_result(Client, ok, Server, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-server_renegotiate(doc) -> 
-    ["Test ssl:renegotiate/1 on server."];
-
-server_renegotiate(suite) -> 
-    [];
-
+server_renegotiate() ->
+    [{doc,"Test ssl:renegotiate/1 on server."}].
 server_renegotiate(Config) when is_list(Config) ->
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From erlang to erlang",
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
-					{mfa, {?MODULE, 
+					{mfa, {?MODULE,
 					       renegotiate, [Data]}},
 					{options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    
+
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
-					{from, self()}, 
+					{from, self()},
 					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
 					{options, [{reuse_sessions, false} | ClientOpts]}]),
     
@@ -2737,805 +1898,133 @@ server_renegotiate(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-client_renegotiate_reused_session(doc) -> 
-    ["Test ssl:renegotiate/1 on client when the ssl session will be reused."];
-
-client_renegotiate_reused_session(suite) -> 
-    [];
-
+client_renegotiate_reused_session() ->
+    [{doc,"Test ssl:renegotiate/1 on client when the ssl session will be reused."}].
 client_renegotiate_reused_session(Config) when is_list(Config) ->
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From erlang to erlang",
 
-    Server = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 				   {from, self()},
 				   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
- 
+
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
+					{from, self()},
+					{mfa, {?MODULE,
 					       renegotiate_reuse_session, [Data]}},
 					{options, [{reuse_sessions, true} | ClientOpts]}]),
     
-    ssl_test_lib:check_result(Client, ok, Server, ok), 
+    ssl_test_lib:check_result(Client, ok, Server, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
-server_renegotiate_reused_session(doc) -> 
-    ["Test ssl:renegotiate/1 on server when the ssl session will be reused."];
-
-server_renegotiate_reused_session(suite) -> 
-    [];
-
+server_renegotiate_reused_session() ->
+    [{doc,"Test ssl:renegotiate/1 on server when the ssl session will be reused."}].
 server_renegotiate_reused_session(Config) when is_list(Config) ->
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     
     Data = "From erlang to erlang",
 
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, 
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE,
 					       renegotiate_reuse_session, [Data]}},
 					{options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-					{from, self()}, 
+					{from, self()},
 					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
 					{options, [{reuse_sessions, true} | ClientOpts]}]),
-    
+
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
-client_no_wrap_sequence_number(doc) -> 
-    ["Test that erlang client will renegotiate session when",  
+client_no_wrap_sequence_number() ->
+    [{doc,"Test that erlang client will renegotiate session when",
      "max sequence number celing is about to be reached. Although"
-     "in the testcase we use the test option renegotiate_at" 
-     " to lower treashold substantially."];
-
-client_no_wrap_sequence_number(suite) -> 
-    [];
+     "in the testcase we use the test option renegotiate_at"
+     " to lower treashold substantially."}].
 
 client_no_wrap_sequence_number(Config) when is_list(Config) ->
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     ErlData = "From erlang to erlang",
     N = 10,
 
-    Server = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 				   {from, self()},
 				   {mfa, {ssl_test_lib, no_result, []}},
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
- 
+
     Version = ssl_record:highest_protocol_version(ssl_record:supported_protocol_versions()),
 
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-					{from, self()}, 
-					{mfa, {ssl_test_lib, 
+					{from, self()},
+					{mfa, {ssl_test_lib,
 					       trigger_renegotiate, [[ErlData, treashold(N, Version)]]}},
 					{options, [{reuse_sessions, false},
 						   {renegotiate_at, N} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client, ok), 
+
+    ssl_test_lib:check_result(Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
- %% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-treashold(N, {3,0}) ->
-    (N div 2) + 1;
-treashold(N, {3,1}) ->
-    (N div 2) + 1;
-treashold(N, _) ->
-    N + 1.
-    
 %%--------------------------------------------------------------------
-server_no_wrap_sequence_number(doc) -> 
-    ["Test that erlang server will renegotiate session when",  
+server_no_wrap_sequence_number() ->
+    [{doc, "Test that erlang server will renegotiate session when",
      "max sequence number celing is about to be reached. Although"
-     "in the testcase we use the test option renegotiate_at" 
-     " to lower treashold substantially."];
-
-server_no_wrap_sequence_number(suite) -> 
-    [];
+     "in the testcase we use the test option renegotiate_at"
+     " to lower treashold substantially."}].
 
 server_no_wrap_sequence_number(Config) when is_list(Config) ->
-    ServerOpts = ?config(server_opts, Config),  
-    ClientOpts = ?config(client_opts, Config),  
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Data = "From erlang to erlang",    
-    N = 10,
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {ssl_test_lib, 
-					       trigger_renegotiate, [[Data, N+2]]}},
-					{options, [{renegotiate_at, N} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {ssl_test_lib, no_result, []}},
-					{options, [{reuse_sessions, false} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-%%--------------------------------------------------------------------
-extended_key_usage_verify_peer(doc) ->
-    ["Test cert that has a critical extended_key_usage extension in verify_peer mode"];
-
-extended_key_usage_verify_peer(suite) ->
-    [];
-
-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"), 
-    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
-    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
-
-    ServerCertFile = proplists:get_value(certfile, 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, [{verify, verify_peer} | NewServerOpts]}]),
-    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_peer} | NewClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-extended_key_usage_verify_none(doc) ->
-    ["Test cert that has a critical extended_key_usage extension in verify_none mode"];
-
-extended_key_usage_verify_none(suite) ->
-    [];
-
-extended_key_usage_verify_none(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"),
-    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
-    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
-
-    ServerCertFile = proplists:get_value(certfile, 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, [{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()},
-			   {mfa, {?MODULE, send_recv_result_active, []}},
-					{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"
-     " but are present in trusted certs db."];
-
-no_authority_key_identifier(suite) -> 
-    [];
-no_authority_key_identifier(Config) when is_list(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"),
-    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
-    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
-
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    NewCertFile = filename:join(PrivDir, "server/new_cert.pem"),
-    [{'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, []),
-    NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{extensions = NewExtensions},
-
-    test_server:format("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]),
-
-    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),
-    
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, send_recv_result_active, []}},
-			   {options, NewServerOpts}]),
-    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_peer} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-delete_authority_key_extension([], Acc) ->
-    lists:reverse(Acc);
-delete_authority_key_extension([#'Extension'{extnID = ?'id-ce-authorityKeyIdentifier'} | Rest], 
-			       Acc) ->
-    delete_authority_key_extension(Rest, Acc);
-delete_authority_key_extension([Head | Rest], Acc) ->
-    delete_authority_key_extension(Rest, [Head | Acc]).
-
-%%--------------------------------------------------------------------
-
-invalid_signature_server(doc) -> 
-    ["Test server with invalid signature"];
-
-invalid_signature_server(suite) -> 
-    [];
-
-invalid_signature_server(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, "server/key.pem"),
-    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
-    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
-
-    ServerCertFile = proplists:get_value(certfile, ServerOpts),
-    NewServerCertFile = filename:join(PrivDir, "server/invalid_cert.pem"),
-    [{'Certificate', ServerDerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
-    ServerOTPCert = public_key:pkix_decode_cert(ServerDerCert, otp),
-    ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate,
-    NewServerDerCert = public_key:pkix_sign(ServerOTPTbsCert, Key), 
-    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
-    NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
-    
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					      {from, self()}, 
-					      {options, NewServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
-					      {host, Hostname},
-					      {from, self()}, 
-					      {options, [{verify, verify_peer} | ClientOpts]}]),
-    
-    tcp_delivery_workaround(Server, {error, "bad certificate"},
-			    Client, {error,"bad certificate"}).
-    
-%%--------------------------------------------------------------------
-
-invalid_signature_client(doc) -> 
-    ["Test server with invalid signature"];
-
-invalid_signature_client(suite) -> 
-    [];
-
-invalid_signature_client(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, "client/key.pem"),
-    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
-    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
-
-    ClientCertFile = proplists:get_value(certfile, ClientOpts),
-    NewClientCertFile = filename:join(PrivDir, "client/invalid_cert.pem"),
-    [{'Certificate', ClientDerCert, _}] = ssl_test_lib:pem_to_der(ClientCertFile),
-    ClientOTPCert = public_key:pkix_decode_cert(ClientDerCert, otp),
-    ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate,
-    NewClientDerCert = public_key:pkix_sign(ClientOTPTbsCert, Key), 
-    ssl_test_lib:der_to_pem(NewClientCertFile, [{'Certificate', NewClientDerCert, not_encrypted}]),
-    NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{options, [{verify, verify_peer} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
-					      {host, Hostname},
-					      {from, self()}, 
-					      {options, NewClientOpts}]),
-
-    tcp_delivery_workaround(Server, {error, "bad certificate"},
-			    Client, {error,"bad certificate"}).
-
-tcp_delivery_workaround(Server, ServerMsg, Client, ClientMsg) ->
-    receive 
-	{Server, ServerMsg} ->
-	    client_msg(Client, ClientMsg);
-	{Client, ClientMsg} ->
-	    server_msg(Server, ServerMsg);
-       	{Client, {error,closed}} ->
-	    server_msg(Server, ServerMsg);
-	{Server, {error,closed}} ->
-	    client_msg(Client, ClientMsg);
-	{Client, {error, esslconnect}} ->
-	    server_msg(Server, ServerMsg);
-	{Server, {error, esslaccept}} ->
-	    client_msg(Client, ClientMsg)
-    end.
-
-client_msg(Client, ClientMsg) ->
-    receive
-	{Client, ClientMsg} ->
-	    ok;
-	{Client, {error,closed}} ->
-	    test_server:format("client got close"),
-	    ok;
-	{Client, {error, esslconnect}} ->
-	    test_server:format("client got econnaborted"),
-	    ok;
-	Unexpected ->
-	    test_server:fail(Unexpected)
-    end.
-
-server_msg(Server, ServerMsg) ->
-    receive
-	{Server, ServerMsg} ->
-	    ok;
-	{Server, {error,closed}} ->
-	    test_server:format("server got close"),
-	    ok;
-	{Server, {error, esslaccept}} ->
-	    test_server:format("server got econnaborted"),
-	    ok;
-	Unexpected ->
-	    test_server:fail(Unexpected)
-    end.
-
-%%--------------------------------------------------------------------
-cert_expired(doc) -> 
-    ["Test server with invalid signature"];
-
-cert_expired(suite) -> 
-    [];
-
-cert_expired(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"),
-    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
-    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
-
-    ServerCertFile = proplists:get_value(certfile, ServerOpts),
-    NewServerCertFile = filename:join(PrivDir, "server/expired_cert.pem"),
-    [{'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(),
-    {Hours, Min, Sec} = time(),
-    NotBeforeStr = lists:flatten(io_lib:format("~p~s~s~s~s~sZ",[Year-2, 
-								two_digits_str(Month), 
-								two_digits_str(Day), 
-								two_digits_str(Hours), 
-								two_digits_str(Min), 
-								two_digits_str(Sec)])),
-    NotAfterStr = lists:flatten(io_lib:format("~p~s~s~s~s~sZ",[Year-1, 
-							       two_digits_str(Month), 
-							       two_digits_str(Day), 
-							       two_digits_str(Hours), 
-							       two_digits_str(Min), 
-							       two_digits_str(Sec)])),	
-    NewValidity = {'Validity', {generalTime, NotBeforeStr}, {generalTime, NotAfterStr}}, 
-
-    test_server:format("Validity: ~p ~n NewValidity: ~p ~n", 
-		       [OTPTbsCert#'OTPTBSCertificate'.validity, NewValidity]),
-
-    NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{validity = NewValidity},
-    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),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					      {from, self()}, 
-					      {options, NewServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
-					      {host, Hostname},
-					      {from, self()}, 
-					      {options, [{verify, verify_peer} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, {error, "certificate expired"}, 
-			      Client, {error, "certificate expired"}).
-
-two_digits_str(N) when N < 10 ->
-    lists:flatten(io_lib:format("0~p", [N]));
-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).
-
-%%--------------------------------------------------------------------
-verify_fun_always_run_client(doc) ->
-    ["Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"];
-verify_fun_always_run_client(suite) ->
-    [];
-verify_fun_always_run_client(Config) when is_list(Config) ->
-    ClientOpts =  ?config(client_verification_opts, Config),
-    ServerOpts =  ?config(server_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options, ServerOpts}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    %% If user verify fun is called correctly we fail the connection.
-    %% otherwise we can not tell this case apart form where we miss
-    %% to call users verify fun
-    FunAndState =  {fun(_,{extension, _}, UserState) ->
-			    {unknown, UserState};
-		       (_, valid, [ChainLen]) ->
-			    {valid, [ChainLen + 1]};
-		       (_, valid_peer, [2]) ->
-			    {fail, "verify_fun_was_always_run"};
-		       (_, valid_peer, UserState) ->
-			    {valid, UserState}
-		    end, [0]},
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options,
-					       [{verify, verify_peer},
-						{verify_fun, FunAndState}
-						| ClientOpts]}]),
-    %% Server error may be esslaccept or closed depending on timing
-    %% this is not a bug it is a circumstance of how tcp works!
-    receive
-	{Server, ServerError} ->
-	    test_server:format("Server Error ~p~n", [ServerError])
-    end,
-
-    ssl_test_lib:check_result(Client, {error, esslconnect}).
-
-%%--------------------------------------------------------------------
-verify_fun_always_run_server(doc) ->
-    ["Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"];
-verify_fun_always_run_server(suite) ->
-    [];
-verify_fun_always_run_server(Config) when is_list(Config) ->
-    ClientOpts =  ?config(client_verification_opts, Config),
-    ServerOpts =  ?config(server_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    %% If user verify fun is called correctly we fail the connection.
-    %% otherwise we can not tell this case apart form where we miss
-    %% to call users verify fun
-    FunAndState =  {fun(_,{extension, _}, UserState) ->
-			    {unknown, UserState};
-		       (_, valid, [ChainLen]) ->
-			    {valid, [ChainLen + 1]};
-		       (_, valid_peer, [2]) ->
-			    {fail, "verify_fun_was_always_run"};
-		       (_, valid_peer, UserState) ->
-			    {valid, UserState}
-		    end, [0]},
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options,
-					       [{verify, verify_peer},
-						{verify_fun, FunAndState} |
-						ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options,
-					       [{verify, verify_peer}
-						| ClientOpts]}]),
-
-    %% Client error may be esslconnect or closed depending on timing
-    %% this is not a bug it is a circumstance of how tcp works!
-    receive
-	{Client, ClientError} ->
-	    test_server:format("Client Error ~p~n", [ClientError])
-    end,
-
-    ssl_test_lib:check_result(Server, {error, esslaccept}).
-
-%%--------------------------------------------------------------------
-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]}]),
+    ClientOpts = ?config(client_opts, Config),
 
-    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).
+    Data = "From erlang to erlang",
+    N = 10,
 
-%%--------------------------------------------------------------------
-unknown_server_ca_accept_backwardscompatibility(doc) ->
-    ["Test that old style verify_funs will work"];
-unknown_server_ca_accept_backwardscompatibility(suite) ->
-    [];
-unknown_server_ca_accept_backwardscompatibility(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,
+					{mfa, {ssl_test_lib,
+					       trigger_renegotiate, [[Data, N+2]]}},
+					{options, [{renegotiate_at, N} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE,
-					       send_recv_result_active, []}},
-					{options,
-					 [{verify, verify_peer},
-					  {verify_fun, VerifyFun}| ClientOpts]}]),
+					{mfa, {ssl_test_lib, no_result, []}},
+					{options, [{reuse_sessions, false} | ClientOpts]}]),
 
-    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:check_result(Server, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-der_input(doc) ->
-    ["Test to input certs and key as der"];
-
-der_input(suite) ->
-    [];
+der_input() ->
+    [{doc,"Test to input certs and key as der"}].
 
 der_input(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
@@ -3556,19 +2045,19 @@ der_input(Config) when is_list(Config) ->
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 					{from, self()},
-					{mfa, {?MODULE, send_recv_result, []}},
+					{mfa, {ssl_test_lib, send_recv_result, []}},
 					{options, [{active, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE, send_recv_result, []}},
+					{mfa, {ssl_test_lib, send_recv_result, []}},
 					{options, [{active, false} | ClientOpts]}]),
 
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
-
+%%--------------------------------------------------------------------
 der_input_opts(Opts) ->
     Certfile = proplists:get_value(certfile, Opts),
     CaCertsfile = proplists:get_value(cacertfile, Opts),
@@ -3585,12 +2074,9 @@ der_input_opts(Opts) ->
     {Cert, {Asn1Type, Key}, CaCerts, DHParams}.
 
 %%--------------------------------------------------------------------
-%% different_ca_peer_sign(doc) ->
+%% different_ca_peer_sign() ->
 %%     ["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),
@@ -3598,7 +2084,7 @@ der_input_opts(Opts) ->
 %%     {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, []}},
+%% 			   {mfa, {ssl_test_lib, send_recv_result_active_once, []}},
 %% 			   {options, [{active, once},
 %% 				      {verify, verify_peer} | ServerOpts]}]),
 %%     Port  = ssl_test_lib:inet_port(Server),
@@ -3606,7 +2092,7 @@ der_input_opts(Opts) ->
 %%     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 %% 					{host, Hostname},
 %% 					{from, self()},
-%% 					{mfa, {?MODULE,
+%% 					{mfa, {ssl_test_lib,
 %% 					       send_recv_result_active_once,
 %% 					       []}},
 %% 					{options, [{active, once},
@@ -3619,12 +2105,8 @@ der_input_opts(Opts) ->
 
 
 %%--------------------------------------------------------------------
-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() ->
+    [{doc,"Check that a session is not reused if the server is restarted with a new cert."}].
 no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
 
     ClientOpts = ?config(client_opts, Config),
@@ -3650,7 +2132,7 @@ no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
 	end,
 
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
     Monitor = erlang:monitor(process, Server),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client0),
@@ -3672,7 +2154,7 @@ no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
 		      {from, self()},  {options, ClientOpts}]),
     receive
 	{Client1, SessionInfo} ->
-	    test_server:fail(session_reused_when_server_has_new_cert);
+	    ct:fail(session_reused_when_server_has_new_cert);
 	{Client1, _Other} ->
 	   ok
     end,
@@ -3680,12 +2162,9 @@ no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
     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() ->
+    [{doc,"Check that a session is not reused if a server is restarted with a new "
+      "cert contained in a file with the same name as the old cert."}].
 
 no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -3715,7 +2194,7 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
 
     %% Make sure session is registered and we get
     %% new file time stamp when calling new_config!
-    test_server:sleep(?SLEEP* 2),
+    ct:sleep(?SLEEP* 2),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client0),
 
@@ -3735,7 +2214,7 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
 				   {from, self()},  {options, ClientOpts}]),
     receive
 	{Client1, SessionInfo} ->
-	    test_server:fail(session_reused_when_server_has_new_cert);
+	    ct:fail(session_reused_when_server_has_new_cert);
 	{Client1, _Other} ->
 	   ok
     end,
@@ -3743,11 +2222,8 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
     ssl_test_lib:close(Client1).
 
 %%--------------------------------------------------------------------
-reuseaddr(doc) ->
-    [""];
-
-reuseaddr(suite) ->
-    [];
+reuseaddr() ->
+    [{doc,"Test reuseaddr option"}].
 
 reuseaddr(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -3765,24 +2241,19 @@ reuseaddr(Config) when is_list(Config) ->
 				   {from, self()},
 				   {mfa, {ssl_test_lib, no_result, []}},
 				   {options, [{active, false} | ClientOpts]}]),
-    Monitor = erlang:monitor(process, Server),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
-    receive
-	{'DOWN', Monitor, _, _, _} ->
-	    ok
-    end,
     
     Server1 =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options,  [{active, false} | ServerOpts]}]),
     Client1 =
 	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 				   {host, Hostname},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options, [{active, false} | ClientOpts]}]),
 
     ssl_test_lib:check_result(Server1, ok, Client1, ok),
@@ -3790,14 +2261,51 @@ reuseaddr(Config) when is_list(Config) ->
     ssl_test_lib:close(Client1).
 
 %%--------------------------------------------------------------------
+tcp_reuseaddr() ->
+    [{doc, "Reference test case."}].
+tcp_reuseaddr(Config) when is_list(Config) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {transport, gen_tcp},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {options,  [{active, false}, {reuseaddr, true}]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+                                   {transport, gen_tcp},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {options, [{active, false}]}]),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+				   {transport, gen_tcp},
+				   {mfa, {?MODULE, tcp_send_recv_result, []}},
+				   {options,  [{active, false}, {reuseaddr, true}]}]),
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+                                   {transport, gen_tcp}, 
+				   {mfa, {?MODULE, tcp_send_recv_result, []}},
+				   {options, [{active, false}]}]),
 
-hibernate(doc) -> 
-    ["Check that an SSL connection that is started with option "
-     "{hibernate_after, 1000} indeed hibernates after 1000ms of "
-     "inactivity"];
+    ssl_test_lib:check_result(Server1, ok, Client1, ok),
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1).
 
-hibernate(suite) ->
-    [];
+%%--------------------------------------------------------------------
+
+hibernate() ->
+    [{doc,"Check that an SSL connection that is started with option "
+      "{hibernate_after, 1000} indeed hibernates after 1000ms of "
+      "inactivity"}].
 
 hibernate(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -3807,14 +2315,14 @@ hibernate(Config) ->
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 					{from, self()},
-					{mfa, {?MODULE, send_recv_result_active, []}},
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
 					{options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     {Client, #sslsocket{pid=Pid}} = ssl_test_lib:start_client([return_socket,
                     {node, ClientNode}, {port, Port},
 					{host, Hostname},
 					{from, self()},
-					{mfa, {?MODULE, send_recv_result_active, []}},
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
 					{options, [{hibernate_after, 1000}|ClientOpts]}]),
     {current_function, _} =
         process_info(Pid, current_function),
@@ -3828,11 +2336,8 @@ hibernate(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-listen_socket(doc) ->
-    ["Check error handling and inet compliance when calling API functions with listen sockets."];
-
-listen_socket(suite) ->
-    [];
+listen_socket() ->
+    [{doc,"Check error handling and inet compliance when calling API functions with listen sockets."}].
 
 listen_socket(Config) ->
     ServerOpts = ?config(server_opts, Config),
@@ -3856,10 +2361,9 @@ listen_socket(Config) ->
 
     ok = ssl:close(ListenSocket).
 %%--------------------------------------------------------------------
-ssl_accept_timeout(doc) ->
-    ["Test ssl:ssl_accept timeout"];
-ssl_accept_timeout(suite) ->
-    [];
+ssl_accept_timeout() ->
+    [{doc,"Test ssl:ssl_accept timeout"}].
+
 ssl_accept_timeout(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),
@@ -3883,10 +2387,9 @@ ssl_accept_timeout(Config) ->
     end.
 
 %%--------------------------------------------------------------------
-ssl_recv_timeout(doc) ->
-    ["Test ssl:ssl_accept timeout"];
-ssl_recv_timeout(suite) ->
-    [];
+ssl_recv_timeout() ->
+    [{doc,"Test ssl:ssl_accept timeout"}].
+
 ssl_recv_timeout(Config) ->
     ServerOpts = ?config(server_opts, Config),
     ClientOpts = ?config(client_opts, Config),
@@ -3912,11 +2415,8 @@ ssl_recv_timeout(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-
-connect_twice(doc) ->
-    [""];
-connect_twice(suite) ->
-    [];
+connect_twice() ->
+    [{doc,""}].
 connect_twice(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -3926,7 +2426,7 @@ connect_twice(Config) when is_list(Config) ->
     Server =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options,  [{keepalive, true},{active, false}
 					       | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
@@ -3934,7 +2434,7 @@ connect_twice(Config) when is_list(Config) ->
 	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 				   {host, Hostname},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options, [{keepalive, true},{active, false}
 					      | ClientOpts]}]),
     Server ! listen,
@@ -3944,11 +2444,11 @@ connect_twice(Config) when is_list(Config) ->
 				   {node, ClientNode}, {port, Port},
 				   {host, Hostname},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options, [{keepalive, true},{active, false}
 					      | ClientOpts]}]),
 
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+    ct:print("Testcase ~p, Client ~p  Server ~p ~n",
 			 [self(), Client, Server]),
 
     ssl_test_lib:check_result(Server, ok, Client, ok),
@@ -3959,13 +2459,9 @@ connect_twice(Config) when is_list(Config) ->
     ssl_test_lib:close(Client1).
 
 %%--------------------------------------------------------------------
-renegotiate_dos_mitigate_active(doc) ->
-    ["Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
-    "immediately after each other"];
-
-renegotiate_dos_mitigate_active(suite) ->
-    [];
-
+renegotiate_dos_mitigate_active() ->
+    [{doc, "Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
+      "immediately after each other"}].
 renegotiate_dos_mitigate_active(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
     ClientOpts = ?config(client_opts, Config),
@@ -3975,7 +2471,7 @@ renegotiate_dos_mitigate_active(Config) when is_list(Config) ->
     Server =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result_active, []}},
+				   {mfa, {ssl_test_lib, send_recv_result_active, []}},
 				   {options, [ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
 
@@ -3991,13 +2487,9 @@ renegotiate_dos_mitigate_active(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-renegotiate_dos_mitigate_passive(doc) ->
-    ["Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
-    "immediately after each other"];
-
-renegotiate_dos_mitigate_passive(suite) ->
-    [];
-
+renegotiate_dos_mitigate_passive() ->
+    [{doc, "Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
+      "immediately after each other"}].
 renegotiate_dos_mitigate_passive(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
     ClientOpts = ?config(client_opts, Config),
@@ -4007,7 +2499,7 @@ renegotiate_dos_mitigate_passive(Config) when is_list(Config) ->
     Server =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
 				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result, []}},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
 				   {options, [{active, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
  
@@ -4023,8 +2515,8 @@ renegotiate_dos_mitigate_passive(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-tcp_error_propagation_in_active_mode(doc) ->
-    ["Test that process recives {ssl_error, Socket, closed} when tcp error ocurres"];
+tcp_error_propagation_in_active_mode() ->
+    [{doc,"Test that process recives {ssl_error, Socket, closed} when tcp error ocurres"}].
 tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -4053,11 +2545,9 @@ tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
 
     ssl_test_lib:check_result(Client, {ssl_closed, SslSocket}).
 
-
 %%--------------------------------------------------------------------
-
-recv_error_handling(doc) ->
-    ["Special case of call error handling"];
+recv_error_handling() ->
+    [{doc,"Special case of call error handling"}].
 recv_error_handling(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -4077,11 +2567,11 @@ recv_error_handling(Config) when is_list(Config) ->
     ssl:close(SslSocket),
     ssl_test_lib:check_result(Server, ok).
 
-
 %%--------------------------------------------------------------------
 
-rizzo(doc) -> ["Test that there is a 1/n-1-split for non RC4 in 'TLS < 1.1' as it is
-    vunrable to Rizzo/Dungon attack"];
+rizzo() ->
+    [{doc, "Test that there is a 1/n-1-split for non RC4 in 'TLS < 1.1' as it is
+    vunrable to Rizzo/Dungon attack"}].
 
 rizzo(Config) when is_list(Config) ->
     Ciphers  = [X || X ={_,Y,_} <- ssl:cipher_suites(), Y  =/= rc4_128],
@@ -4090,8 +2580,8 @@ rizzo(Config) when is_list(Config) ->
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_rizzo, []}).
 %%--------------------------------------------------------------------
-no_rizzo_rc4(doc) -> 
-    ["Test that there is no 1/n-1-split for RC4 as it is not vunrable to Rizzo/Dungon attack"];
+no_rizzo_rc4() ->
+    [{doc,"Test that there is no 1/n-1-split for RC4 as it is not vunrable to Rizzo/Dungon attack"}].
 
 no_rizzo_rc4(Config) when is_list(Config) ->
     Ciphers = [X || X ={_,Y,_} <- ssl:cipher_suites(),Y == rc4_128],
@@ -4101,59 +2591,9 @@ no_rizzo_rc4(Config) when is_list(Config) ->
 			{?MODULE, send_recv_result_active_no_rizzo, []}).
 
 %%--------------------------------------------------------------------
-run_send_recv_rizzo(Ciphers, Config, Version, Mfa) ->
-    Result =  lists:map(fun(Cipher) -> 
-				rizzo_test(Cipher, Config, Version, Mfa) end,
-			Ciphers),
-    case lists:flatten(Result) of
-	[] ->
-	    ok;
-	Error ->
-	    test_server:format("Cipher suite errors: ~p~n", [Error]),
-	    test_server:fail(cipher_suite_failed_see_test_case_log) 
-    end.
-
-rizzo_test(Cipher, Config, Version, Mfa) ->
-   {ClientOpts, ServerOpts} = client_server_opts(Cipher, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, Mfa},
-			   {options, [{active, true}, {ciphers, [Cipher]},
-				       {versions, [Version]}
-				      | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, Mfa},
-			   {options, [{active, true} | ClientOpts]}]),
-    
-    Result = ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    case Result of
-	ok ->
-	    [];
-	Error ->
-	    [{Cipher, Error}]
-    end.
-
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == rsa orelse KeyAlgo == dhe_rsa ->
-    {?config(client_opts, Config),
-     ?config(server_opts, Config)};   
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == dss orelse KeyAlgo == dhe_dss ->
-    {?config(client_dsa_opts, Config),
-     ?config(server_dsa_opts, Config)}.
-
-
-%%--------------------------------------------------------------------
-
-new_server_wants_peer_cert(doc) ->
-    ["Test that server configured to do client certification does"
-     " not reuse session without a client certificate."];
-new_server_wants_peer_cert(suite) ->
-    [];
+new_server_wants_peer_cert() ->
+    [{doc, "Test that server configured to do client certification does"
+      " not reuse session without a client certificate."}].
 new_server_wants_peer_cert(Config) when is_list(Config) ->
     ServerOpts = ?config(server_opts, Config),
     VServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
@@ -4206,14 +2646,69 @@ new_server_wants_peer_cert(Config) when is_list(Config) ->
     ssl_test_lib:close(Client),
     ssl_test_lib:close(Client1).
 
+%%--------------------------------------------------------------------
+session_cache_process_list() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
+session_cache_process_list(Config) when is_list(Config) ->
+    session_cache_process(list,Config).
+%%--------------------------------------------------------------------
+session_cache_process_mnesia() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
+session_cache_process_mnesia(Config) when is_list(Config) ->
+    session_cache_process(mnesia,Config).
 
 %%--------------------------------------------------------------------
-%%% Internal functions
+%% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 send_recv_result(Socket) ->
     ssl:send(Socket, "Hello world"),
     {ok,"Hello world"} = ssl:recv(Socket, 11),
     ok.
+tcp_send_recv_result(Socket) ->
+    gen_tcp:send(Socket, "Hello world"),
+    {ok,"Hello world"} = gen_tcp:recv(Socket, 11),
+    ok.
+
+basic_verify_test_no_close(Config) ->
+    ClientOpts = ?config(client_verification_opts, 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, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ClientOpts}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    {Server, Client}.
+
+basic_test(Config) ->
+    ClientOpts = ?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, send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ClientOpts}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 send_recv_result_timeout_client(Socket) ->
     {error, timeout} = ssl:recv(Socket, 11, 500),
@@ -4241,17 +2736,6 @@ recv_close(Socket) ->
 	    ok
     end.
 
-send_recv_result_active(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    receive 
-	{ssl, Socket, "H"} ->
-	    receive 
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end;
-	{ssl, Socket, "Hello world"} ->
-	    ok
-    end.
 
 send_recv_result_active_rizzo(Socket) ->
     ssl:send(Socket, "Hello world"),
@@ -4270,26 +2754,13 @@ send_recv_result_active_no_rizzo(Socket) ->
 	    ok
     end.
 
-send_recv_result_active_once(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    receive 
-	{ssl, Socket, "H"} ->
-	    ssl:setopts(Socket, [{active, once}]),
-	    receive 
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end;
-	{ssl, Socket, "Hello world"} ->
-	    ok
-    end.
-
 result_ok(_Socket) ->
     ok.
 
 renegotiate(Socket, Data) ->
-    test_server:format("Renegotiating ~n", []),
+    ct:print("Renegotiating ~n", []),
     Result = ssl:renegotiate(Socket),
-    test_server:format("Result ~p~n", [Result]),
+    ct:print("Result ~p~n", [Result]),
     ssl:send(Socket, Data),
     case Result of
 	ok ->
@@ -4300,7 +2771,7 @@ renegotiate(Socket, Data) ->
 
 renegotiate_reuse_session(Socket, Data) ->
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
     renegotiate(Socket, Data).
 
 renegotiate_immediately(Socket) ->
@@ -4316,9 +2787,9 @@ renegotiate_immediately(Socket) ->
     end,
     ok = ssl:renegotiate(Socket),  
     {error, renegotiation_rejected} = ssl:renegotiate(Socket),
-    test_server:sleep(?RENEGOTIATION_DISABLE_TIME +1),
+    ct:sleep(?RENEGOTIATION_DISABLE_TIME +1),
     ok = ssl:renegotiate(Socket),
-    test_server:format("Renegotiated again"),
+    ct:print("Renegotiated again"),
     ssl:send(Socket, "Hello world"),
     ok.
     
@@ -4337,27 +2808,11 @@ new_config(PrivDir, ServerOpts0) ->
     ServerOpts = proplists:delete(keyfile, ServerOpts2),
 
     {ok, PEM} = file:read_file(NewCaCertFile),
-    test_server:format("CA file content: ~p~n", [public_key:pem_decode(PEM)]),
+    ct:print("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)"];
-
-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_process(_Type,Config) when is_list(Config) ->
     reuse_session(Config).
 
@@ -4499,9 +2954,9 @@ erlang_ssl_receive(Socket, Data) ->
 	    io:format("Received ~p~n",[Byte]),
 	    erlang_ssl_receive(Socket, tl(Data));
 	Other ->
-	    test_server:fail({unexpected_message, Other})
+	    ct:fail({unexpected_message, Other})
     after ?SLEEP * 3 ->
-	    test_server:fail({did_not_get, Data})
+	    ct:fail({did_not_get, Data})
     end.
 
 receive_msg(_) ->
@@ -4509,3 +2964,222 @@ receive_msg(_) ->
 	Msg ->
 	   Msg
     end.
+
+controlling_process_result(Socket, Pid, Msg) ->
+    ok = ssl:controlling_process(Socket, Pid),
+    %% Make sure other side has evaluated controlling_process
+    %% before message is sent
+    ct:sleep(?SLEEP),
+    ssl:send(Socket, Msg),
+    no_result_msg.
+
+receive_s_rizzo_duong_beast() ->
+    receive
+	{ssl, _, "erver hello"} ->
+	    receive
+		{ssl, _, "C"} ->
+		    receive
+			{ssl, _, "lient hello"} ->
+			    ok
+		    end
+	    end
+    end.
+receive_c_rizzo_duong_beast() ->
+    receive
+	{ssl, _, "lient hello"} ->
+	    receive
+		{ssl, _, "S"} ->
+		    receive
+			{ssl, _, "erver hello"} ->
+			    ok
+		    end
+	    end
+    end.
+
+controller_dies_result(_Socket, _Pid, _Msg) ->
+    receive Result -> Result end.
+
+get_close(Pid, Where) ->
+    receive
+	{'EXIT', Pid, _Reason} ->
+	    receive
+		{_, {ssl_closed, Socket}} ->
+		    ct:print("Socket closed ~p~n",[Socket]);
+		Unexpected ->
+		    ct:print("Unexpected ~p~n",[Unexpected]),
+		    ct:fail({line, ?LINE-1})
+	    after 5000 ->
+		    ct:fail({timeout, {line, ?LINE, Where}})
+	    end;
+	Unexpected ->
+	    ct:print("Unexpected ~p~n",[Unexpected]),
+	    ct:fail({line, ?LINE-1})
+    after 5000 ->
+	    ct:fail({timeout, {line, ?LINE, Where}})
+    end.
+
+run_send_recv_rizzo(Ciphers, Config, Version, Mfa) ->
+    Result =  lists:map(fun(Cipher) ->
+				rizzo_test(Cipher, Config, Version, Mfa) end,
+			Ciphers),
+    case lists:flatten(Result) of
+	[] ->
+	    ok;
+	Error ->
+	    ct:print("Cipher suite errors: ~p~n", [Error]),
+	    ct:fail(cipher_suite_failed_see_test_case_log)
+    end.
+
+rizzo_test(Cipher, Config, Version, Mfa) ->
+   {ClientOpts, ServerOpts} = client_server_opts(Cipher, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, Mfa},
+			   {options, [{active, true}, {ciphers, [Cipher]},
+				       {versions, [Version]}
+				      | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, Mfa},
+			   {options, [{active, true} | ClientOpts]}]),
+
+    Result = ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    case Result of
+	ok ->
+	    [];
+	Error ->
+	    [{Cipher, Error}]
+    end.
+
+client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == rsa orelse KeyAlgo == dhe_rsa ->
+    {?config(client_opts, Config),
+     ?config(server_opts, Config)};
+client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == dss orelse KeyAlgo == dhe_dss ->
+    {?config(client_dsa_opts, Config),
+     ?config(server_dsa_opts, Config)}.
+
+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, ClientOpts, ServerOpts) end,
+			Ciphers),
+    case lists:flatten(Result) of
+	[] ->
+	    ok;
+	Error ->
+	    ct:print("Cipher suite errors: ~p~n", [Error]),
+	    ct:fail(cipher_suite_failed_see_test_case_log)
+    end.
+
+erlang_cipher_suite(Suite) when is_list(Suite)->
+    ssl:suite_definition(ssl_cipher:openssl_suite(Suite));
+erlang_cipher_suite(Suite) ->
+    Suite.
+
+cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
+    %% process_flag(trap_exit, true),
+    ct:print("Testing CipherSuite ~p~n", [CipherSuite]),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    ErlangCipherSuite = erlang_cipher_suite(CipherSuite),
+
+    ConnectionInfo = {ok, {Version, ErlangCipherSuite}},
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
+			   {options,
+			    [{ciphers,[CipherSuite]} |
+			     ClientOpts]}]),
+
+    Result = ssl_test_lib:wait_for_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+
+    case Result of
+	ok ->
+	    [];
+	Error ->
+	    [{ErlangCipherSuite, Error}]
+    end.
+
+connection_info_result(Socket) ->
+    ssl:connection_info(Socket).
+
+connect_dist_s(S) ->
+    Msg = term_to_binary({erlang,term}),
+    ok = ssl:send(S, Msg).
+
+connect_dist_c(S) ->
+    Test = binary_to_list(term_to_binary({erlang,term})),
+    {ok, Test} = ssl:recv(S, 0, 10000),
+    ok.
+
+ %% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast
+treashold(N, {3,0}) ->
+    (N div 2) + 1;
+treashold(N, {3,1}) ->
+    (N div 2) + 1;
+treashold(N, _) ->
+    N + 1.
+
+get_invalid_inet_option(Socket) ->
+    {error, {eoptions, {inet_option, foo, _}}} = ssl:getopts(Socket, [foo]),
+    ok.
+
+shutdown_result(Socket, server) ->
+    ssl:send(Socket, "Hej"),
+    ssl:shutdown(Socket, write),
+    {ok, "Hej hopp"} = ssl:recv(Socket, 8),
+    ok;
+
+shutdown_result(Socket, client) ->
+    {ok, "Hej"} = ssl:recv(Socket, 3),
+    ssl:send(Socket, "Hej hopp"),
+    ssl:shutdown(Socket, write),
+    ok.
+
+shutdown_write_result(Socket, server) ->
+    ct:sleep(?SLEEP),
+    ssl:shutdown(Socket, write);
+shutdown_write_result(Socket, client) ->
+    ssl:recv(Socket, 0).
+
+dummy(_Socket) ->
+    %% Should not happen as the ssl connection will not be established
+    %% due to fatal handshake failiure
+    exit(kill).
+
+shutdown_both_result(Socket, server) ->
+    ct:sleep(?SLEEP),
+    ssl:shutdown(Socket, read_write);
+shutdown_both_result(Socket, client) ->
+    ssl:recv(Socket, 0).
+
+peername_result(S) ->
+    ssl:peername(S).
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
new file mode 100644
index 0000000000..86e1d47be7
--- /dev/null
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -0,0 +1,978 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have 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_certificate_verify_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+-include("ssl_internal.hrl").
+-include("ssl_alert.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_record.hrl").
+-include("ssl_handshake.hrl").
+
+-define(LONG_TIMEOUT, 600000).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [{group, active},
+     {group, passive},
+     {group, active_once},
+     {group, error_handling}].
+
+
+groups() ->
+    [{active, [], tests()},
+     {active_once, [], tests()},
+     {passive, [], tests()},
+     {error_handling, [],error_handling_tests()}].
+
+tests() ->
+    [server_verify_peer,
+     server_verify_none,
+     server_require_peer_cert_ok,
+     server_require_peer_cert_fail,
+     verify_fun_always_run_client,
+     verify_fun_always_run_server,
+     cert_expired,
+     invalid_signature_client,
+     invalid_signature_server,
+     extended_key_usage_verify_peer,
+     extended_key_usage_verify_none].
+
+error_handling_tests()->
+    [client_with_cert_cipher_suites_handshake,
+     server_verify_no_cacerts,
+     unknown_server_ca_fail,
+     unknown_server_ca_accept_verify_none,
+     unknown_server_ca_accept_verify_peer,
+     unknown_server_ca_accept_backwardscompatibility,
+     no_authority_key_identifier].
+
+init_per_suite(Config0) ->
+    Dog = ct:timetrap(?LONG_TIMEOUT *2),
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    application:start(ssl),
+	    %% make rsa certs using oppenssl
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config0),
+				      ?config(priv_dir, Config0))),
+	    ct:print("Make certs  ~p~n", [Result]),
+
+	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+	    Config = ssl_test_lib:cert_options(Config1),
+	    [{watchdog, Dog} | Config]
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+init_per_group(active, Config) ->
+    [{active, true}, {receive_function, send_recv_result_active}  | Config];
+init_per_group(active_once, Config) ->
+    [{active, once}, {receive_function, send_recv_result_active_once}  | Config];
+init_per_group(passive, Config) ->
+    [{active, false}, {receive_function, send_recv_result} |  Config];
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+server_verify_peer() ->
+    [{doc,"Test server option verify_peer"}].
+server_verify_peer(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_verification_opts, Config),
+    ServerOpts = ?config(server_verification_opts, Config),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{active, Active}, {verify, verify_peer}
+				      | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{active, Active} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+server_verify_none() ->
+    [{doc,"Test server option verify_none"}].
+
+server_verify_none(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_opts, Config),
+    ServerOpts =  ?config(server_opts, Config),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{active, Active}, {verify, verify_none}
+				      | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{active, Active} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
+server_verify_client_once() ->
+    [{doc,"Test server option verify_client_once"}].
+
+server_verify_client_once(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_opts, Config),
+    ServerOpts =  ?config(server_verification_opts, Config),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {ssl_test_lib, ReceiveFunction, []}},
+					{options, [{active, Active}, {verify, verify_peer},
+						   {verify_client_once, true}
+						   | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib, ReceiveFunction, []}},
+					{options, [{active, Active} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client0, ok),
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
+    ssl_test_lib:close(Client0),
+    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, result_ok, []}},
+					{options, [{active, Active} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Client1, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client1).
+
+%%--------------------------------------------------------------------
+
+server_require_peer_cert_ok() ->
+    [{doc,"Test server option fail_if_no_peer_cert when peer sends cert"}].
+
+server_require_peer_cert_ok(Config) when is_list(Config) ->
+    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ?config(server_verification_opts, Config)],
+    ClientOpts = ?config(client_verification_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {ssl_test_lib,send_recv_result, []}},
+			   {options, [{active, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, send_recv_result, []}},
+			   {options, [{active, false} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
+server_require_peer_cert_fail() ->
+    [{doc,"Test server option fail_if_no_peer_cert when peer doesn't send cert"}].
+
+server_require_peer_cert_fail(Config) when is_list(Config) ->
+    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ?config(server_verification_opts, Config)],
+    BadClientOpts = ?config(client_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+			   {options, [{active, false} | ServerOpts]}]),
+
+    Port  = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {options, [{active, false} | BadClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, {error, {essl, "handshake failure"}},
+			      Client, {error, {essl, "handshake failure"}}).
+
+
+%%--------------------------------------------------------------------
+verify_fun_always_run_client() ->
+    [{doc,"Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"}].
+
+verify_fun_always_run_client(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_verification_opts, Config),
+    ServerOpts =  ?config(server_verification_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options, ServerOpts}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    %% If user verify fun is called correctly we fail the connection.
+    %% otherwise we can not tell this case apart form where we miss
+    %% to call users verify fun
+    FunAndState =  {fun(_,{extension, _}, UserState) ->
+			    {unknown, UserState};
+		       (_, valid, [ChainLen]) ->
+			    {valid, [ChainLen + 1]};
+		       (_, valid_peer, [2]) ->
+			    {fail, "verify_fun_was_always_run"};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, [0]},
+
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options,
+					       [{verify, verify_peer},
+						{verify_fun, FunAndState}
+						| ClientOpts]}]),
+    %% Server error may be {essl,"handshake failure"} or closed depending on timing
+    %% this is not a bug it is a circumstance of how tcp works!
+    receive
+	{Server, ServerError} ->
+	    ct:print("Server Error ~p~n", [ServerError])
+    end,
+
+    ssl_test_lib:check_result(Client, {error, {essl, "handshake failure"}}).
+
+%%--------------------------------------------------------------------
+verify_fun_always_run_server() ->
+    [{doc,"Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"}].
+verify_fun_always_run_server(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_verification_opts, Config),
+    ServerOpts =  ?config(server_verification_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    %% If user verify fun is called correctly we fail the connection.
+    %% otherwise we can not tell this case apart form where we miss
+    %% to call users verify fun
+    FunAndState =  {fun(_,{extension, _}, UserState) ->
+			    {unknown, UserState};
+		       (_, valid, [ChainLen]) ->
+			    {valid, [ChainLen + 1]};
+		       (_, valid_peer, [2]) ->
+			    {fail, "verify_fun_was_always_run"};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, [0]},
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options,
+					       [{verify, verify_peer},
+						{verify_fun, FunAndState} |
+						ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options,
+					       [{verify, verify_peer}
+						| ClientOpts]}]),
+
+    %% Client error may be {essl, "handshake failure" } or closed depending on timing
+    %% this is not a bug it is a circumstance of how tcp works!
+    receive
+	{Client, ClientError} ->
+	    ct:print("Client Error ~p~n", [ClientError])
+    end,
+
+    ssl_test_lib:check_result(Server, {error, {essl, "handshake failure"}}).
+
+%%--------------------------------------------------------------------
+
+client_verify_none_passive() ->
+    [{doc,"Test client option verify_none"}].
+
+client_verify_none_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),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {ssl_test_lib, send_recv_result, []}},
+					{options, [{active, false}
+						   | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib, send_recv_result, []}},
+					{options, [{active, false},
+						   {verify, verify_none}
+						   | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+cert_expired() ->
+    [{doc,"Test server with expired certificate"}].
+
+cert_expired(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"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    NewServerCertFile = filename:join(PrivDir, "server/expired_cert.pem"),
+    [{'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(),
+    {Hours, Min, Sec} = time(),
+    NotBeforeStr = lists:flatten(io_lib:format("~p~s~s~s~s~sZ",[Year-2,
+								two_digits_str(Month),
+								two_digits_str(Day),
+								two_digits_str(Hours),
+								two_digits_str(Min),
+								two_digits_str(Sec)])),
+    NotAfterStr = lists:flatten(io_lib:format("~p~s~s~s~s~sZ",[Year-1,
+							       two_digits_str(Month),
+							       two_digits_str(Day),
+							       two_digits_str(Hours),
+							       two_digits_str(Min),
+							       two_digits_str(Sec)])),
+    NewValidity = {'Validity', {generalTime, NotBeforeStr}, {generalTime, NotAfterStr}},
+
+    ct:print("Validity: ~p ~n NewValidity: ~p ~n",
+		       [OTPTbsCert#'OTPTBSCertificate'.validity, NewValidity]),
+
+    NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{validity = NewValidity},
+    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),
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, NewServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {options, [{verify, verify_peer} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, {error, {essl, "certificate expired"}},
+			      Client, {error, {essl, "certificate expired"}}).
+
+two_digits_str(N) when N < 10 ->
+    lists:flatten(io_lib:format("0~p", [N]));
+two_digits_str(N) ->
+    lists:flatten(io_lib:format("~p", [N])).
+
+%%--------------------------------------------------------------------
+
+client_verify_none_active() ->
+    [{doc,"Test client option verify_none"}].
+
+client_verify_none_active(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,
+					       send_recv_result_active, []}},
+					{options, [{active, true}
+						   | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active, []}},
+					{options, [{active, true},
+						   {verify, verify_none}
+						   | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+client_verify_none_active_once() ->
+    [{doc,"Test client option verify_none"}].
+
+client_verify_none_active_once(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, send_recv_result_active, []}},
+			   {options, [{active, once} | ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active_once,
+					       []}},
+					{options, [{active, once},
+						   {verify, verify_none}
+						   | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+extended_key_usage_verify_peer() ->
+    [{doc,"Test cert that has a critical extended_key_usage extension in verify_peer mode"}].
+
+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),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+
+    KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ServerCertFile = proplists:get_value(certfile, 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, {ssl_test_lib,  ReceiveFunction, []}},
+			   {options, [{verify, verify_peer}, {active, Active} | NewServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+					{options, [{verify, verify_peer}, {active, Active} |
+						   NewClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+extended_key_usage_verify_none() ->
+    [{doc,"Test cert that has a critical extended_key_usage extension in verify_none mode"}].
+
+extended_key_usage_verify_none(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_verification_opts, Config),
+    ServerOpts = ?config(server_verification_opts, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+
+    KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ServerCertFile = proplists:get_value(certfile, 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, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{verify, verify_none}, {active, Active} | NewServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+					{options, [{verify, verify_none}, {active, Active} | 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"
+      " but are present in trusted certs db."}].
+
+no_authority_key_identifier(Config) when is_list(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"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    NewCertFile = filename:join(PrivDir, "server/new_cert.pem"),
+    [{'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, []),
+    NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{extensions = NewExtensions},
+
+    ct:print("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]),
+
+    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),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {ssl_test_lib, send_recv_result_active, []}},
+			   {options, NewServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, send_recv_result_active, []}},
+			   {options, [{verify, verify_peer} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+delete_authority_key_extension([], Acc) ->
+    lists:reverse(Acc);
+delete_authority_key_extension([#'Extension'{extnID = ?'id-ce-authorityKeyIdentifier'} | Rest],
+			       Acc) ->
+    delete_authority_key_extension(Rest, Acc);
+delete_authority_key_extension([Head | Rest], Acc) ->
+    delete_authority_key_extension(Rest, [Head | Acc]).
+
+%%--------------------------------------------------------------------
+
+invalid_signature_server() ->
+    [{doc,"Test client with invalid signature"}].
+
+invalid_signature_server(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, "server/key.pem"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    NewServerCertFile = filename:join(PrivDir, "server/invalid_cert.pem"),
+    [{'Certificate', ServerDerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
+    ServerOTPCert = public_key:pkix_decode_cert(ServerDerCert, otp),
+    ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate,
+    NewServerDerCert = public_key:pkix_sign(ServerOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
+    NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, NewServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {options, [{verify, verify_peer} | ClientOpts]}]),
+
+    tcp_delivery_workaround(Server, {error, {essl, "bad certificate"}},
+			    Client, {error, {essl, "bad certificate"}}).
+
+%%--------------------------------------------------------------------
+
+invalid_signature_client() ->
+    [{doc,"Test server with invalid signature"}].
+
+invalid_signature_client(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, "client/key.pem"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ClientCertFile = proplists:get_value(certfile, ClientOpts),
+    NewClientCertFile = filename:join(PrivDir, "client/invalid_cert.pem"),
+    [{'Certificate', ClientDerCert, _}] = ssl_test_lib:pem_to_der(ClientCertFile),
+    ClientOTPCert = public_key:pkix_decode_cert(ClientDerCert, otp),
+    ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate,
+    NewClientDerCert = public_key:pkix_sign(ClientOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewClientCertFile, [{'Certificate', NewClientDerCert, not_encrypted}]),
+    NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{options, [{verify, verify_peer} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {options, NewClientOpts}]),
+
+    tcp_delivery_workaround(Server, {error, {essl, "bad certificate"}},
+			    Client, {error, {essl, "bad certificate"}}).
+
+
+%%--------------------------------------------------------------------
+
+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(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, {ssl_test_lib,
+					       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, {ssl_test_lib,
+					       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).
+
+%%--------------------------------------------------------------------
+
+server_verify_no_cacerts() ->
+    [{doc,"Test server must have cacerts if it wants to verify client"}].
+server_verify_no_cacerts(Config) when is_list(Config) ->
+    ServerOpts =  ?config(server_opts, Config),
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, [{verify, verify_peer}
+							 | ServerOpts]}]),
+
+    ssl_test_lib:check_result(Server, {error, {eoptions, {cacertfile, ""}}}).
+
+
+%%--------------------------------------------------------------------
+unknown_server_ca_fail() ->
+    [{doc,"Test that the client fails if the ca is unknown in verify_peer mode"}].
+unknown_server_ca_fail(Config) when is_list(Config) ->
+    ClientOpts =  ?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, {essl, "unknown ca"}},
+			      Client, {error, {essl, "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(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,
+					       send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port  = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active, []}},
+					{options,
+					 [{verify, verify_none}| ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+unknown_server_ca_accept_verify_peer() ->
+    [{doc, "Test that the client succeds if the ca is unknown in verify_peer mode"
+     " with a verify_fun that accepts the unknown ca error"}].
+unknown_server_ca_accept_verify_peer(Config) when is_list(Config) ->
+    ClientOpts =  ?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,
+					       send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    FunAndState =  {fun(_,{bad_cert, unknown_ca}, UserState) ->
+			    {valid, UserState};
+		       (_,{bad_cert, _} = Reason, _) ->
+			    {fail, Reason};
+		       (_,{extension, _}, UserState) ->
+			    {unknown, UserState};
+		       (_, valid, UserState) ->
+			    {valid, UserState};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, []},
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active, []}},
+					{options,
+					 [{verify, verify_peer},
+					  {verify_fun, FunAndState}| ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+unknown_server_ca_accept_backwardscompatibility() ->
+    [{doc,"Test that old style verify_funs will work"}].
+unknown_server_ca_accept_backwardscompatibility(Config) when is_list(Config) ->
+    ClientOpts =  ?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,
+					       send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    AcceptBadCa = fun({bad_cert,unknown_ca}, Acc) ->  Acc;
+		     (Other, Acc) -> [Other | Acc]
+		  end,
+    VerifyFun =
+	fun(ErrorList) ->
+		case lists:foldl(AcceptBadCa, [], ErrorList) of
+		    [] ->    true;
+		    [_|_] -> false
+		end
+	end,
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active, []}},
+					{options,
+					 [{verify, verify_peer},
+					  {verify_fun, VerifyFun}| ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+tcp_delivery_workaround(Server, ServerMsg, Client, ClientMsg) ->
+    receive
+	{Server, ServerMsg} ->
+	    client_msg(Client, ClientMsg);
+	{Client, ClientMsg} ->
+	    server_msg(Server, ServerMsg);
+	{Client, {error,closed}} ->
+	    server_msg(Server, ServerMsg);
+	{Server, {error,closed}} ->
+	    client_msg(Client, ClientMsg)
+    end.
+
+client_msg(Client, ClientMsg) ->
+    receive
+	{Client, ClientMsg} ->
+	    ok;
+	{Client, {error,closed}} ->
+	    ct:print("client got close"),
+	    ok;
+	{Client, {error, Reason}} ->
+	    ct:print("client got econnaborted: ~p", [Reason]),
+	    ok;
+	Unexpected ->
+	    ct:fail(Unexpected)
+    end.
+server_msg(Server, ServerMsg) ->
+    receive
+	{Server, ServerMsg} ->
+	    ok;
+	{Server, {error,closed}} ->
+	    ct:print("server got close"),
+	    ok;
+	{Server, {error, Reason}} ->
+	    ct:print("server got econnaborted: ~p", [Reason]),
+	    ok;
+	Unexpected ->
+	    ct:fail(Unexpected)
+    end.
diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl
index ea1d9dc90c..9869812e6e 100644
--- a/lib/ssl/test/ssl_cipher_SUITE.erl
+++ b/lib/ssl/test/ssl_cipher_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,16 +31,18 @@
 
 -define(TIMEOUT, 600000).
 
-%% 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.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [aes_decipher_good, aes_decipher_good_tls11, aes_decipher_fail, aes_decipher_fail_tls11].
+
+groups() ->
+    [].
+
 init_per_suite(Config) ->
     try crypto:start() of
 	ok ->
@@ -48,81 +50,30 @@ init_per_suite(Config) ->
     catch _:_  ->
 	    {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(_TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of 
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case] 
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [aes_decipher_good, aes_decipher_good_tls11, aes_decipher_fail, aes_decipher_fail_tls11].
-
-groups() -> 
-    [].
-
 init_per_group(_GroupName, Config) ->
     Config.
 
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+    [{watchdog, Dog} | Config].
 
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-aes_decipher_good(doc) -> 
-    ["Decipher a known cryptotext."];
+end_per_testcase(_TestCase, Config) ->
+    Config.
 
-aes_decipher_good(suite) -> 
-    [];
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+aes_decipher_good() ->
+    [{doc,"Decipher a known cryptotext."}].
 
 aes_decipher_good(Config) when is_list(Config) ->
     HashSz = 32,
@@ -142,11 +93,8 @@ aes_decipher_good(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-aes_decipher_good_tls11(doc) ->
-    ["Decipher a known TLS 1.1 cryptotext."];
-
-aes_decipher_good_tls11(suite) ->
-    [];
+aes_decipher_good_tls11() ->
+    [{doc,"Decipher a known TLS 1.1 cryptotext."}].
 
 %% the fragment is actuall a TLS 1.1 record, with
 %% Version = TLS 1.1, we get the correct NextIV in #cipher_state
@@ -169,11 +117,8 @@ aes_decipher_good_tls11(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-aes_decipher_fail(doc) -> 
-    ["Decipher a known cryptotext."];
-
-aes_decipher_fail(suite) -> 
-    [];
+aes_decipher_fail() ->
+    [{doc,"Decipher a known cryptotext."}].
 
 %% same as above, last byte of key replaced
 aes_decipher_fail(Config) when is_list(Config) ->
@@ -196,11 +141,8 @@ aes_decipher_fail(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-aes_decipher_fail_tls11(doc) ->
-    ["Decipher a known TLS 1.1 cryptotext."];
-
-aes_decipher_fail_tls11(suite) ->
-    [];
+aes_decipher_fail_tls11() ->
+    [{doc,"Decipher a known TLS 1.1 cryptotext."}].
 
 %% same as above, last byte of key replaced
 %% stricter padding checks in TLS 1.1 mean we get an alert instead
@@ -213,9 +155,11 @@ aes_decipher_fail_tls11(Config) when is_list(Config) ->
 		 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122,
 		 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>,
     Version = {3,2},
-    #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
+    #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} =
+	ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version),
     Version1 = {3,3},
-    #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1),
+    #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} =
+	ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1),
     ok.
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 818f7f1897..7bfd678f4b 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The 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(ssl_dist_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -35,7 +35,10 @@
 	 nodename}
        ).
 
-%% Test server callback functions
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
@@ -54,6 +57,7 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(Config0) ->
     try crypto:start() of
 	ok ->
+	    %% Currently no ct function avilable for is_cover!
 	    case test_server:is_cover() of
 		false ->
 		    Config = add_ssl_opts_config(Config0),
@@ -98,11 +102,13 @@ common_end(_, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
+
 %%--------------------------------------------------------------------
-%% Test cases starts here.
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-basic(doc) ->
-    ["Test that two nodes can connect via ssl distribution"];
+
+basic() ->
+    [{doc,"Test that two nodes can connect via ssl distribution"}].
 basic(Config) when is_list(Config) ->
     NH1 = start_ssl_node(Config),
     Node1 = NH1#node_handle.nodename,
@@ -162,8 +168,8 @@ basic(Config) when is_list(Config) ->
     success(Config).
 
 %%--------------------------------------------------------------------
-payload(doc) ->
-    ["Test that send a lot of data between the ssl distributed noes"];
+payload() ->
+    [{doc,"Test that send a lot of data between the ssl distributed noes"}].
 payload(Config) when is_list(Config) ->
     NH1 = start_ssl_node(Config),
     Node1 = NH1#node_handle.nodename,
@@ -204,8 +210,8 @@ payload(Config) when is_list(Config) ->
     stop_ssl_node(NH2),
     success(Config).
 %%--------------------------------------------------------------------
-plain_options(doc) ->
-    ["Test specifying additional options"];
+plain_options() ->
+    [{doc,"Test specifying additional options"}].
 plain_options(Config) when is_list(Config) ->
     DistOpts = "-ssl_dist_opt server_secure_renegotiate true "
 	"client_secure_renegotiate true "
@@ -228,8 +234,8 @@ plain_options(Config) when is_list(Config) ->
     stop_ssl_node(NH2),
     success(Config).
 %%--------------------------------------------------------------------
-plain_verify_options(doc) ->
-    ["Test specifying additional options"];
+plain_verify_options() ->
+    [{doc,"Test specifying additional options"}].
 plain_verify_options(Config) when is_list(Config) ->
     DistOpts = "-ssl_dist_opt server_secure_renegotiate true "
 	"client_secure_renegotiate true "
@@ -251,7 +257,7 @@ plain_verify_options(Config) when is_list(Config) ->
     success(Config).
 
 %%--------------------------------------------------------------------
-%%% Internal functions
+%%% Internal functions -----------------------------------------------
 %%--------------------------------------------------------------------
 
 %% ssl_node side api
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index 363a0be594..aff0e0fbbc 100644
--- a/lib/ssl/test/ssl_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,9 @@
 -include("ssl_internal.hrl").
 -include("ssl_handshake.hrl").
 
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> [
@@ -34,6 +37,9 @@ all() -> [
 	decode_single_hello_extension_correctly,
 	decode_unknown_hello_extension_correctly].
 
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
 decode_hello_handshake(_Config) ->
 	HelloPacket = <<16#02, 16#00, 16#00,
 	16#44, 16#03, 16#03, 16#4e, 16#7f, 16#c1, 16#03, 16#35,
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
index 8597aa6740..4e848095a5 100644
--- a/lib/ssl/test/ssl_npn_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,10 @@
 -compile(export_all).
 -include_lib("common_test/include/ct.hrl").
 
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
@@ -68,7 +72,7 @@ init_per_suite(Config) ->
 	    Result =
 		(catch make_certs:all(?config(data_dir, Config),
 				      ?config(priv_dir, Config))),
-	    test_server:format("Make certs  ~p~n", [Result]),
+	    ct:print("Make certs  ~p~n", [Result]),
 	    ssl_test_lib:cert_options(Config)
     catch _:_ ->
 	    {skip, "Crypto did not start"}
@@ -94,12 +98,11 @@ init_per_group(GroupName, Config) ->
 	    Config
     end.
 
-
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-%% Test cases starts here.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
 
 validate_empty_protocols_are_not_allowed(Config) when is_list(Config) ->
@@ -229,9 +232,8 @@ npn_not_supported_server(Config) when is_list(Config)->
     {error, {eoptions, {not_supported_in_sslv3, AdvProtocols}}} = ssl:listen(0, ServerOpts).
 
 %%--------------------------------------------------------------------
-%%% Internal functions
+%% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
-
 run_npn_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedProtocol) ->
     Data = "hello world",
 
@@ -257,13 +259,13 @@ run_npn_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedProtocol) ->
 
 
 assert_npn(Socket, Protocol) ->
-    test_server:format("Negotiated Protocol ~p, Expecting: ~p ~n",
+    ct:print("Negotiated Protocol ~p, Expecting: ~p ~n",
 		       [ssl:negotiated_next_protocol(Socket), Protocol]),
     Protocol = ssl:negotiated_next_protocol(Socket).
 
 assert_npn_and_renegotiate_and_send_data(Socket, Protocol, Data) ->
     assert_npn(Socket, Protocol),
-    test_server:format("Renegotiating ~n", []),
+    ct:print("Renegotiating ~n", []),
     ok = ssl:renegotiate(Socket),
     ssl:send(Socket, Data),
     assert_npn(Socket, Protocol),
@@ -278,7 +280,7 @@ ssl_receive_and_assert_npn(Socket, Protocol, Data) ->
     ssl_receive(Socket, Data).
 
 ssl_send(Socket, Data) ->
-    test_server:format("Connection info: ~p~n",
+    ct:print("Connection info: ~p~n",
                [ssl:connection_info(Socket)]),
     ssl:send(Socket, Data).
 
@@ -286,11 +288,11 @@ ssl_receive(Socket, Data) ->
     ssl_receive(Socket, Data, []).
 
 ssl_receive(Socket, Data, Buffer) ->
-    test_server:format("Connection info: ~p~n",
+    ct:print("Connection info: ~p~n",
                [ssl:connection_info(Socket)]),
     receive
     {ssl, Socket, MoreData} ->
-        test_server:format("Received ~p~n",[MoreData]),
+        ct:print("Received ~p~n",[MoreData]),
         NewBuffer = Buffer ++ MoreData,
         case NewBuffer of
             Data ->
@@ -300,9 +302,9 @@ ssl_receive(Socket, Data, Buffer) ->
                 ssl_receive(Socket, Data, NewBuffer)
         end;
     Other ->
-        test_server:fail({unexpected_message, Other})
+        ct:fail({unexpected_message, Other})
     after 4000 ->
-        test_server:fail({did_not_get, Data})
+        ct:fail({did_not_get, Data})
     end.
 
 
diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl
index 5102c74e87..72768bcb55 100644
--- a/lib/ssl/test/ssl_npn_hello_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,10 @@
 -include("ssl_record.hrl").
 -include_lib("common_test/include/ct.hrl").
 
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
@@ -37,44 +41,26 @@ all() ->
      create_server_hello_with_advertised_protocols_test,
      create_server_hello_with_no_advertised_protocols_test].
 
-
-create_client_handshake(Npn) ->
-    ssl_handshake:encode_handshake(#client_hello{
-        client_version = {1, 2},
-        random = <<1:256>>,
-        session_id = <<>>,
-        cipher_suites = "",
-        compression_methods = "",
-        next_protocol_negotiation = Npn,
-        renegotiation_info = #renegotiation_info{}
-    }, vsn).
-
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
 
 encode_and_decode_client_hello_test(_Config) ->
     HandShakeData = create_client_handshake(undefined),
     Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
-    {[{DecodedHandshakeMessage, _Raw}], _} = ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    {[{DecodedHandshakeMessage, _Raw}], _} =
+	ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
     NextProtocolNegotiation = DecodedHandshakeMessage#client_hello.next_protocol_negotiation,
     NextProtocolNegotiation = undefined.
-
+%%--------------------------------------------------------------------
 encode_and_decode_npn_client_hello_test(_Config) ->
     HandShakeData = create_client_handshake(#next_protocol_negotiation{extension_data = <<>>}),
     Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
-    {[{DecodedHandshakeMessage, _Raw}], _} = ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    {[{DecodedHandshakeMessage, _Raw}], _} =
+	ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
     NextProtocolNegotiation = DecodedHandshakeMessage#client_hello.next_protocol_negotiation,
     NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<>>}.
-
-create_server_handshake(Npn) ->
-    ssl_handshake:encode_handshake(#server_hello{
-        server_version = {1, 2},
-        random = <<1:256>>,
-        session_id = <<>>,
-        cipher_suite = <<1,2>>,
-        compression_method = 1,
-        next_protocol_negotiation = Npn,
-        renegotiation_info = #renegotiation_info{}
-    }, vsn).
-
+%%--------------------------------------------------------------------
 encode_and_decode_server_hello_test(_Config) ->
     HandShakeData = create_server_handshake(undefined),
     Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
@@ -82,15 +68,51 @@ encode_and_decode_server_hello_test(_Config) ->
 	ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
     NextProtocolNegotiation = DecodedHandshakeMessage#server_hello.next_protocol_negotiation,
     NextProtocolNegotiation = undefined.
-
+%%--------------------------------------------------------------------
 encode_and_decode_npn_server_hello_test(_Config) ->
     HandShakeData = create_server_handshake(#next_protocol_negotiation{extension_data = <<6, "spdy/2">>}),
     Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
-    {[{DecodedHandshakeMessage, _Raw}], _} = ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
+    {[{DecodedHandshakeMessage, _Raw}], _} =
+	ssl_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
     NextProtocolNegotiation = DecodedHandshakeMessage#server_hello.next_protocol_negotiation,
     ct:print("~p ~n", [NextProtocolNegotiation]),
     NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<6, "spdy/2">>}.
 
+%%--------------------------------------------------------------------
+create_server_hello_with_no_advertised_protocols_test(_Config) ->
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),  false, undefined),
+    undefined = Hello#server_hello.next_protocol_negotiation.
+%%--------------------------------------------------------------------
+create_server_hello_with_advertised_protocols_test(_Config) ->
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),
+				       false, [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]),
+    #next_protocol_negotiation{extension_data = <<6, "spdy/1", 8, "http/1.0", 8, "http/1.1">>} =
+	Hello#server_hello.next_protocol_negotiation.
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+create_client_handshake(Npn) ->
+    ssl_handshake:encode_handshake(#client_hello{
+        client_version = {1, 2},
+        random = <<1:256>>,
+        session_id = <<>>,
+        cipher_suites = "",
+        compression_methods = "",
+        next_protocol_negotiation = Npn,
+        renegotiation_info = #renegotiation_info{}
+    }, vsn).
+
+create_server_handshake(Npn) ->
+    ssl_handshake:encode_handshake(#server_hello{
+        server_version = {1, 2},
+        random = <<1:256>>,
+        session_id = <<>>,
+        cipher_suite = <<1,2>>,
+        compression_method = 1,
+        next_protocol_negotiation = Npn,
+        renegotiation_info = #renegotiation_info{}
+    }, vsn).
+
 create_connection_states() ->
     #connection_states{
         pending_read = #connection_state{
@@ -105,13 +127,3 @@ create_connection_states() ->
             secure_renegotiation = false
         }
     }.
-
-create_server_hello_with_no_advertised_protocols_test(_Config) ->
-    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),  false, undefined),
-    undefined = Hello#server_hello.next_protocol_negotiation.
-
-create_server_hello_with_advertised_protocols_test(_Config) ->
-    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),  
-				       false, [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]),
-    #next_protocol_negotiation{extension_data = <<6, "spdy/1", 8, "http/1.0", 8, "http/1.1">>} = 
-	Hello#server_hello.next_protocol_negotiation.
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 8ce80cb725..158c40e372 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,84 +41,10 @@
 
 -define(MANY, 1000).
 -define(SOME, 50).
-
-%% 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.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    catch crypto:stop(),
-    try crypto:start() 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)
-    catch _:_ ->
-	    {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(_TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of 
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case] 
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
@@ -129,12 +55,6 @@ all() ->
      {group, 'sslv3'}
     ].
 
-groups() ->
-    [{'tlsv1.2', [], packet_tests()},
-     {'tlsv1.1', [], packet_tests()},
-     {'tlsv1', [], packet_tests()},
-     {'sslv3', [], packet_tests()}].
-
 packet_tests() ->
     active_packet_tests() ++ active_once_packet_tests() ++ passive_packet_tests() ++
 	[packet_send_to_large,
@@ -208,6 +128,24 @@ active_packet_tests() ->
      header_decode_two_bytes_one_sent_active
     ].
 
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config),
+				      ?config(priv_dir, Config))),
+	    ct:print("Make certs  ~p~n", [Result]),
+	    ssl_test_lib:cert_options(Config)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
 
 init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) of
@@ -228,1032 +166,262 @@ init_per_group(GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+    [{watchdog, Dog} | Config].
 
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-packet_raw_passive_many_small(doc) -> 
-    ["Test packet option {packet, raw} in passive mode."];
-
-packet_raw_passive_many_small(suite) -> 
-    [];
 
-packet_raw_passive_many_small(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 = "Packet option is {packet, raw}",
+end_per_testcase(_TestCase, Config) ->
+    Config.
 
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?MANY]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_raw, [Data, ?MANY]}},
-					{options, 
-					 [{active, false},
-					  {packet, raw} | 
-					  ClientOpts]}]),
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
 
-    ssl_test_lib:check_result(Client, ok),
+packet_raw_passive_many_small() ->
+    [{doc,"Test packet option {packet, raw} in passive mode."}].
 
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+packet_raw_passive_many_small(Config) when is_list(Config) ->
+    Data = "Packet option is {packet, raw}",
+    packet(Config, Data, send, passive_recv_packet, ?MANY, raw, false).
 
 %%--------------------------------------------------------------------
 
-packet_raw_passive_some_big(doc) -> 
-    ["Test packet option {packet, raw} in passive mode."];
-
-packet_raw_passive_some_big(suite) -> 
-    [];
-
-packet_raw_passive_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_raw_passive_some_big() ->
+    [{doc,"Test packet option {packet, raw} in passive mode."}].
 
+packet_raw_passive_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?SOME]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_raw, [Data, ?SOME]}},
-					{options, 
-					 [{active, false},
-					  {packet, raw} | 
-					  ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send, passive_recv_packet, ?SOME, raw, false).
 %%--------------------------------------------------------------------
-packet_0_passive_many_small(doc) -> 
-    ["Test packet option {packet, 0} in passive mode."];
-
-packet_0_passive_many_small(suite) -> 
-    [];
-
-packet_0_passive_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_0_passive_many_small() ->
+    [{doc,"Test packet option {packet, 0} in passive mode."}].
 
+packet_0_passive_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 0}, equivalent to packet raw.",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?MANY]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_raw, [Data, ?MANY]}},
-					{options, [{active, false},
-						   {packet, 0} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?MANY, 0, false).
 
 %%--------------------------------------------------------------------
-packet_0_passive_some_big(doc) -> 
-    ["Test packet option {packet, 0} in passive mode."];
-
-packet_0_passive_some_big(suite) -> 
-    [];
-
-packet_0_passive_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_0_passive_some_big() ->
+    [{doc,"Test packet option {packet, 0} in passive mode."}].
 
+packet_0_passive_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?SOME]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_raw, [Data, ?SOME]}},
-					{options, [{active, false},
-						   {packet, 0} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?SOME, 0, false).
 
 %%--------------------------------------------------------------------
-packet_1_passive_many_small(doc) -> 
-    ["Test packet option {packet, 1} in passive mode."];
-
-packet_1_passive_many_small(suite) -> 
-    [];
-
-packet_1_passive_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_1_passive_many_small() ->
+    [{doc,"Test packet option {packet, 1} in passive mode."}].
 
+packet_1_passive_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 1}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 1}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_recv_packet,
-					       [Data, ?MANY]}},
-					{options, [{active, false},
-						   {packet, 1} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?MANY, 1, false).
 
 %%--------------------------------------------------------------------
-packet_1_passive_some_big(doc) -> 
-    ["Test packet option {packet, 1} in passive mode."];
-
-packet_1_passive_some_big(suite) -> 
-    [];
-
-packet_1_passive_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_1_passive_some_big() ->
+    [{doc,"Test packet option {packet, 1} in passive mode."}].
 
+packet_1_passive_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(255, "1")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 1}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_recv_packet,
-					       [Data, ?SOME]}},
-					{options, [{active, false},
-						   {packet, 1} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?SOME, 1, false).
 
 %%--------------------------------------------------------------------
-packet_2_passive_many_small(doc) -> 
-    ["Test packet option {packet, 2} in passive mode"];
-
-packet_2_passive_many_small(suite) -> 
-    [];
-
-packet_2_passive_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_2_passive_many_small() ->
+    [{doc,"Test packet option {packet, 2} in passive mode"}].
 
+packet_2_passive_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 2}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 2}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_recv_packet,
-					       [Data, ?MANY]}},
-					{options, [{active, false},
-						   {packet, 2} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?MANY, 2, false).
 
 %%--------------------------------------------------------------------
-packet_2_passive_some_big(doc) -> 
-    ["Test packet option {packet, 2} in passive mode"];
-
-packet_2_passive_some_big(suite) -> 
-    [];
-
-packet_2_passive_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_2_passive_some_big() ->
+    [{doc,"Test packet option {packet, 2} in passive mode"}].
 
+packet_2_passive_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 2}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_recv_packet,
-					       [Data, ?SOME]}},
-					{options, [{active, false},
-						   {packet, 2} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?SOME, 2, false).
 
 %%--------------------------------------------------------------------
-packet_4_passive_many_small(doc) -> 
-    ["Test packet option {packet, 4} in passive mode"];
-
-packet_4_passive_many_small(suite) -> 
-    [];
-
-packet_4_passive_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_4_passive_many_small() ->
+    [{doc,"Test packet option {packet, 4} in passive mode"}].
 
+packet_4_passive_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 4}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 4}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_recv_packet,
-					       [Data, ?MANY]}},
-					{options, [{active, false},
-						   {packet, 4} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send, passive_recv_packet, ?MANY, 4, false).
 
 %%--------------------------------------------------------------------
-packet_4_passive_some_big(doc) -> 
-    ["Test packet option {packet, 4} in passive mode"];
-
-packet_4_passive_some_big(suite) -> 
-    [];
-
-packet_4_passive_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_4_passive_some_big() ->
+    [{doc,"Test packet option {packet, 4} in passive mode"}].
 
+packet_4_passive_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 4}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, passive_recv_packet,
-					       [Data, ?SOME]}},
-					{options, [{active, false},
-						   {packet, 4} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send, passive_recv_packet, ?SOME, 4, false).
 
 %%--------------------------------------------------------------------
-packet_raw_active_once_many_small(doc) -> 
-    ["Test packet option {packet, raw} in active once mode."];
-
-packet_raw_active_once_many_small(suite) -> 
-    [];
-
-packet_raw_active_once_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_raw_active_once_many_small() ->
+    [{doc,"Test packet option {packet, raw} in active once mode."}].
 
+packet_raw_active_once_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, raw}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?MANY]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, active_once_raw, 
-					       [Data, ?MANY]}},
-					{options, [{active, once},
-						   {packet, raw} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?MANY, raw, once).
 
 %%--------------------------------------------------------------------
-packet_raw_active_once_some_big(doc) -> 
-    ["Test packet option {packet, raw} in active once mode."];
-
-packet_raw_active_once_some_big(suite) -> 
-    [];
-
-packet_raw_active_once_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_raw_active_once_some_big() ->
+    [{doc,"Test packet option {packet, raw} in active once mode."}].
 
+packet_raw_active_once_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?SOME]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, active_once_raw, 
-					       [Data, ?SOME]}},
-					{options, [{active, once},
-						   {packet, raw} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?SOME, raw, once).
 
 %%--------------------------------------------------------------------
-packet_0_active_once_many_small(doc) -> 
-    ["Test packet option {packet, 0} in active once mode."];
-
-packet_0_active_once_many_small(suite) -> 
-    [];
-
-packet_0_active_once_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_0_active_once_many_small() ->
+    [{doc,"Test packet option {packet, 0} in active once mode."}].
 
+packet_0_active_once_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 0}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?MANY]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, active_once_raw, 
-					  [Data, ?MANY]}},
-					{options, [{active, once},
-						   {packet, 0} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send_raw, active_once_raw, ?MANY, 0, once).
 
 %%--------------------------------------------------------------------
-packet_0_active_once_some_big(doc) -> 
-    ["Test packet option {packet, 0} in active once mode."];
-
-packet_0_active_once_some_big(suite) -> 
-    [];
-
-packet_0_active_once_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_0_active_once_some_big() ->
+    [{doc,"Test packet option {packet, 0} in active once mode."}].
 
+packet_0_active_once_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,
-					       [Data, ?SOME]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, active_once_raw,
-					  [Data, ?SOME]}},
-					{options, [{active, once},
-						   {packet, 0} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?SOME, 0, once).
 
 %%--------------------------------------------------------------------
-packet_1_active_once_many_small(doc) -> 
-    ["Test packet option {packet, 1} in active once mode."];
-
-packet_1_active_once_many_small(suite) -> 
-    [];
-
-packet_1_active_once_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_1_active_once_many_small() ->
+    [{doc,"Test packet option {packet, 1} in active once mode."}].
 
+packet_1_active_once_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 1}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 1}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, 
-					  active_once_packet, 
-					  [Data, ?MANY]}},
-					{options, [{active, once},
-						   {packet, 1} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?MANY, 1, once).
 
 %%--------------------------------------------------------------------
-packet_1_active_once_some_big(doc) -> 
-    ["Test packet option {packet, 1} in active once mode."];
-
-packet_1_active_once_some_big(suite) -> 
-    [];
-
-packet_1_active_once_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_1_active_once_some_big() ->
+    [{doc,"Test packet option {packet, 1} in active once mode."}].
 
+packet_1_active_once_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(255, "1")),
+    packet(Config, Data, send_raw, active_once_raw, ?SOME, 1, once).
 
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 1}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_once_packet,
-					  [Data, ?SOME]}},
-					{options, [{active, once},
-						   {packet, 1} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-packet_2_active_once_many_small(doc) -> 
-    ["Test packet option {packet, 2} in active once mode"];
-
-packet_2_active_once_many_small(suite) -> 
-    [];
-
-packet_2_active_once_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_2_active_once_many_small() ->
+    [{doc,"Test packet option {packet, 2} in active once mode"}].
 
+packet_2_active_once_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 2}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 2}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_once_packet, 
-					  [Data, ?MANY]}},
-					{options, [{active, once},
-						   {packet, 2} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send_raw, active_once_raw, ?MANY, 2, once).
 
 %%--------------------------------------------------------------------
-packet_2_active_once_some_big(doc) -> 
-    ["Test packet option {packet, 2} in active once mode"];
-
-packet_2_active_once_some_big(suite) -> 
-    [];
-
-packet_2_active_once_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_2_active_once_some_big() ->
+    [{doc,"Test packet option {packet, 2} in active once mode"}].
 
+packet_2_active_once_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 2}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_once_packet,
-					  [Data, ?SOME]}},
-					{options, [{active, once},
-						   {packet, 2} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?SOME, 2, once).
 
 %%--------------------------------------------------------------------
-packet_4_active_once_many_small(doc) -> 
-    ["Test packet option {packet, 4} in active once mode"];
-
-packet_4_active_once_many_small(suite) -> 
-    [];
-
-packet_4_active_once_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_4_active_once_many_small() ->
+    [{doc,"Test packet option {packet, 4} in active once mode"}].
 
+packet_4_active_once_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 4}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 4}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_once_packet, 
-					  [Data, ?MANY]}},
-					{options, [{active, once},
-						   {packet, 4} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?MANY, 4, once).
 
 %%--------------------------------------------------------------------
-packet_4_active_once_some_big(doc) -> 
-    ["Test packet option {packet, 4} in active once mode"];
-
-packet_4_active_once_some_big(suite) -> 
-    [];
-
-packet_4_active_once_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_4_active_once_some_big() ->
+    [{doc,"Test packet option {packet, 4} in active once mode"}].
 
+packet_4_active_once_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 4}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_once_packet, 
-					  [Data, ?SOME]}},
-					{options, [{active, once},
-						   {packet, 4} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_once_raw, ?SOME, 4, once).
 
 %%--------------------------------------------------------------------
-packet_raw_active_many_small(doc) -> 
-    ["Test packet option {packet, raw} in active mode."];
-
-packet_raw_active_many_small(suite) -> 
-    [];
+packet_raw_active_many_small() ->
+    [{doc,"Test packet option {packet, raw} in active mode."}].
 
 packet_raw_active_many_small(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 = "Packet option is {packet, raw}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?MANY]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, active_raw,
-					       [Data, ?MANY]}},
-					{options, [{active, true},
-						   {packet, raw} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send_raw, active_raw, ?MANY, raw, active).
 
 %%--------------------------------------------------------------------
-packet_raw_active_some_big(doc) -> 
-    ["Test packet option {packet, raw} in active mode."];
-
-packet_raw_active_some_big(suite) -> 
-    [];
+packet_raw_active_some_big() ->
+    [{doc,"Test packet option {packet, raw} in active mode."}].
 
 packet_raw_active_some_big(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:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?SOME]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, active_raw, [Data, ?SOME]}},
-					{options, [{active, true},
-						   {packet, raw} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_raw, ?SOME, raw, active).
 
 %%--------------------------------------------------------------------
-packet_0_active_many_small(doc) -> 
-    ["Test packet option {packet, 0} in active mode."];
-
-packet_0_active_many_small(suite) -> 
-    [];
-
-packet_0_active_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_0_active_many_small() ->
+    [{doc,"Test packet option {packet, 0} in active mode."}].
 
+packet_0_active_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 0}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?MANY]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, active_raw, 
-					  [Data, ?MANY]}},
-					{options, [{active, true},
-						   {packet, 0} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_raw, ?MANY, 0, active).
 
 %%--------------------------------------------------------------------
-packet_0_active_some_big(doc) -> 
-    ["Test packet option {packet, 0} in active mode."];
-
-packet_0_active_some_big(suite) -> 
-    [];
-
-packet_0_active_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_0_active_some_big() ->
+    [{doc,"Test packet option {packet, 0} in active mode."}].
 
+packet_0_active_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()}, 
-					{mfa, {?MODULE, send_raw ,[Data, ?SOME]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, active_raw, 
-					  [Data, ?SOME]}},
-					{options, [{active, true},
-						   {packet, 0} | 
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send_raw, active_raw, ?SOME, 0, active).
 
 %%--------------------------------------------------------------------
-packet_1_active_many_small(doc) -> 
-    ["Test packet option {packet, 1} in active mode."];
-
-packet_1_active_many_small(suite) -> 
-    [];
-
-packet_1_active_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_1_active_many_small() ->
+    [{doc,"Test packet option {packet, 1} in active mode."}].
 
+packet_1_active_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 1}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 1}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_packet, [Data, ?MANY]}},
-					{options, [{active, true},
-						   {packet, 1} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_raw, ?MANY, 1, active).
 
 %%--------------------------------------------------------------------
-packet_1_active_some_big(doc) -> 
-    ["Test packet option {packet, 1} in active mode."];
-
-packet_1_active_some_big(suite) -> 
-    [];
-
-packet_1_active_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_1_active_some_big() ->
+    [{doc,"Test packet option {packet, 1} in active mode."}].
 
+packet_1_active_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(255, "1")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 1}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_packet, [Data, ?SOME]}},
-					{options, [{active, true},
-						   {packet, 1} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_raw, ?SOME, 1, active).
 
 %%--------------------------------------------------------------------
-packet_2_active_many_small(doc) -> 
-    ["Test packet option {packet, 2} in active mode"];
-
-packet_2_active_many_small(suite) -> 
-    [];
-
-packet_2_active_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_2_active_many_small() ->
+    [{doc,"Test packet option {packet, 2} in active mode"}].
 
+packet_2_active_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 2}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 2}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_packet, [Data, ?MANY]}},
-					{options, [{active, true},
-						   {packet, 2} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_raw, ?MANY, 2, active).
 
 %%--------------------------------------------------------------------
-packet_2_active_some_big(doc) -> 
-    ["Test packet option {packet, 2} in active mode"];
-
-packet_2_active_some_big(suite) -> 
-    [];
-
-packet_2_active_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_2_active_some_big() ->
+    [{doc,"Test packet option {packet, 2} in active mode"}].
 
+packet_2_active_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 2}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_packet, [Data, ?SOME]}},
-					{options, [{active, true},
-						   {packet, 2} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    packet(Config, Data, send_raw, active_raw, ?SOME, 2, active).
 
 %%--------------------------------------------------------------------
-packet_4_active_many_small(doc) -> 
-    ["Test packet option {packet, 4} in active mode"];
-
-packet_4_active_many_small(suite) -> 
-    [];
-
-packet_4_active_many_small(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_4_active_many_small() ->
+    [{doc,"Test packet option {packet, 4} in active mode"}].
 
+packet_4_active_many_small(Config) when is_list(Config) ->
     Data = "Packet option is {packet, 4}",
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?MANY]}},
-					{options, [{packet, 4}|ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_packet, [Data, ?MANY]}},
-					{options, [{active, true},
-						   {packet, 4} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send_raw, active_raw, ?MANY, 4, active).
 
 %%--------------------------------------------------------------------
-packet_4_active_some_big(doc) -> 
-    ["Test packet option {packet, 4} in active mode"];
-
-packet_4_active_some_big(suite) -> 
-    [];
-
-packet_4_active_some_big(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+packet_4_active_some_big() ->
+    [{doc,"Test packet option {packet, 4} in active mode"}].
 
+packet_4_active_some_big(Config) when is_list(Config) ->
     Data = lists:append(lists:duplicate(100, "1234567890")),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, send, [Data, ?SOME]}},
-					{options, [{packet, 4} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()},
-					{mfa, 
-					 {?MODULE, 
-					  active_packet, [Data, ?SOME]}},
-					{options, [{active, true},
-						   {packet, 4} |
-						   ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
+    packet(Config, Data, send_raw, active_raw, ?SOME, 4, active).
 
 %%--------------------------------------------------------------------
-packet_send_to_large(doc) ->
-    ["Test setting the packet option {packet, 2} on the send side"];
-
-packet_send_to_large(suite) -> [];
+packet_send_to_large() ->
+    [{doc,"Test setting the packet option {packet, 2} on the send side"}].
 
 packet_send_to_large(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1279,16 +447,9 @@ packet_send_to_large(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-
-
-
-
 %%--------------------------------------------------------------------
-packet_wait_active(doc) -> 
-    ["Test waiting when complete packages have not arrived"];
-
-packet_wait_active(suite) -> 
-    [];
+packet_wait_active() ->
+    [{doc,"Test waiting when complete packages have not arrived"}].
 
 packet_wait_active(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1320,11 +481,8 @@ packet_wait_active(Config) when is_list(Config) ->
 
 
 %%--------------------------------------------------------------------
-packet_wait_passive(doc) -> 
-    ["Test waiting when complete packages have not arrived"];
-
-packet_wait_passive(suite) -> 
-    [];
+packet_wait_passive() ->
+    [{doc,"Test waiting when complete packages have not arrived"}].
 
 packet_wait_passive(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1353,10 +511,8 @@ packet_wait_passive(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
-packet_baddata_active(doc) -> 
-    ["Test that if a bad packet arrives error msg is sent and socket is closed"];
-packet_baddata_active(suite) -> 
-    [];
+packet_baddata_active() ->
+    [{doc,"Test that if a bad packet arrives error msg is sent and socket is closed"}].
 
 packet_baddata_active(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1381,18 +537,15 @@ packet_baddata_active(Config) when is_list(Config) ->
 	{Client, {other, {ssl_error, _Socket, 
 			  {invalid_packet, _}},{error,closed},1}} -> ok;
 	Unexpected ->
-	    test_server:fail({unexpected, Unexpected})
+	    ct:fail({unexpected, Unexpected})
     end,    
 
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
-packet_baddata_passive(doc) -> 
-    ["Test that if a bad packet arrives error msg is sent and socket is closed"];
-
-packet_baddata_passive(suite) -> 
-    [];
+packet_baddata_passive() ->
+    [{doc,"Test that if a bad packet arrives error msg is sent and socket is closed"}].
 
 packet_baddata_passive(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1418,19 +571,16 @@ packet_baddata_passive(Config) when is_list(Config) ->
     receive
 	{Client, {other, {error, {invalid_packet, _}},{error,closed}, 1}} -> ok;
 	Unexpected ->
-	    test_server:fail({unexpected, Unexpected})
+	    ct:fail({unexpected, Unexpected})
     end,    
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 
-packet_size_active(doc) -> 
-    ["Test that if a packet of size larger than
-    packet_size arrives error msg is sent and socket is closed"];
-
-packet_size_active(suite) -> 
-    [];
+packet_size_active() ->
+    [{doc,"Test that if a packet of size larger than
+    packet_size arrives error msg is sent and socket is closed"}].
 
 packet_size_active(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1455,17 +605,16 @@ packet_size_active(Config) when is_list(Config) ->
 	{Client, {other, {ssl_error, _Socket, 
 			  {invalid_packet, _}},{error,closed},1}} -> ok;
 	Unexpected ->
-	    test_server:fail({unexpected, Unexpected})
+	    ct:fail({unexpected, Unexpected})
     end,    
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 
-packet_size_passive(doc) -> 
-    ["Test that if a packet of size larger
-    than packet_size arrives error msg is sent and socket is closed"];
-packet_size_passive(suite) -> [];
+packet_size_passive() ->
+    [{doc, "Test that if a packet of size larger
+    than packet_size arrives error msg is sent and socket is closed"}].
 
 packet_size_passive(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -1490,17 +639,15 @@ packet_size_passive(Config) when is_list(Config) ->
     receive
 	{Client, {other, {error, {invalid_packet, _}},{error,closed},1}} -> ok;
 	Unexpected ->
-	    test_server:fail({unexpected, Unexpected})
+	    ct:fail({unexpected, Unexpected})
     end,
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-packet_cdr_decode(doc) ->
-    ["Test setting the packet option {packet, cdr}, {mode, binary}"];
-packet_cdr_decode(suite) ->
-    [];
+packet_cdr_decode() ->
+    [{doc,"Test setting the packet option {packet, cdr}, {mode, binary}"}].
 packet_cdr_decode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1532,10 +679,8 @@ 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() ->
+    [{doc,"Test setting the packet option {packet, cdr} {mode, list}"}].
 packet_cdr_decode_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1567,11 +712,9 @@ packet_cdr_decode_list(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-packet_http_decode(doc) ->
-    ["Test setting the packet option {packet, http} {mode, binary} "
-     "(Body will be binary http strings are lists)"];
-packet_http_decode(suite) ->
-    [];
+packet_http_decode() ->
+    [{doc, "Test setting the packet option {packet, http} {mode, binary} "
+     "(Body will be binary http strings are lists)"}].
 
 packet_http_decode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
@@ -1652,11 +795,9 @@ client_http_decode(Socket, HttpRequest) ->
     ok.
 
 %%--------------------------------------------------------------------
-packet_http_decode_list(doc) ->
-    ["Test setting the packet option {packet, http}, {mode, list}"
-     "(Body will be list too)"];
-packet_http_decode_list(suite) ->
-    [];
+packet_http_decode_list() ->
+    [{doc, "Test setting the packet option {packet, http}, {mode, list}"
+      "(Body will be list too)"}].
 packet_http_decode_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1712,11 +853,8 @@ client_http_decode_list(Socket, HttpRequest) ->
     ok.
 
 %%--------------------------------------------------------------------
-packet_http_bin_decode_multi(doc) ->
-    ["Test setting the packet option {packet, http_bin} with multiple requests"];
-packet_http_bin_decode_multi(suite) ->
-    [];
-
+packet_http_bin_decode_multi() ->
+    [{doc,"Test setting the packet option {packet, http_bin} with multiple requests"}].
 packet_http_bin_decode_multi(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1803,11 +941,10 @@ 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() ->
+    [{doc,"Test setting the packet option {packet, http}, {active, false}"
+      " with a incorrect http header."}].
+
 packet_http_error_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1865,10 +1002,9 @@ server_http_decode_error(Socket, HttpResponse) ->
     ok = ssl:send(Socket, HttpResponse),
     ok.
 %%--------------------------------------------------------------------
-packet_httph_active(doc) ->
-    ["Test setting the packet option {packet, httph}"];
-packet_httph_active(suite) ->
-    [];
+packet_httph_active() ->
+    [{doc,"Test setting the packet option {packet, httph}"}].
+
 packet_httph_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1922,10 +1058,8 @@ client_http_decode_trailer_active(Socket) ->
     ok.
 
 %%--------------------------------------------------------------------
-packet_httph_bin_active(doc) ->
-    ["Test setting the packet option {packet, httph_bin}"];
-packet_httph_bin_active(suite) ->
-    [];
+packet_httph_bin_active() ->
+    [{doc,"Test setting the packet option {packet, httph_bin}"}].
 packet_httph_bin_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -1973,10 +1107,9 @@ client_http_decode_trailer_bin_active(Socket) ->
     end,
     ok.
 %%--------------------------------------------------------------------
-packet_httph_active_once(doc) ->
-    ["Test setting the packet option {packet, httph}"];
-packet_httph_active_once(suite) ->
-    [];
+packet_httph_active_once() ->
+    [{doc,"Test setting the packet option {packet, httph}"}].
+
 packet_httph_active_once(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2027,10 +1160,9 @@ client_http_decode_trailer_active_once(Socket) ->
     end,
     ok.
 %%--------------------------------------------------------------------
-packet_httph_bin_active_once(doc) ->
-    ["Test setting the packet option {packet, httph_bin}"];
-packet_httph_bin_active_once(suite) ->
-    [];
+packet_httph_bin_active_once() ->
+    [{doc,"Test setting the packet option {packet, httph_bin}"}].
+
 packet_httph_bin_active_once(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2082,10 +1214,9 @@ client_http_decode_trailer_bin_active_once(Socket) ->
 
 %%--------------------------------------------------------------------
 
-packet_httph_passive(doc) ->
-    ["Test setting the packet option {packet, httph}"];
-packet_httph_passive(suite) ->
-    [];
+packet_httph_passive() ->
+    [{doc,"Test setting the packet option {packet, httph}"}].
+
 packet_httph_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2123,10 +1254,9 @@ client_http_decode_trailer_passive(Socket) ->
     ok.
 
 %%--------------------------------------------------------------------
-packet_httph_bin_passive(doc) ->
-    ["Test setting the packet option {packet, httph_bin}"];
-packet_httph_bin_passive(suite) ->
-    [];
+packet_httph_bin_passive() ->
+    [{doc,"Test setting the packet option {packet, httph_bin}"}].
+
 packet_httph_bin_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2164,10 +1294,9 @@ client_http_decode_trailer_bin_passive(Socket) ->
     ok.
 
 %%--------------------------------------------------------------------
-packet_line_decode(doc) ->
-    ["Test setting the packet option {packet, line}, {mode, binary}"];
-packet_line_decode(suite) ->
-    [];
+packet_line_decode() ->
+    [{doc,"Test setting the packet option {packet, line}, {mode, binary}"}].
+
 packet_line_decode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2201,10 +1330,9 @@ packet_line_decode(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-packet_line_decode_list(doc) ->
-    ["Test setting the packet option {packet, line}, {mode, list}"];
-packet_line_decode_list(suite) ->
-    [];
+packet_line_decode_list() ->
+    [{doc,"Test setting the packet option {packet, line}, {mode, list}"}].
+
 packet_line_decode_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2240,10 +1368,9 @@ packet_line_decode_list(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-packet_asn1_decode(doc) ->
-    ["Test setting the packet option {packet, asn1}"];
-packet_asn1_decode(suite) ->
-    [];
+packet_asn1_decode() ->
+    [{doc,"Test setting the packet option {packet, asn1}"}].
+
 packet_asn1_decode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2276,10 +1403,9 @@ 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() ->
+    [{doc,"Test setting the packet option {packet, asn1}"}].
+
 packet_asn1_decode_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2314,10 +1440,9 @@ packet_asn1_decode_list(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-packet_tpkt_decode(doc) ->
-    ["Test setting the packet option {packet, tpkt}"];
-packet_tpkt_decode(suite) ->
-    [];
+packet_tpkt_decode() ->
+    [{doc,"Test setting the packet option {packet, tpkt}"}].
+
 packet_tpkt_decode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2347,10 +1472,9 @@ 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() ->
+    [{doc,"Test setting the packet option {packet, tpkt}"}].
+
 packet_tpkt_decode_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2381,10 +1505,9 @@ packet_tpkt_decode_list(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-%% packet_fcgi_decode(doc) ->
-%%     ["Test setting the packet option {packet, fcgi}"];
-%% packet_fcgi_decode(suite) ->
-%%     [];
+%% packet_fcgi_decode() ->
+%%     [{doc,"Test setting the packet option {packet, fcgi}"}].
+
 %% packet_fcgi_decode(Config) when is_list(Config) ->
 %%     ClientOpts = ?config(client_opts, Config),
 %%     ServerOpts = ?config(server_opts, Config),
@@ -2416,10 +1539,8 @@ packet_tpkt_decode_list(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-packet_sunrm_decode(doc) ->
-    ["Test setting the packet option {packet, sunrm}"];
-packet_sunrm_decode(suite) ->
-    [];
+packet_sunrm_decode() ->
+    [{doc,"Test setting the packet option {packet, sunrm}"}].
 packet_sunrm_decode(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2449,10 +1570,9 @@ packet_sunrm_decode(Config) when is_list(Config) ->
     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() ->
+    [{doc,"Test setting the packet option {packet, sunrm}"}].
+
 packet_sunrm_decode_list(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2482,10 +1602,9 @@ packet_sunrm_decode_list(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 
-header_decode_one_byte_active(doc) ->
-    ["Test setting the packet option {header, 1}"];
-header_decode_one_byte_active(suite) ->
-    [];
+header_decode_one_byte_active() ->
+    [{doc,"Test setting the packet option {header, 1}"}].
+
 header_decode_one_byte_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2516,10 +1635,9 @@ header_decode_one_byte_active(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_active(doc) ->
-    ["Test setting the packet option {header, 2}"];
-header_decode_two_bytes_active(suite) ->
-    [];
+header_decode_two_bytes_active() ->
+    [{doc,"Test setting the packet option {header, 2}"}].
+
 header_decode_two_bytes_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2551,10 +1669,9 @@ header_decode_two_bytes_active(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_two_sent_active(doc) ->
-    ["Test setting the packet option {header, 2} and sending two byte"];
-header_decode_two_bytes_two_sent_active(suite) ->
-    [];
+header_decode_two_bytes_two_sent_active() ->
+    [{doc,"Test setting the packet option {header, 2} and sending two byte"}].
+
 header_decode_two_bytes_two_sent_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2586,10 +1703,9 @@ header_decode_two_bytes_two_sent_active(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_one_sent_active(doc) ->
-    ["Test setting the packet option {header, 2} and sending one byte"];
-header_decode_two_bytes_one_sent_active(suite) ->
-    [];
+header_decode_two_bytes_one_sent_active() ->
+    [{doc,"Test setting the packet option {header, 2} and sending one byte"}].
+
 header_decode_two_bytes_one_sent_active(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2620,10 +1736,9 @@ header_decode_two_bytes_one_sent_active(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_one_byte_passive(doc) ->
-    ["Test setting the packet option {header, 1}"];
-header_decode_one_byte_passive(suite) ->
-    [];
+header_decode_one_byte_passive() ->
+    [{doc,"Test setting the packet option {header, 1}"}].
+
 header_decode_one_byte_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2654,10 +1769,9 @@ header_decode_one_byte_passive(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_passive(doc) ->
-    ["Test setting the packet option {header, 2}"];
-header_decode_two_bytes_passive(suite) ->
-    [];
+header_decode_two_bytes_passive() ->
+    [{doc,"Test setting the packet option {header, 2}"}].
+
 header_decode_two_bytes_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2689,10 +1803,9 @@ header_decode_two_bytes_passive(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_two_sent_passive(doc) ->
-    ["Test setting the packet option {header, 2} and sending two byte"];
-header_decode_two_bytes_two_sent_passive(suite) ->
-    [];
+header_decode_two_bytes_two_sent_passive() ->
+    [{doc,"Test setting the packet option {header, 2} and sending two byte"}].
+
 header_decode_two_bytes_two_sent_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2724,10 +1837,9 @@ header_decode_two_bytes_two_sent_passive(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-header_decode_two_bytes_one_sent_passive(doc) ->
-    ["Test setting the packet option {header, 2} and sending one byte"];
-header_decode_two_bytes_one_sent_passive(suite) ->
-    [];
+header_decode_two_bytes_one_sent_passive() ->
+    [{doc,"Test setting the packet option {header, 2} and sending one byte"}].
+
 header_decode_two_bytes_one_sent_passive(Config) when is_list(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
@@ -2757,7 +1869,30 @@ header_decode_two_bytes_one_sent_passive(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-%% Internal functions
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+packet(Config, Data, Send, Recv, Quantity, Packet, Active) ->
+    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, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, Send ,[Data, Quantity]}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, Recv, [Data, Quantity]}},
+					{options, [{active, Active},
+						   {packet, Packet} |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 send_raw(Socket,_, 0) ->
     ssl:send(Socket, <<>>),
@@ -2928,7 +2063,7 @@ 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]),
+    ct:print("Packet: ~p ~n", [Packet]),
     ok = ssl:send(Socket, P1),
     ok = ssl:send(Socket, P2),
     receive
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl
index c97f97e70b..77ad546420 100644
--- a/lib/ssl/test/ssl_payload_SUITE.erl
+++ b/lib/ssl/test/ssl_payload_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,79 +26,8 @@
 
 -define(TIMEOUT, 600000).
 
-%% Test server callback functions
 %%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    catch crypto:stop(),
-    try crypto:start() 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)
-    catch _:_  ->
-	    {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(_TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of 
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case] 
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -138,6 +67,21 @@ payload_tests() ->
      client_echos_active_once_huge,
      client_echos_active_huge].
 
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() 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)
+    catch _:_  ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
 
 init_per_group(GroupName, Config) ->
      case ssl_test_lib:is_tls_version(GroupName) of
@@ -157,15 +101,20 @@ init_per_group(GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+    [{watchdog, Dog} | Config].
 
-%% Test cases starts here.
+end_per_testcase(_TestCase, Config) ->
+    Config.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-server_echos_passive_small(doc) -> 
-    ["Client sends 1000 bytes in passive mode to server, that receives them, "
-     "sends them back, and closes."];
 
-server_echos_passive_small(suite) -> 
-    [];
+server_echos_passive_small() ->
+    [{doc, "Client sends 1000 bytes in passive mode to server, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_passive_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -179,12 +128,9 @@ server_echos_passive_small(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_once_small(doc) -> 
-    ["Client sends 1000 bytes in active once mode to server, that receives "
-     " them, sends them back, and closes."];
-
-server_echos_active_once_small(suite) -> 
-    [];
+server_echos_active_once_small() ->
+    [{doc, "Client sends 1000 bytes in active once mode to server, that receives "
+     " them, sends them back, and closes."}].
 
 server_echos_active_once_small(Config) when is_list(Config) -> 
         ClientOpts = ?config(client_opts, Config),
@@ -198,12 +144,9 @@ server_echos_active_once_small(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_small(doc) -> 
-    ["Client sends 1000 bytes in active mode to server, that receives them, "
-     "sends them back, and closes."];
-
-server_echos_active_small(suite) -> 
-    [];
+server_echos_active_small() ->
+    [{doc, "Client sends 1000 bytes in active mode to server, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_active_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -216,12 +159,9 @@ server_echos_active_small(Config) when is_list(Config) ->
 			ClientNode, ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_passive_small(doc) -> 
-    ["Server sends 1000 bytes in passive mode to client, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_passive_small(suite) -> 
-    [];
+client_echos_passive_small() ->
+    [{doc, "Server sends 1000 bytes in passive mode to client, that receives them, "
+      "sends them back, and closes."}].
 
 client_echos_passive_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -234,12 +174,9 @@ client_echos_passive_small(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_active_once_small(doc) -> 
+client_echos_active_once_small() ->
     ["Server sends 1000 bytes in active once mode to client, that receives "
-     "them, sends them back, and closes."];
-
-client_echos_active_once_small(suite) -> 
-    [];
+     "them, sends them back, and closes."].
 
 client_echos_active_once_small(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -252,15 +189,12 @@ client_echos_active_once_small(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
    
 %%--------------------------------------------------------------------
-client_echos_active_small(doc) -> 
-    ["Server sends 1000 bytes in active mode to client, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_active_small(suite) -> 
-    [];
+client_echos_active_small() ->
+    [{doc, "Server sends 1000 bytes in active mode to client, that receives them, "
+      "sends them back, and closes."}].
 
 client_echos_active_small(Config) when is_list(Config) -> 
-     ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -271,12 +205,9 @@ client_echos_active_small(Config) when is_list(Config) ->
 
 
 %%--------------------------------------------------------------------
-server_echos_passive_big(doc) -> 
-    ["Client sends 50000 bytes to server in passive mode, that receives them, "
-     "sends them back, and closes."];
-
-server_echos_passive_big(suite) -> 
-    [];
+server_echos_passive_big() ->
+    [{doc, "Client sends 50000 bytes to server in passive mode, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_passive_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -290,15 +221,12 @@ server_echos_passive_big(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_once_big(doc) -> 
-    ["Client sends 50000 bytes to server in active once mode, that receives "
-     "them, sends them back, and closes."];
-
-server_echos_active_once_big(suite) -> 
-    [];
+server_echos_active_once_big() ->
+    [{doc,"Client sends 50000 bytes to server in active once mode, that receives "
+      "them, sends them back, and closes."}].
 
 server_echos_active_once_big(Config) when is_list(Config) -> 
-        ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -309,12 +237,9 @@ server_echos_active_once_big(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_echos_active_big(doc) -> 
-    ["Client sends 50000 bytes to server in active once mode, that receives "
-     " them, sends them back, and closes."];
-
-server_echos_active_big(suite) -> 
-    [];
+server_echos_active_big() ->
+    [{doc, "Client sends 50000 bytes to server in active once mode, that receives "
+      " them, sends them back, and closes."}].
 
 server_echos_active_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -327,12 +252,9 @@ server_echos_active_big(Config) when is_list(Config) ->
 			ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_passive_big(doc) -> 
-    ["Server sends 50000 bytes to client in passive mode, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_passive_big(suite) -> 
-    [];
+client_echos_passive_big() ->
+    [{doc, "Server sends 50000 bytes to client in passive mode, that receives them, "
+     "sends them back, and closes."}].
 
 client_echos_passive_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -345,12 +267,9 @@ client_echos_passive_big(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_active_once_big(doc) -> 
-    ["Server sends 50000 bytes to client in active once mode, that receives"
-     " them, sends them back, and closes."];
-
-client_echos_active_once_big(suite) -> 
-    [];
+client_echos_active_once_big() ->
+    [{doc, "Server sends 50000 bytes to client in active once mode, that receives"
+      " them, sends them back, and closes."}].
 
 client_echos_active_once_big(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -363,12 +282,9 @@ client_echos_active_once_big(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
    
 %%--------------------------------------------------------------------
-client_echos_active_big(doc) -> 
-    ["Server sends 50000 bytes to client in active mode, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_active_big(suite) -> 
-    [];
+client_echos_active_big() ->
+    [{doc, "Server sends 50000 bytes to client in active mode, that receives them, "
+      "sends them back, and closes."}].
 
 client_echos_active_big(Config) when is_list(Config) -> 
      ClientOpts = ?config(client_opts, Config),
@@ -381,12 +297,9 @@ client_echos_active_big(Config) when is_list(Config) ->
 			ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-server_echos_passive_huge(doc) -> 
-    ["Client sends 500000 bytes to server in passive mode, that receives "
-     " them, sends them back, and closes."];
-
-server_echos_passive_huge(suite) -> 
-    [];
+server_echos_passive_huge() ->
+    [{doc, "Client sends 500000 bytes to server in passive mode, that receives "
+      " them, sends them back, and closes."}].
 
 server_echos_passive_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -399,12 +312,9 @@ server_echos_passive_huge(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-server_echos_active_once_huge(doc) -> 
-    ["Client sends 500000 bytes to server in active once mode, that receives "
-     "them, sends them back, and closes."];
-
-server_echos_active_once_huge(suite) -> 
-    [];
+server_echos_active_once_huge() ->
+    [{doc, "Client sends 500000 bytes to server in active once mode, that receives "
+      "them, sends them back, and closes."}].
 
 server_echos_active_once_huge(Config) when is_list(Config) -> 
         ClientOpts = ?config(client_opts, Config),
@@ -417,12 +327,9 @@ server_echos_active_once_huge(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-server_echos_active_huge(doc) -> 
-    ["Client sends 500000 bytes to server in active mode, that receives them, "
-     "sends them back, and closes."];
-
-server_echos_active_huge(suite) -> 
-    [];
+server_echos_active_huge() ->
+    [{doc, "Client sends 500000 bytes to server in active mode, that receives them, "
+     "sends them back, and closes."}].
 
 server_echos_active_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -435,12 +342,9 @@ server_echos_active_huge(Config) when is_list(Config) ->
 			ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_passive_huge(doc) -> 
-    ["Server sends 500000 bytes to client in passive mode, that receives "
-     "them, sends them back, and closes."];
-
-client_echos_passive_huge(suite) -> 
-    [];
+client_echos_passive_huge() ->
+    [{doc, "Server sends 500000 bytes to client in passive mode, that receives "
+     "them, sends them back, and closes."}].
 
 client_echos_passive_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -452,12 +356,9 @@ client_echos_passive_huge(Config) when is_list(Config) ->
 			 ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
-client_echos_active_once_huge(doc) -> 
-    ["Server sends 500000 bytes to client in active once mode, that receives "
-     "them, sends them back, and closes."];
-
-client_echos_active_once_huge(suite) -> 
-    [];
+client_echos_active_once_huge() ->
+    [{doc, "Server sends 500000 bytes to client in active once mode, that receives "
+      "them, sends them back, and closes."}].
 
 client_echos_active_once_huge(Config) when is_list(Config) -> 
     ClientOpts = ?config(client_opts, Config),
@@ -469,12 +370,9 @@ client_echos_active_once_huge(Config) when is_list(Config) ->
 			     ServerNode, Hostname).
    
 %%--------------------------------------------------------------------
-client_echos_active_huge(doc) -> 
-    ["Server sends 500000 bytes to client in active mode, that receives them, "
-     "sends them back, and closes."];
-
-client_echos_active_huge(suite) -> 
-    [];
+client_echos_active_huge() ->
+    [{doc, "Server sends 500000 bytes to client in active mode, that receives them, "
+     "sends them back, and closes."}].
 
 client_echos_active_huge(Config) when is_list(Config) -> 
      ClientOpts = ?config(client_opts, Config),
@@ -486,6 +384,8 @@ client_echos_active_huge(Config) when is_list(Config) ->
 			ServerNode, Hostname).
  
 %%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
 
 server_echos_passive(Data, Length, ClientOpts, ServerOpts, 
 		     ClientNode, ServerNode, Hostname) ->
@@ -656,33 +556,33 @@ send(Socket, Data, Size, Repeate,F) ->
  
 sender(Socket, Data, Size) ->
     ok = send(Socket, Data, Size, 100, fun() -> do_recv(Socket, Data, Size, <<>>, false) end),
-    test_server:format("Sender recv: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Sender recv: ~p~n", [ssl:getopts(Socket, [active])]),
     ok.
 
 sender_once(Socket, Data, Size) ->
     send(Socket, Data, Size, 100, 
 	 fun() -> do_active_once(Socket, Data, Size, <<>>, false) end),
-    test_server:format("Sender active once: ~p~n", 
+    ct:print("Sender active once: ~p~n",
 		       [ssl:getopts(Socket, [active])]),
     ok.
 
 sender_active(Socket, Data, Size) ->
     F = fun() -> do_active(Socket, Data, Size, <<>>, false) end,
     send(Socket, Data, Size, 100, F),
-    test_server:format("Sender active: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Sender active: ~p~n", [ssl:getopts(Socket, [active])]),
     ok.
 
 echoer(Socket, Data, Size) ->
-    test_server:format("Echoer recv: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Echoer recv: ~p~n", [ssl:getopts(Socket, [active])]),
     echo(fun() -> do_recv(Socket, Data, Size, <<>>, true) end, 100).
 
 echoer_once(Socket, Data, Size) ->
-    test_server:format("Echoer active once: ~p ~n",
+    ct:print("Echoer active once: ~p ~n",
 		       [ssl:getopts(Socket, [active])]),
     echo(fun() -> do_active_once(Socket, Data, Size, <<>>, true) end, 100).
 
 echoer_active(Socket, Data, Size) ->
-    test_server:format("Echoer active: ~p~n", [ssl:getopts(Socket, [active])]),
+    ct:print("Echoer active: ~p~n", [ssl:getopts(Socket, [active])]),
     echo(fun() -> do_active(Socket, Data, Size, <<>>, true) end, 100).
 
 echo(_Fun, 0) -> ok;
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index 1d71efd40c..fd9a0a594c 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The 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,18 +37,22 @@
 -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.
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [session_cleanup,
+     session_cache_process_list,
+     session_cache_process_mnesia].
+
+groups() ->
+    [].
+
 init_per_suite(Config0) ->
-    Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
+    Dog = ct:timetrap(?LONG_TIMEOUT *2),
     catch crypto:stop(),
     try crypto:start() of
 	ok ->
@@ -59,7 +63,7 @@ init_per_suite(Config0) ->
 	    Result =
 		(catch make_certs:all(?config(data_dir, Config0),
 				      ?config(priv_dir, Config0))),
-	    test_server:format("Make certs  ~p~n", [Result]),
+	    ct:print("Make certs  ~p~n", [Result]),
 
 	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
 	    Config = ssl_test_lib:cert_options(Config1),
@@ -68,29 +72,16 @@ init_per_suite(Config0) ->
 	    {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_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 init_per_testcase(session_cache_process_list, Config) ->
     init_customized_session_cache(list, Config);
 
@@ -100,7 +91,7 @@ init_per_testcase(session_cache_process_mnesia, Config) ->
 
 init_per_testcase(session_cleanup, Config0) ->
     Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
+    Dog = ct:timetrap(?TIMEOUT),
     ssl:stop(),
     application:load(ssl),
     application:set_env(ssl, session_lifetime, 5),
@@ -110,12 +101,12 @@ init_per_testcase(session_cleanup, Config0) ->
 
 init_per_testcase(_TestCase, Config0) ->
     Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
+    Dog = ct:timetrap(?TIMEOUT),
    [{watchdog, Dog} | Config].
 
 init_customized_session_cache(Type, Config0) ->
     Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
+    Dog = ct:timetrap(?TIMEOUT),
     ssl:stop(),
     application:load(ssl),
     application:set_env(ssl, session_cb, ?MODULE),
@@ -123,14 +114,6 @@ init_customized_session_cache(Type, Config0) ->
     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);
@@ -146,43 +129,14 @@ end_per_testcase(session_cleanup, Config) ->
     application:unset_env(ssl, session_lifetime),
     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_cleanup,
-     session_cache_process_list,
-     session_cache_process_mnesia].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
     Config.
 
-end_per_group(_GroupName, Config) ->
-    Config.
 %%--------------------------------------------------------------------
-session_cleanup(doc) ->
-    ["Test that sessions are cleand up eventually, so that the session table "
-     "does not grow and grow ..."];
-session_cleanup(suite) ->
-    [];
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+session_cleanup() ->
+    [{doc, "Test that sessions are cleand up eventually, so that the session table "
+     "does not grow and grow ..."}].
 session_cleanup(Config)when is_list(Config) ->
     process_flag(trap_exit, true),
     ClientOpts = ?config(client_opts, Config),
@@ -207,7 +161,7 @@ session_cleanup(Config)when is_list(Config) ->
 	end,
 
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
 
     {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
     [_, _,_, _, Prop] = StatusInfo,
@@ -224,14 +178,14 @@ session_cleanup(Config)when is_list(Config) ->
 
     %% Make sure session has expired and been cleaned up
     check_timer(SessionTimer),
-    test_server:sleep(?DELAY *2),  %% Delay time + some extra time
+    ct:sleep(?DELAY *2),  %% Delay time + some extra time
 
     {ServerDelayTimer, ClientDelayTimer} = get_delay_timers(),
 
     check_timer(ServerDelayTimer),
     check_timer(ClientDelayTimer),
 
-    test_server:sleep(?SLEEP),  %% Make sure clean has had time to run
+    ct:sleep(?SLEEP),  %% Make sure clean has had time to run
 
     undefined = ssl_session_cache:lookup(Cache, {{Hostname, Port}, Id}),
     undefined = ssl_session_cache:lookup(Cache, {Port, Id}),
@@ -248,7 +202,7 @@ check_timer(Timer) ->
 	    {status, _, _, _} = sys:get_status(whereis(ssl_manager)),
 	    ok;
 	Int ->
-	    test_server:sleep(Int),
+	    ct:sleep(Int),
 	    check_timer(Timer)
     end.
 
@@ -258,31 +212,25 @@ get_delay_timers() ->
     State = ssl_test_lib:state(Prop),
     case element(7, State) of
 	{undefined, undefined} ->
-	    test_server:sleep(?SLEEP),
+	    ct:sleep(?SLEEP),
 	    get_delay_timers();
 	{undefined, _} ->
-	    test_server:sleep(?SLEEP),
+	    ct:sleep(?SLEEP),
 	    get_delay_timers();
 	{_, undefined} ->
-	    test_server:sleep(?SLEEP),
+	    ct:sleep(?SLEEP),
 	    get_delay_timers();
 	DelayTimers ->
 	    DelayTimers
     end.
 %%--------------------------------------------------------------------
-session_cache_process_list(doc) ->
-    ["Test reuse of sessions (short handshake)"];
-
-session_cache_process_list(suite) ->
-    [];
+session_cache_process_list() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
 session_cache_process_list(Config) when is_list(Config) ->
     session_cache_process(list,Config).
 %%--------------------------------------------------------------------
-session_cache_process_mnesia(doc) ->
-    ["Test reuse of sessions (short handshake)"];
-
-session_cache_process_mnesia(suite) ->
-    [];
+session_cache_process_mnesia() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
 session_cache_process_mnesia(Config) when is_list(Config) ->
     session_cache_process(mnesia,Config).
 
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index f1f5b9ae0a..8d96a70a6e 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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 @@
 %%
 -module(ssl_test_lib).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 %% Note: This directive should only be used in test suites.
@@ -29,12 +28,6 @@
 
 -record(sslsocket, { fd = nil, pid = nil}).
 
-timetrap(Time) ->
-    Mul = try 
-	      test_server:timetrap_scale_factor()
-	  catch _:_ -> 1 end,
-    test_server:timetrap(1000+Time*Mul).
-
 %% For now always run locally
 run_where(_) ->
     ClientNode = node(),
@@ -65,8 +58,9 @@ run_server(Opts) ->
     Port = proplists:get_value(port, Opts),
     Options = proplists:get_value(options, Opts),
     Pid = proplists:get_value(from, Opts),
-    test_server:format("ssl:listen(~p, ~p)~n", [Port, Options]),
-    {ok, ListenSocket} = rpc:call(Node, ssl, listen, [Port, Options]),
+    Transport =  proplists:get_value(transport, Opts, ssl),
+    ct:print("ssl:listen(~p, ~p)~n", [Port, Options]),
+    {ok, ListenSocket} = rpc:call(Node, Transport, listen, [Port, Options]),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
     run_server(ListenSocket, Opts).
@@ -81,14 +75,15 @@ do_run_server(_, {error, timeout} = Result, Opts)  ->
 do_run_server(ListenSocket, AcceptSocket, Opts) ->
     Node = proplists:get_value(node, Opts),
     Pid = proplists:get_value(from, Opts),
+    Transport = proplists:get_value(transport, Opts, ssl),
     {Module, Function, Args} = proplists:get_value(mfa, Opts),
-    test_server:format("Server: apply(~p,~p,~p)~n", 
+    ct:print("Server: apply(~p,~p,~p)~n",
 		       [Module, Function, [AcceptSocket | Args]]),
     case rpc:call(Node, Module, Function, [AcceptSocket | Args]) of
 	no_result_msg ->
 	    ok;
 	Msg ->
-	    test_server:format("Server Msg: ~p ~n", [Msg]),
+	    ct:print("Server Msg: ~p ~n", [Msg]),
 	    Pid ! {self(), Msg}
     end,
     receive
@@ -97,15 +92,16 @@ do_run_server(ListenSocket, AcceptSocket, Opts) ->
 	{listen, MFA} ->
 	    run_server(ListenSocket, [MFA | proplists:delete(mfa, Opts)]);
 	close ->
-	    test_server:format("Server closing  ~p ~n", [self()]),
-	    Result = rpc:call(Node, ssl, close, [AcceptSocket], 500),
-	    test_server:format("Result ~p ~n", [Result]);
+	    ct:print("Server closing  ~p ~n", [self()]),
+	    Result = rpc:call(Node, Transport, close, [AcceptSocket], 500),
+	    Result1 = rpc:call(Node, Transport, close, [ListenSocket], 500),
+	    ct:print("Result ~p : ~p ~n", [Result, Result1]);
 	{ssl_closed, _} ->
 	    ok
     end.
 
 %%% To enable to test with s_client -reconnect
-connect(ListenSocket, Opts) ->
+connect(#sslsocket{} = ListenSocket, Opts) ->
     Node = proplists:get_value(node, Opts),
     ReconnectTimes =  proplists:get_value(reconnect_times, Opts, 0),
     Timeout = proplists:get_value(timeout, Opts, infinity),
@@ -116,15 +112,21 @@ connect(ListenSocket, Opts) ->
 	_ ->
 	  remove_close_msg(ReconnectTimes),
 	  AcceptSocket
-    end.
-    
+    end;
+connect(ListenSocket, Opts) ->
+    Node = proplists:get_value(node, Opts),
+    ct:print("gen_tcp:accept(~p)~n", [ListenSocket]),
+    {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, 
+				  [ListenSocket]),
+    AcceptSocket.
+
 connect(_, _, 0, AcceptSocket, _) ->
     AcceptSocket;
 connect(ListenSocket, Node, N, _, Timeout) ->
-    test_server:format("ssl:transport_accept(~p)~n", [ListenSocket]),
+    ct:print("ssl:transport_accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
 				  [ListenSocket]),    
-    test_server:format("ssl:ssl_accept(~p, ~p)~n", [AcceptSocket, Timeout]),
+    ct:print("ssl:ssl_accept(~p, ~p)~n", [AcceptSocket, Timeout]),
 
     case rpc:call(Node, ssl, ssl_accept, [AcceptSocket, Timeout]) of
 	ok ->
@@ -157,47 +159,111 @@ run_client(Opts) ->
     Host = proplists:get_value(host, Opts),
     Port = proplists:get_value(port, Opts),
     Pid = proplists:get_value(from, Opts),
+    Transport =  proplists:get_value(transport, Opts, ssl),
     Options = proplists:get_value(options, Opts),
-    test_server:format("ssl:connect(~p, ~p, ~p)~n", [Host, Port, Options]),
-    case rpc:call(Node, ssl, connect, [Host, Port, Options]) of
+    ct:print("ssl:connect(~p, ~p, ~p)~n", [Host, Port, Options]),
+    case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
 	{ok, Socket} ->
 	    Pid ! { connected, Socket },
-	    test_server:format("Client: connected~n", []), 
+	    ct:print("Client: connected~n", []),
 	    %% In special cases we want to know the client port, it will
 	    %% be indicated by sending {port, 0} in options list!
 	    send_selected_port(Pid,  proplists:get_value(port, Options), Socket),
 	    {Module, Function, Args} = proplists:get_value(mfa, Opts),
-	    test_server:format("Client: apply(~p,~p,~p)~n", 
+	    ct:print("Client: apply(~p,~p,~p)~n",
 			       [Module, Function, [Socket | Args]]),
 	    case rpc:call(Node, Module, Function, [Socket | Args]) of
 		no_result_msg ->
 		    ok;
 		Msg ->
-		    test_server:format("Client Msg: ~p ~n", [Msg]),
+		    ct:print("Client Msg: ~p ~n", [Msg]),
 		    Pid ! {self(), Msg}
 	    end,
 	    receive
 		close ->
-		    test_server:format("Client closing~n", []),
-		    rpc:call(Node, ssl, close, [Socket]);
+		    ct:print("Client closing~n", []),
+		    rpc:call(Node, Transport, close, [Socket]);
 		{ssl_closed, Socket} ->
+		    ok;
+		{gen_tcp, closed} ->
 		    ok
 	    end;
 	{error, Reason} ->
-	    test_server:format("Client: connection failed: ~p ~n", [Reason]),
+	    ct:print("Client: connection failed: ~p ~n", [Reason]),
 	       Pid ! {self(), {error, Reason}}
     end.
 
 close(Pid) ->
-    test_server:format("Close ~p ~n", [Pid]),
+    ct:print("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])
+	    ct:print("Pid: ~p down due to:~p ~n", [Pid, Reason])
     end.
 
+
+check_result(Server, {error, SReason} = ServerMsg, Client,  {error, closed} = ClientMsg) -> 
+    receive 
+	{Server, {error, {SReason, _}}} -> 
+	    receive 
+		{Client, ClientMsg} ->
+		    ok;
+		Unexpected ->
+		    Reason = {{expected, {Client, ClientMsg}}, 
+			      {got, Unexpected}},
+		    ct:fail(Reason)
+	    end;
+	{Client, ClientMsg} -> 
+	    receive 
+		{Server, {error, {SReason, _}}} ->
+		    ok;
+		Unexpected ->
+		    Reason = {{expected, {Server,{error, {SReason, 'term()'}}}, 
+			      {got, Unexpected}}},
+		    ct:fail(Reason)
+	    end;
+	{Port, {data,Debug}} when is_port(Port) ->
+	    io:format("openssl ~s~n",[Debug]),
+	    check_result(Server, ServerMsg, Client, ClientMsg);
+
+	Unexpected ->
+	    Reason = {{expected, {Client, ClientMsg}},
+		      {expected, {Server, {error, {SReason, 'term()'}}}, {got, Unexpected}}},
+	    ct:fail(Reason)
+    end;
+
+check_result(Server, {error, closed} = ServerMsg, Client,  {error, CReson} = ClientMsg) -> 
+    receive 
+	{Server, ServerMsg} -> 
+	    receive 
+		{Client, {error, {CReson, _}}} ->
+		    ok;
+		Unexpected ->
+		    Reason = {{expected, {Client, {error, {CReson, 'term()'}}}, 
+			      {got, Unexpected}}},
+		    ct:fail(Reason)
+	    end;
+	{Client, {error, {CReson, _}}} -> 
+	    receive 
+		{Server, ServerMsg} ->
+		    ok;
+		Unexpected ->
+		    Reason = {{expected, {Server, ServerMsg}}, 
+			      {got, Unexpected}},
+		    ct:fail(Reason)
+	    end;
+	{Port, {data,Debug}} when is_port(Port) ->
+	    io:format("openssl ~s~n",[Debug]),
+	    check_result(Server, ServerMsg, Client, ClientMsg);
+
+	Unexpected ->
+	    Reason = {{expected, {Client, {error, {CReson, 'term()'}}},
+		      {expected, {Server, ServerMsg}}, {got, Unexpected}}},
+	    ct:fail(Reason)
+    end;
+
 check_result(Server, ServerMsg, Client, ClientMsg) -> 
     receive 
 	{Server, ServerMsg} -> 
@@ -207,7 +273,7 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
 		Unexpected ->
 		    Reason = {{expected, {Client, ClientMsg}}, 
 			      {got, Unexpected}},
-		    test_server:fail(Reason)
+		    ct:fail(Reason)
 	    end;
 	{Client, ClientMsg} -> 
 	    receive 
@@ -216,7 +282,7 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
 		Unexpected ->
 		    Reason = {{expected, {Server, ClientMsg}}, 
 			      {got, Unexpected}},
-		    test_server:fail(Reason)
+		    ct:fail(Reason)
 	    end;
 	{Port, {data,Debug}} when is_port(Port) ->
 	    io:format("openssl ~s~n",[Debug]),
@@ -225,9 +291,25 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
 	Unexpected ->
 	    Reason = {{expected, {Client, ClientMsg}},
 		      {expected, {Server, ServerMsg}}, {got, Unexpected}},
-	    test_server:fail(Reason)
+	    ct:fail(Reason)
     end.
 
+check_result(Pid, {error, Reason} = Err) when Reason == ecertfile;
+					      Reason == ecacertfile;
+					      Reason == ekeyfile;
+					      Reason == edhfile ->
+    receive 
+	{Pid, {error, {Reason, Str}}} when is_list(Str) -> 
+	    ok;
+	{Port, {data,Debug}} when is_port(Port) ->
+	    io:format("openssl ~s~n",[Debug]),
+	    check_result(Pid, Err);
+	Unexpected ->
+	    Reason = {{expected, {Pid, {error, {Reason, "'appropriate error string'"}}}}, 
+		      {got, Unexpected}},
+	    ct:fail(Reason)
+    end;
+
 check_result(Pid, Msg) -> 
     receive 
 	{Pid, Msg} -> 
@@ -238,7 +320,7 @@ check_result(Pid, Msg) ->
 	Unexpected ->
 	    Reason = {{expected, {Pid, Msg}}, 
 		      {got, Unexpected}},
-	    test_server:fail(Reason)
+	    ct:fail(Reason)
     end.
 
 wait_for_result(Server, ServerMsg, Client, ClientMsg) -> 
@@ -405,33 +487,33 @@ run_upgrade_server(Opts) ->
     SslOptions = proplists:get_value(ssl_options, Opts),
     Pid = proplists:get_value(from, Opts),
 
-    test_server:format("gen_tcp:listen(~p, ~p)~n", [Port, TcpOptions]),
+    ct:print("gen_tcp:listen(~p, ~p)~n", [Port, TcpOptions]),
     {ok, ListenSocket} = rpc:call(Node, gen_tcp, listen, [Port, TcpOptions]),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
-    test_server:format("gen_tcp:accept(~p)~n", [ListenSocket]),
+    ct:print("gen_tcp:accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, [ListenSocket]),
 
     try
 	{ok, SslAcceptSocket} = case TimeOut of
 				    infinity ->
-					test_server:format("ssl:ssl_accept(~p, ~p)~n",
+					ct:print("ssl:ssl_accept(~p, ~p)~n",
 							   [AcceptSocket, SslOptions]),
 					rpc:call(Node, ssl, ssl_accept,
 						 [AcceptSocket, SslOptions]);
 				    _ ->
-					test_server:format("ssl:ssl_accept(~p, ~p, ~p)~n",
+					ct:print("ssl:ssl_accept(~p, ~p, ~p)~n",
 							   [AcceptSocket, SslOptions, TimeOut]),
 					rpc:call(Node, ssl, ssl_accept,
 						 [AcceptSocket, SslOptions, TimeOut])
 				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]),
+	ct:print("Upgrade Server Msg: ~p ~n", [Msg]),
 	Pid ! {self(), Msg},
 	receive
 	    close ->
-		test_server:format("Upgrade Server closing~n", []),
+		ct:print("Upgrade Server closing~n", []),
 		rpc:call(Node, ssl, close, [SslAcceptSocket])
 	end
     catch error:{badmatch, Error} ->
@@ -449,24 +531,24 @@ run_upgrade_client(Opts) ->
     TcpOptions = proplists:get_value(tcp_options, Opts),
     SslOptions = proplists:get_value(ssl_options, Opts),
     
-    test_server:format("gen_tcp:connect(~p, ~p, ~p)~n", 
+    ct:print("gen_tcp:connect(~p, ~p, ~p)~n",
 		       [Host, Port, TcpOptions]),
     {ok, Socket} = rpc:call(Node, gen_tcp, connect, [Host, Port, TcpOptions]),
 
     send_selected_port(Pid, Port, Socket),
 
-    test_server:format("ssl:connect(~p, ~p)~n", [Socket, SslOptions]),
+    ct:print("ssl:connect(~p, ~p)~n", [Socket, SslOptions]),
     {ok, SslSocket} = rpc:call(Node, ssl, connect, [Socket, SslOptions]),
 
     {Module, Function, Args} = proplists:get_value(mfa, Opts),
-    test_server:format("apply(~p, ~p, ~p)~n", 
+    ct:print("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]),
+    ct:print("Upgrade Client Msg: ~p ~n", [Msg]),
     Pid ! {self(), Msg},
     receive 
 	close ->
-	    test_server:format("Upgrade Client closing~n", []),
+	    ct:print("Upgrade Client closing~n", []),
 	    rpc:call(Node, ssl, close, [SslSocket])
     end.
 
@@ -485,20 +567,20 @@ run_upgrade_server_error(Opts) ->
     SslOptions = proplists:get_value(ssl_options, Opts),
     Pid = proplists:get_value(from, Opts),
 
-    test_server:format("gen_tcp:listen(~p, ~p)~n", [Port, TcpOptions]),
+    ct:print("gen_tcp:listen(~p, ~p)~n", [Port, TcpOptions]),
     {ok, ListenSocket} = rpc:call(Node, gen_tcp, listen, [Port, TcpOptions]),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
-    test_server:format("gen_tcp:accept(~p)~n", [ListenSocket]),
+    ct:print("gen_tcp:accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, [ListenSocket]),
     Error = case TimeOut of
 		infinity ->
-		    test_server:format("ssl:ssl_accept(~p, ~p)~n",
+		    ct:print("ssl:ssl_accept(~p, ~p)~n",
 				       [AcceptSocket, SslOptions]),
 		    rpc:call(Node, ssl, ssl_accept,
 			     [AcceptSocket, SslOptions]);
 		_ ->
-		    test_server:format("ssl:ssl_accept(~p, ~p, ~p)~n",
+		    ct:print("ssl:ssl_accept(~p, ~p, ~p)~n",
 				       [AcceptSocket, SslOptions, TimeOut]),
 		    rpc:call(Node, ssl, ssl_accept,
 			     [AcceptSocket, SslOptions, TimeOut])
@@ -517,22 +599,31 @@ run_server_error(Opts) ->
     Port = proplists:get_value(port, Opts),
     Options = proplists:get_value(options, Opts),
     Pid = proplists:get_value(from, Opts),
-    test_server:format("ssl:listen(~p, ~p)~n", [Port, Options]),
-    case rpc:call(Node, ssl, listen, [Port, Options]) of
-	{ok, ListenSocket} ->
+    Transport =  proplists:get_value(transport, Opts, ssl),
+    ct:print("ssl:listen(~p, ~p)~n", [Port, Options]),
+    case rpc:call(Node, Transport, listen, [Port, Options]) of
+	{ok, #sslsocket{} = ListenSocket} ->
 	    %% To make sure error_client will
 	    %% get {error, closed} and not {error, connection_refused}
 	    Pid ! {listen, up},
 	    send_selected_port(Pid, Port, ListenSocket),
-	    test_server:format("ssl:transport_accept(~p)~n", [ListenSocket]),
-	    case rpc:call(Node, ssl, transport_accept, [ListenSocket]) of
+	    ct:print("ssl:transport_accept(~p)~n", [ListenSocket]),
+	    case rpc:call(Node, Transport, transport_accept, [ListenSocket]) of
 		{error, _} = Error ->
 		    Pid ! {self(), Error};
 		{ok, AcceptSocket} ->
-		    test_server:format("ssl:ssl_accept(~p)~n", [AcceptSocket]),
+		    ct:print("ssl:ssl_accept(~p)~n", [AcceptSocket]),
 		    Error = rpc:call(Node, ssl, ssl_accept, [AcceptSocket]),
 		    Pid ! {self(), Error}
 	    end;
+	{ok, ListenSocket} ->
+	    Pid ! {listen, up},
+	    send_selected_port(Pid, Port, ListenSocket),
+	    ct:print("~p:accept(~p)~n", [Transport, ListenSocket]),
+	     case rpc:call(Node, Transport, accept, [ListenSocket]) of
+		{error, _} = Error ->
+		     Pid ! {self(), Error}
+	     end;
 	Error ->
 	    %% Not really true but as this is an error test 
 	    %% this is what we want.
@@ -548,9 +639,10 @@ run_client_error(Opts) ->
     Host = proplists:get_value(host, Opts),
     Port = proplists:get_value(port, Opts),
     Pid = proplists:get_value(from, Opts),
+    Transport = proplists:get_value(transport, Opts, ssl),
     Options = proplists:get_value(options, Opts),
-    test_server:format("ssl:connect(~p, ~p, ~p)~n", [Host, Port, Options]),
-    Error = rpc:call(Node, ssl, connect, [Host, Port, Options]),
+    ct:print("ssl:connect(~p, ~p, ~p)~n", [Host, Port, Options]),
+    Error = rpc:call(Node, Transport, connect, [Host, Port, Options]),
     Pid ! {self(), Error}.
 
 inet_port(Pid) when is_pid(Pid)->
@@ -577,7 +669,7 @@ trigger_renegotiate(Socket, [ErlData, N]) ->
     trigger_renegotiate(Socket, ErlData, N, Id).
 
 trigger_renegotiate(Socket, _, 0, Id) ->
-    test_server:sleep(1000),
+    ct:sleep(1000),
     case ssl:session_info(Socket) of
 	[{session_id, Id} | _ ] ->
 	    fail_session_not_renegotiated;
@@ -670,7 +762,7 @@ der_to_pem(File, Entries) ->
 
 cipher_result(Socket, Result) ->
     Result = ssl:connection_info(Socket),
-    test_server:format("Successfull connect: ~p~n", [Result]),
+    ct:print("Successfull connect: ~p~n", [Result]),
     %% Importante to send two packets here
     %% to properly test "cipher state" handling
     ssl:send(Socket, "Hello\n"),
@@ -751,3 +843,33 @@ sufficient_crypto_support('tlsv1.2') ->
     end;
 sufficient_crypto_support(_) ->
     true.
+
+send_recv_result_active(Socket) ->
+    ssl:send(Socket, "Hello world"),
+    receive
+	{ssl, Socket, "H"} ->
+	    receive
+		{ssl, Socket, "ello world"} ->
+		    ok
+	    end;
+	{ssl, Socket, "Hello world"} ->
+	    ok
+    end.
+
+send_recv_result(Socket) ->
+    ssl:send(Socket, "Hello world"),
+    {ok,"Hello world"} = ssl:recv(Socket, 11),
+    ok.
+
+send_recv_result_active_once(Socket) ->
+    ssl:send(Socket, "Hello world"),
+    receive
+	{ssl, Socket, "H"} ->
+	    ssl:setopts(Socket, [{active, once}]),
+	    receive
+		{ssl, Socket, "ello world"} ->
+		    ok
+	    end;
+	{ssl, Socket, "Hello world"} ->
+	    ok
+    end.
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index f4e19b3f87..7c0c00bf36 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +16,6 @@
 %%
 %% %CopyrightEnd%
 %%
-
 %%
 
 -module(ssl_to_openssl_SUITE).
@@ -34,131 +33,10 @@
 -define(OPENSSL_GARBAGE, "P\n").
 -define(EXPIRE, 10).
 
-%% 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 os:find_executable("openssl") of
-	false ->
-	    {skip, "Openssl not found"};
-	_ ->
-	    catch crypto:stop(),
-	    try crypto:start() 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]
-		catch _:_  ->
-		    {skip, "Crypto did not start"}
-	    end
-    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(expired_session, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?EXPIRE * 1000 * 5),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, session_lifetime, ?EXPIRE),
-    ssl:start(),
-    [{watchdog, Dog} | Config];
-
-init_per_testcase(TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = ssl_test_lib:timetrap(?TIMEOUT),
-    special_init(TestCase, [{watchdog, Dog} | Config]).
-
-special_init(TestCase, Config) 
-  when TestCase == erlang_client_openssl_server_renegotiate;
-       TestCase == erlang_client_openssl_server_no_wrap_sequence_number;
-       TestCase == erlang_server_openssl_client_no_wrap_sequence_number
-       ->
-    check_sane_openssl_renegotaite(Config);
-
-special_init(ssl2_erlang_server_openssl_client, Config) ->
-    check_sane_openssl_sslv2(Config);
-
-special_init(TestCase, Config)
-    when TestCase == erlang_client_openssl_server_npn;
-         TestCase == erlang_server_openssl_client_npn;
-         TestCase == erlang_server_openssl_client_npn_renegotiate;
-         TestCase == erlang_client_openssl_server_npn_renegotiate;
-         TestCase == erlang_server_openssl_client_npn_only_server;
-         TestCase == erlang_server_openssl_client_npn_only_client;
-         TestCase == erlang_client_openssl_server_npn_only_client;
-         TestCase == erlang_client_openssl_server_npn_only_server ->
-    check_openssl_npn_support(Config);
-
-special_init(_, Config) ->
-    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
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-end_per_testcase(reuse_session_expired, Config) ->
-    application:unset_env(ssl, session_lifetime),
-    end_per_testcase(default_action, Config);
-
-end_per_testcase(default_action, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of 
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end;
-end_per_testcase(_, Config) ->
-    end_per_testcase(default_action, Config).
 
-%%--------------------------------------------------------------------
-%% 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() -> 
@@ -211,6 +89,34 @@ npn_tests() ->
      erlang_client_openssl_server_npn_only_client,
      erlang_client_openssl_server_npn_only_server].
 
+
+init_per_suite(Config0) ->
+    Dog = ct:timetrap(?LONG_TIMEOUT *2),
+    case os:find_executable("openssl") of
+	false ->
+	    {skip, "Openssl not found"};
+	_ ->
+	    catch crypto:stop(),
+	    try crypto:start() of
+		ok ->
+		    application:start(public_key),
+		    ssl:start(),
+		    Result =
+			(catch make_certs:all(?config(data_dir, Config0),
+					      ?config(priv_dir, Config0))),
+		    ct:print("Make certs  ~p~n", [Result]),
+		    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+		    Config = ssl_test_lib:cert_options(Config1),
+		    [{watchdog, Dog} | Config]
+		catch _:_  ->
+		    {skip, "Crypto did not start"}
+	    end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
 init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) of
 	true ->
@@ -229,13 +135,55 @@ init_per_group(GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(expired_session, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?EXPIRE * 1000 * 5),
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, session_lifetime, ?EXPIRE),
+    ssl:start(),
+    [{watchdog, Dog} | Config];
+
+init_per_testcase(TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = ct:timetrap(?TIMEOUT),
+    special_init(TestCase, [{watchdog, Dog} | Config]).
+
+special_init(TestCase, Config)
+  when TestCase == erlang_client_openssl_server_renegotiate;
+       TestCase == erlang_client_openssl_server_nowrap_seqnum;
+       TestCase == erlang_server_openssl_client_nowrap_seqnum
+       ->
+    check_sane_openssl_renegotaite(Config);
+
+special_init(ssl2_erlang_server_openssl_client, Config) ->
+    check_sane_openssl_sslv2(Config);
+
+special_init(TestCase, Config)
+    when TestCase == erlang_client_openssl_server_npn;
+         TestCase == erlang_server_openssl_client_npn;
+         TestCase == erlang_server_openssl_client_npn_renegotiate;
+         TestCase == erlang_client_openssl_server_npn_renegotiate;
+         TestCase == erlang_server_openssl_client_npn_only_server;
+         TestCase == erlang_server_openssl_client_npn_only_client;
+         TestCase == erlang_client_openssl_server_npn_only_client;
+         TestCase == erlang_client_openssl_server_npn_only_server ->
+    check_openssl_npn_support(Config);
+
+special_init(_, Config) ->
+    Config.
+
+end_per_testcase(reuse_session_expired, Config) ->
+    application:unset_env(ssl, session_lifetime),
+    Config;
+end_per_testcase(_, Config) ->
+    Config.
 
-%% Test cases starts here.
 %%--------------------------------------------------------------------
-basic_erlang_client_openssl_server(doc) ->
-    ["Test erlang client with openssl server"];
-basic_erlang_client_openssl_server(suite) ->
-    [];
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+basic_erlang_client_openssl_server() ->
+    [{doc,"Test erlang client with openssl server"}].
 basic_erlang_client_openssl_server(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -252,7 +200,7 @@ basic_erlang_client_openssl_server(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++
 	" -cert " ++ CertFile  ++ " -key " ++ KeyFile, 
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -271,14 +219,11 @@ basic_erlang_client_openssl_server(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------    
-basic_erlang_server_openssl_client(doc) ->
-    ["Test erlang server with openssl client"];
-basic_erlang_server_openssl_client(suite) ->
-    [];
+basic_erlang_server_openssl_client() ->
+    [{doc,"Test erlang server with openssl client"}].
 basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -296,7 +241,7 @@ basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     Cmd = "openssl s_client -port " ++ integer_to_list(Port) ++
 	" -host localhost",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     port_command(OpenSslPort, Data),
@@ -309,10 +254,8 @@ basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, false),
     ok.
 %%--------------------------------------------------------------------
-erlang_client_openssl_server(doc) ->
-    ["Test erlang client with openssl server"];
-erlang_client_openssl_server(suite) ->
-    [];
+erlang_client_openssl_server() ->
+    [{doc,"Test erlang client with openssl server"}].
 erlang_client_openssl_server(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),
@@ -329,7 +272,7 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
 	" -cert " ++ CertFile  ++ " -key " ++ KeyFile,
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -348,15 +291,11 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
-
+    process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------
-erlang_server_openssl_client(doc) ->
-    ["Test erlang server with openssl client"];
-erlang_server_openssl_client(suite) ->
-    [];
+erlang_server_openssl_client() ->
+    [{doc,"Test erlang server with openssl client"}].
 erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),
@@ -375,7 +314,7 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
     Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -host localhost",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     port_command(OpenSslPort, Data),
@@ -385,15 +324,12 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 
 %%-------------------------------------------------------------------- 
 
-erlang_client_openssl_server_dsa_cert(doc) ->
-    ["Test erlang server with openssl client"];
-erlang_client_openssl_server_dsa_cert(suite) ->
-    [];
+erlang_client_openssl_server_dsa_cert() ->
+    [{doc,"Test erlang server with openssl client"}].
 erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ClientOpts = ?config(client_dsa_opts, Config),  
@@ -413,7 +349,7 @@ erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
 	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
 	++ " -key " ++ KeyFile ++ " -Verify 2 -msg",
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -436,10 +372,8 @@ erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, false),
     ok.
 %%--------------------------------------------------------------------
-erlang_server_openssl_client_dsa_cert(doc) ->
-    ["Test erlang server with openssl client"];
-erlang_server_openssl_client_dsa_cert(suite) ->
-    [];
+erlang_server_openssl_client_dsa_cert() ->
+    [{doc,"Test erlang server with openssl client"}].
 erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ClientOpts = ?config(client_dsa_opts, Config),
@@ -462,7 +396,7 @@ erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
        " -host localhost " ++  " -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile
        ++ " -key " ++ KeyFile ++ " -msg",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
     port_command(OpenSslPort, Data),
@@ -472,16 +406,13 @@ erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 
 %%-------------------------------------------------------------------- 
 
-erlang_server_openssl_client_reuse_session(doc) ->
-    ["Test erlang server with openssl client that reconnects with the"
-     "same session id, to test reusing of sessions."];
-erlang_server_openssl_client_reuse_session(suite) ->
-    [];
+erlang_server_openssl_client_reuse_session() ->
+    [{doc, "Test erlang server with openssl client that reconnects with the"
+     "same session id, to test reusing of sessions."}].
 erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -500,7 +431,7 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
     Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -host localhost -reconnect",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -516,10 +447,8 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-erlang_client_openssl_server_renegotiate(doc) ->
-    ["Test erlang client when openssl server issuses a renegotiate"];
-erlang_client_openssl_server_renegotiate(suite) ->
-    [];
+erlang_client_openssl_server_renegotiate() ->
+    [{doc,"Test erlang client when openssl server issuses a renegotiate"}].
 erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -538,7 +467,7 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -552,7 +481,7 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
 					{options, ClientOpts}]),
 
     port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
     port_command(OpensslPort, OpenSslData),
     
     ssl_test_lib:check_result(Client, ok), 
@@ -565,13 +494,11 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-erlang_client_openssl_server_nowrap_seqnum(doc) ->
-    ["Test that erlang client will renegotiate session when",  
+erlang_client_openssl_server_nowrap_seqnum() ->
+    [{doc, "Test that erlang client will renegotiate session when",
      "max sequence number celing is about to be reached. Although"
      "in the testcase we use the test option renegotiate_at" 
-     " to lower treashold substantially."];
-erlang_client_openssl_server_nowrap_seqnum(suite) ->
-    [];
+     " to lower treashold substantially."}].
 erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -589,7 +516,7 @@ erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -608,17 +535,13 @@ erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 %%--------------------------------------------------------------------
-erlang_server_openssl_client_nowrap_seqnum(doc) ->
-    ["Test that erlang client will renegotiate session when",  
+erlang_server_openssl_client_nowrap_seqnum() ->
+    [{doc, "Test that erlang client will renegotiate session when",
      "max sequence number celing is about to be reached. Although"
      "in the testcase we use the test option renegotiate_at" 
-     " to lower treashold substantially."];
-
-erlang_server_openssl_client_nowrap_seqnum(suite) ->
-    [];
+     " to lower treashold substantially."}].
 erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -639,7 +562,7 @@ erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
     Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -host localhost -msg",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -650,16 +573,14 @@ erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     close_port(OpenSslPort),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
+
 %%--------------------------------------------------------------------
 
-erlang_client_openssl_server_no_server_ca_cert(doc) ->
-    ["Test erlang client when openssl server sends a cert chain not"
+erlang_client_openssl_server_no_server_ca_cert() ->
+    [{doc, "Test erlang client when openssl server sends a cert chain not"
      "including the ca cert. Explicitly test this even if it is"
-     "implicitly tested eleswhere."];
-erlang_client_openssl_server_no_server_ca_cert(suite) ->
-    [];
+     "implicitly tested eleswhere."}].
 erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -676,7 +597,7 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -696,14 +617,11 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort),
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------
-erlang_client_openssl_server_client_cert(doc) ->
-    ["Test erlang client with openssl server when client sends cert"];
-erlang_client_openssl_server_client_cert(suite) ->
-    [];
+erlang_client_openssl_server_client_cert() ->
+    [{doc,"Test erlang client with openssl server when client sends cert"}].
 erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
@@ -722,7 +640,7 @@ erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
 	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile 
 	++ " -key " ++ KeyFile ++ " -Verify 2",
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -741,15 +659,12 @@ erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpensslPort), 
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------  
 
-erlang_server_openssl_client_client_cert(doc) ->
-    ["Test erlang server with openssl client when client sends cert"];
-erlang_server_openssl_client_client_cert(suite) ->
-    [];
+erlang_server_openssl_client_client_cert() ->
+    [{doc,"Test erlang server with openssl client when client sends cert"}].
 erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
@@ -776,7 +691,7 @@ erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
 	++ " -key " ++ KeyFile ++ " -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
 	" -host localhost",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     port_command(OpenSslPort, Data),
@@ -786,16 +701,12 @@ erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     close_port(OpenSslPort),
     ssl_test_lib:close(Server),
-    process_flag(trap_exit, false),
-    ok.
-
+    process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------  
 
-erlang_server_erlang_client_client_cert(doc) ->
-    ["Test erlang server with erlang client when client sends cert"];
-erlang_server_erlang_client_client_cert(suite) ->
-    [];
+erlang_server_erlang_client_client_cert() ->
+    [{doc,"Test erlang server with erlang client when client sends cert"}].
 erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
@@ -828,30 +739,22 @@ erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
     
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------  
+    process_flag(trap_exit, false).
 
-ciphers_rsa_signed_certs(doc) -> 
-    ["Test cipher suites that uses rsa certs"];
-       
-ciphers_rsa_signed_certs(suite) -> 
-    [];
+%%--------------------------------------------------------------------
 
+ciphers_rsa_signed_certs() ->
+    [{doc,"Test cipher suites that uses rsa certs"}].
 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_dsa_signed_certs(suite) -> 
-    [];
-
+ciphers_dsa_signed_certs() ->
+    [{doc,"Test cipher suites that uses dsa certs"}].
 ciphers_dsa_signed_certs(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
@@ -859,90 +762,9 @@ ciphers_dsa_signed_certs(Config) when is_list(Config) ->
     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, ClientOpts, ServerOpts) 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.
-
-cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->   
-    process_flag(trap_exit, true),
-    test_server:format("Testing CipherSuite ~p~n", [CipherSuite]),
-    {ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Port = ssl_test_lib:inet_port(node()),
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    KeyFile = proplists:get_value(keyfile, ServerOpts),
-   
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
-	" -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, {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),    
-
-    %% Clean close down!   Server needs to be closed first !!
-    close_port(OpenSslPort),
-    ssl_test_lib:close(Client),
-    
-    Return = case Result of
-		 ok ->
-		     [];
-		 Error ->
-		     [{CipherSuite, Error}]
-	     end,
-    process_flag(trap_exit, false),
-    Return.
-
 %%--------------------------------------------------------------------
-erlang_client_bad_openssl_server(doc) ->
-    [""];
-erlang_client_bad_openssl_server(suite) ->
-    [];
+erlang_client_bad_openssl_server() ->
+    [{doc,"Test what happens if openssl server sends garbage to erlang ssl client"}].
 erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_verification_opts, Config),  
@@ -957,7 +779,7 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
  	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     
@@ -973,7 +795,7 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     %% Send garbage
     port_command(OpensslPort, ?OPENSSL_GARBAGE),
 
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
 
     Client0 ! server_sent_garbage,
     
@@ -997,13 +819,9 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-expired_session(doc) -> 
-    ["Test our ssl client handling of expired sessions. Will make"
-    "better code coverage of the ssl_manager module"];
-
-expired_session(suite) -> 
-    [];
-
+expired_session() ->
+    [{doc, "Test our ssl client handling of expired sessions. Will make"
+      "better code coverage of the ssl_manager module"}].
 expired_session(Config) when is_list(Config) -> 
     process_flag(trap_exit, true),
     ClientOpts = ?config(client_opts, Config),
@@ -1017,7 +835,7 @@ expired_session(Config) when is_list(Config) ->
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "", 
     
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
@@ -1032,7 +850,7 @@ expired_session(Config) when is_list(Config) ->
     ssl_test_lib:close(Client0),
 
     %% Make sure session is registered
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
 
     Client1 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
@@ -1042,7 +860,7 @@ expired_session(Config) when is_list(Config) ->
     
     ssl_test_lib:close(Client1),
     %% Make sure session is unregistered due to expiration
-    test_server:sleep((?EXPIRE+1) * 1000),
+    ct:sleep((?EXPIRE+1) * 1000),
     
     Client2 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
@@ -1056,10 +874,9 @@ expired_session(Config) when is_list(Config) ->
     process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------
-ssl2_erlang_server_openssl_client(doc) ->
-    ["Test that ssl v2 clients are rejected"];
-ssl2_erlang_server_openssl_client(suite) ->
-    [];
+ssl2_erlang_server_openssl_client() ->
+    [{doc,"Test that ssl v2 clients are rejected"}].
+
 ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
@@ -1076,7 +893,7 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
 	" -host localhost -ssl2 -msg",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     port_command(OpenSslPort, Data),
@@ -1085,14 +902,13 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
 	    ok
 
     end,
-    ssl_test_lib:check_result(Server, {error,"protocol version"}),
+    ssl_test_lib:check_result(Server, {error, {essl, "protocol version"}}),
     process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------
-erlang_client_openssl_server_npn(doc) ->
-    ["Test erlang client with openssl server doing npn negotiation"];
-erlang_client_openssl_server_npn(suite) ->
-    [];
+erlang_client_openssl_server_npn() ->
+    [{doc,"Test erlang client with openssl server doing npn negotiation"}].
+
 erlang_client_openssl_server_npn(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
     start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
@@ -1100,33 +916,25 @@ erlang_client_openssl_server_npn(Config) when is_list(Config) ->
 
         ssl_test_lib:check_result(Client, ok)
     end),
-
     ok.
 
-
 %%--------------------------------------------------------------------
-erlang_client_openssl_server_npn_renegotiate(doc) ->
-    ["Test erlang client with openssl server doing npn negotiation and renegotiate"];
-erlang_client_openssl_server_npn_renegotiate(suite) ->
-    [];
+erlang_client_openssl_server_npn_renegotiate() ->
+    [{doc,"Test erlang client with openssl server doing npn negotiation and renegotiate"}].
+
 erlang_client_openssl_server_npn_renegotiate(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
     start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
         port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-        test_server:sleep(?SLEEP),
+        ct:sleep(?SLEEP),
         port_command(OpensslPort, Data),
         ssl_test_lib:check_result(Client, ok)
     end),
     ok.
-
-
 %%--------------------------------------------------------------------------
+erlang_server_openssl_client_npn() ->
+    [{doc,"Test erlang server with openssl client and npn negotiation"}].
 
-
-erlang_server_openssl_client_npn(doc) ->
-    ["Test erlang server with openssl client and npn negotiation"];
-erlang_server_openssl_client_npn(suite) ->
-    [];
 erlang_server_openssl_client_npn(Config) when is_list(Config) ->
 
     Data = "From openssl to erlang",
@@ -1137,25 +945,23 @@ erlang_server_openssl_client_npn(Config) when is_list(Config) ->
     ok.
 
 %%--------------------------------------------------------------------------
+erlang_server_openssl_client_npn_renegotiate() ->
+    [{doc,"Test erlang server with openssl client and npn negotiation with renegotiation"}].
 
-erlang_server_openssl_client_npn_renegotiate(doc) ->
-    ["Test erlang server with openssl client and npn negotiation with renegotiation"];
-erlang_server_openssl_client_npn_renegotiate(suite) ->
-    [];
 erlang_server_openssl_client_npn_renegotiate(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
     start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) ->
         port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-        test_server:sleep(?SLEEP),
+        ct:sleep(?SLEEP),
         port_command(OpensslPort, Data),
         ssl_test_lib:check_result(Server, ok)
     end),
     ok.
 %%--------------------------------------------------------------------------
-
 erlang_client_openssl_server_npn_only_server(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_with_opts(Config, [], "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) ->
+    start_erlang_client_and_openssl_server_with_opts(Config, [],
+						     "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) ->
         port_command(OpensslPort, Data),
         ssl_test_lib:check_result(Server, ok)
     end),
@@ -1165,7 +971,10 @@ erlang_client_openssl_server_npn_only_server(Config) when is_list(Config) ->
 
 erlang_client_openssl_server_npn_only_client(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_with_opts(Config, [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}}], "", Data, fun(Server, OpensslPort) ->
+    start_erlang_client_and_openssl_server_with_opts(Config,
+						     [{client_preferred_next_protocols,
+						       {client, [<<"spdy/2">>], <<"http/1.1">>}}], "",
+						     Data, fun(Server, OpensslPort) ->
         port_command(OpensslPort, Data),
         ssl_test_lib:check_result(Server, ok)
     end),
@@ -1174,7 +983,8 @@ erlang_client_openssl_server_npn_only_client(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------------
 erlang_server_openssl_client_npn_only_server(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_with_opts(Config, [{next_protocols_advertised, [<<"spdy/2">>]}], "", Data, fun(Server, OpensslPort) ->
+    start_erlang_server_and_openssl_client_with_opts(Config, [{next_protocols_advertised, [<<"spdy/2">>]}], "",
+						     Data, fun(Server, OpensslPort) ->
         port_command(OpensslPort, Data),
         ssl_test_lib:check_result(Server, ok)
     end),
@@ -1182,13 +992,94 @@ erlang_server_openssl_client_npn_only_server(Config) when is_list(Config) ->
 
 erlang_server_openssl_client_npn_only_client(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_with_opts(Config, [], "-nextprotoneg spdy/2", Data, fun(Server, OpensslPort) ->
+    start_erlang_server_and_openssl_client_with_opts(Config, [], "-nextprotoneg spdy/2",
+						     Data, fun(Server, OpensslPort) ->
         port_command(OpensslPort, Data),
         ssl_test_lib:check_result(Server, ok)
     end),
     ok.
 
-%%--------------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+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, ClientOpts, ServerOpts) end,
+			Ciphers),
+    case lists:flatten(Result) of
+	[] ->
+	    ok;
+	Error ->
+	    ct:print("Cipher suite errors: ~p~n", [Error]),
+	    ct:fail(cipher_suite_failed_see_test_case_log)
+    end.
+
+cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
+    process_flag(trap_exit, true),
+    ct:print("Testing CipherSuite ~p~n", [CipherSuite]),
+    {ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
+
+    ct:print("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, {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 ->
+	    ct:print("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),
+
+    %% Clean close down!   Server needs to be closed first !!
+    close_port(OpenSslPort),
+    ssl_test_lib:close(Client),
+
+    Return = case Result of
+		 ok ->
+		     [];
+		 Error ->
+		     [{CipherSuite, Error}]
+	     end,
+    process_flag(trap_exit, false),
+    Return.
 
 start_erlang_client_and_openssl_server_with_opts(Config, ErlangClientOpts, OpensslServerOpts, Data, Callback) ->
     process_flag(trap_exit, true),
@@ -1209,7 +1100,7 @@ start_erlang_client_and_openssl_server_with_opts(Config, ErlangClientOpts, Opens
 	integer_to_list(Port) ++  version_flag(Version) ++
 	" -cert " ++ CertFile  ++ " -key " ++ KeyFile,
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
@@ -1248,7 +1139,7 @@ start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, Callbac
     Cmd = "openssl s_server -msg -nextprotoneg http/1.1,spdy/2  -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
     " -cert " ++ CertFile  ++ " -key " ++ KeyFile,
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
@@ -1286,7 +1177,7 @@ start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, Callbac
     Cmd = "openssl s_client -nextprotoneg http/1.0,spdy/2 -msg -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
     " -host localhost",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
@@ -1297,6 +1188,7 @@ start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, Callbac
     close_port(OpenSslPort),
     process_flag(trap_exit, false).
 
+
 start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenSSLClientOpts, Data, Callback) ->
     process_flag(trap_exit, true),
     ServerOpts0 = ?config(server_opts, Config),
@@ -1314,7 +1206,7 @@ start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenS
     Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port)  ++
     " -host localhost",
 
-    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    ct:print("openssl cmd: ~p~n", [Cmd]),
 
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
@@ -1333,7 +1225,7 @@ erlang_ssl_receive_and_assert_npn(Socket, Protocol, Data) ->
     ok.
 
 erlang_ssl_receive(Socket, Data) ->
-    test_server:format("Connection info: ~p~n", 
+    ct:print("Connection info: ~p~n",
 		       [ssl:connection_info(Socket)]),
     receive
 	{ssl, Socket, Data} ->
@@ -1347,15 +1239,15 @@ erlang_ssl_receive(Socket, Data) ->
 	    io:format("openssl ~s~n",[Debug]),
 	    erlang_ssl_receive(Socket,Data);
 	Other ->
-	    test_server:fail({unexpected_message, Other})
+	    ct:fail({unexpected_message, Other})
     after 4000 ->
-	    test_server:fail({did_not_get, Data})
+	    ct:fail({did_not_get, Data})
     end.
  
 connection_info(Socket, Version) ->
     case ssl:connection_info(Socket) of
 	{ok, {Version, _} = Info} ->
-	    test_server:format("Connection info: ~p~n", [Info]),
+	    ct:print("Connection info: ~p~n", [Info]),
 	    ok;
 	{ok, {OtherVersion, _}} ->
 	    {wrong_version, OtherVersion}
@@ -1366,7 +1258,7 @@ connection_info_result(Socket) ->
 
 
 delayed_send(Socket, [ErlData, OpenSslData]) ->
-    test_server:sleep(?SLEEP),
+    ct:sleep(?SLEEP),
     ssl:send(Socket, ErlData),
     erlang_ssl_receive(Socket, OpenSslData).
 
@@ -1418,7 +1310,7 @@ wait_for_openssl_server() ->
 	    %% it will be in accept. Parsing
 	    %% output is too error prone. (Even 
 	    %% more so than sleep!)
-	    test_server:sleep(?SLEEP)
+	    ct:sleep(?SLEEP)
     end.
 
 version_flag(tlsv1) ->
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index adfb29e639..cb73e86ede 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.1.2
+SSL_VSN = 5.2
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index 50f6427eaa..6f1e61e70c 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -101,7 +101,6 @@ XML_REF6_FILES = stdlib_app.xml
 
 XML_PART_FILES = part.xml part_notes.xml part_notes_history.xml
 XML_CHAPTER_FILES = io_protocol.xml unicode_usage.xml notes.xml notes_history.xml
-GIF_FILES = ushell1.gif ushell2.gif ushell3.gif
 
 BOOK_FILES = book.xml
 
@@ -112,8 +111,7 @@ XML_FILES = \
 # ----------------------------------------------------
 
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(GIF_FILES:%.gif=$(HTMLDIR)/%.gif)
+	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
 
 INFO_FILE = ../../info
 
@@ -138,21 +136,16 @@ SPECS_FLAGS = -I../../include -I../../../kernel/include
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
 docs: man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
-html: gifs $(HTML_REF_MAN_FILE)
+html: $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES) $(MAN6_FILES)
 
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
 debug opt: 
 
 clean clean_docs:
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index 386ed89fe1..3e8aba2e5f 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -37,6 +37,18 @@
     <p>The Erlang code preprocessor includes functions which are used
       by <c>compile</c> to preprocess macros and include files before
       the actual parsing takes place.</p>
+    <p>The Erlang source file <marker
+      id="encoding"><em>encoding</em></marker> is selected by a
+      comment in one of the first two lines of the source file. The
+      first string that matches the regular expression
+      <c>coding\s*[:=]\s*([-a-zA-Z0-9])+</c> selects the encoding. If
+      the matching string is not a valid encoding it is ignored. The
+      valid encodings are <c>Latin-1</c> and <c>UTF-8</c> where the
+      case of the characters can be chosen freely. Examples:</p>
+      <pre>
+%% coding: utf-8
+%% For this file we have chosen encoding = Latin-1
+%% -*- coding: latin-1 -*-</pre>
   </description>
   <datatypes>
     <datatype>
@@ -46,6 +58,9 @@
       <name name="epp_handle"></name>
       <desc><p>Handle to the epp server.</p></desc>
     </datatype>
+    <datatype>
+      <name name="source_encoding"></name>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
@@ -83,6 +98,50 @@
       </desc>
     </func>
     <func>
+      <name name="default_encoding" arity="0"/>
+      <fsummary>Return the default encoding of Erlang source files</fsummary>
+      <desc>
+        <p>Returns the default encoding of Erlang source files.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="encoding_to_string" arity="1"/>
+      <fsummary>Return a string representation of an encoding</fsummary>
+      <desc>
+        <p>Returns a string representation of an encoding. The string
+        is recognized by <c>read_encoding/1,2</c> and
+        <c>set_encoding/1</c> as a valid encoding.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="read_encoding" arity="1"/>
+      <name name="read_encoding" arity="2"/>
+      <fsummary>Read the encoding from a file</fsummary>
+      <desc>
+        <p>Read the <seealso marker="#encoding">encoding</seealso> from
+          a file. Returns the read encoding, or <c>none</c> if no
+          valid encoding was found.</p>
+        <p>The option <c>in_comment_only</c> is <c>true</c> by
+          default, which is correct for Erlang source files. If set to
+          <c>false</c> the encoding string does not necessarily have to
+          occur in a comment.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="set_encoding" arity="1"/>
+      <fsummary>Read and set the encoding of an IO device</fsummary>
+      <desc>
+        <p>Reads the <seealso marker="#encoding">encoding</seealso> from
+          an IO device and sets the encoding of the device
+          accordingly. The position of the IO device referenced by
+          <c><anno>File</anno></c> is not affected. If no valid
+          encoding can be read from the IO device the encoding of the
+          IO device is set to the default encoding.</p>
+        <p>Returns the read encoding, or <c>none</c> if no valid
+          encoding was found.</p>
+      </desc>
+    </func>
+    <func>
       <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml
index 57b5828bcd..9ae4f3d91f 100644
--- a/lib/stdlib/doc/src/erl_pp.xml
+++ b/lib/stdlib/doc/src/erl_pp.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -63,6 +63,12 @@
           breaks and only a space is used as a separator.</p>
       </desc>
     </datatype>
+    <datatype>
+      <name name="option"/>
+    </datatype>
+    <datatype>
+      <name name="options"/>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index e6d262466c..22cd45a482 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -28,9 +28,9 @@
     <rev></rev>
   </header>
   <module>io</module>
-  <modulesummary>Standard IO Server Interface Functions</modulesummary>
+  <modulesummary>Standard I/O Server Interface Functions</modulesummary>
   <description>
-    <p>This module provides an interface to standard Erlang IO servers.
+    <p>This module provides an interface to standard Erlang I/O servers.
       The output functions all return <c>ok</c> if they are successful,
       or exit if they are not.</p>
     <p>In the following description, all functions have an optional
@@ -38,17 +38,16 @@
       process which handles the IO protocols. Normally, it is the
       <c>IoDevice</c> returned by
       <seealso marker="kernel:file#open/2">file:open/2</seealso>.</p>
-    <p>For a description of the IO protocols refer to the STDLIB Users Guide.</p>
+    <p>For a description of the IO protocols refer to the <seealso marker="io_protocol">STDLIB User's Guide</seealso>.</p>
     <warning>
 
     <p>As of R13A, data supplied to the <seealso
     marker="#put_chars/2">put_chars</seealso> function should be in the
     <seealso marker="unicode#type-chardata"><c>unicode:chardata()</c></seealso> format. This means that programs
     supplying binaries to this function need to convert them to UTF-8
-    before trying to output the data on an
-    <c>io_device()</c>.</p>
+    before trying to output the data on an IO device.</p>
 
-    <p>If an io_device() is set in binary mode, the functions <seealso
+    <p>If an IO device is set in binary mode, the functions <seealso
     marker="#get_chars/3">get_chars</seealso> and <seealso
     marker="#get_line/2">get_line</seealso> may return binaries
     instead of lists. The binaries will, as of R13A, be encoded in
@@ -68,9 +67,9 @@
     <datatype>
       <name name="device"/>
       <desc>
-        <p>Either <c>standard_io</c>, <c>standard_error</c>, a
+        <p>An IO device. Either <c>standard_io</c>, <c>standard_error</c>, a
           registered name, or a pid handling IO protocols (returned from
-            <seealso marker="kernel:file#open/2">file:open/2</seealso>).</p>
+          <seealso marker="kernel:file#open/2">file:open/2</seealso>).</p>
       </desc>
     </datatype>
     <datatype>
@@ -89,17 +88,14 @@
       <name name="format"/>
     </datatype>
     <datatype>
-      <name name="line"/>
+      <name name="location"/>
     </datatype>
     <datatype>
       <name name="prompt"/>
     </datatype>
     <datatype>
-      <name name="request_error"/>
-    </datatype>
-    <datatype>
-      <name name="error_description"/>
-      <desc><p>Whatever the I/O-server sends.</p></desc>
+      <name name="server_no_data"/>
+      <desc><p>What the I/O-server sends when there is no data.</p></desc>
     </datatype>
   </datatypes>
 
@@ -107,11 +103,11 @@
     <func>
       <name name="columns" arity="0"/>
       <name name="columns" arity="1"/>
-      <fsummary>Get the number of columns of a device</fsummary>
+      <fsummary>Get the number of columns of an IO device</fsummary>
       <desc>
           <p>Retrieves the number of columns of the 
           <c><anno>IoDevice</anno></c> (i.e. the width of a terminal). The function
-          only succeeds for terminal devices, for all other devices
+          only succeeds for terminal devices, for all other IO devices
           the function returns <c>{error, enotsup}</c></p>
       </desc>
     </func>
@@ -120,7 +116,7 @@
       <name name="put_chars" arity="2"/>
       <fsummary>Write a list of characters</fsummary>
       <desc>
-        <p>Writes the characters of <c><anno>CharData</anno></c> to the io_server()
+        <p>Writes the characters of <c><anno>CharData</anno></c> to the I/O server
           (<c><anno>IoDevice</anno></c>).</p>
       </desc>
     </func>
@@ -135,6 +131,7 @@
     <func>
       <name name="get_chars" arity="2"/>
       <name name="get_chars" arity="3"/>
+      <type name="server_no_data"/>
       <fsummary>Read a specified number of characters</fsummary>
       <desc>
         <p>Reads <c><anno>Count</anno></c> characters from standard input
@@ -143,19 +140,19 @@
         <taglist>
           <tag><c><anno>Data</anno></c></tag>
           <item>
-            <p>The input characters. If the device supports Unicode,
+            <p>The input characters. If the IO device supports Unicode,
             the data may represent codepoints larger than 255 (the
-            latin1 range). If the io_server() is set to deliver
+            latin1 range). If the I/O server is set to deliver
             binaries, they will be encoded in UTF-8 (regardless of if
-            the device actually supports Unicode or not).</p>
+            the IO device actually supports Unicode or not).</p>
           </item>
           <tag><c>eof</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-	  <tag><c>{error,<anno>Reason</anno>}</c></tag>
+	  <tag><c>{error, <anno>ErrorDescription</anno>}</c></tag>
 	  <item>
-	    <p>Other (rare) error condition, for instance <c>{error,estale}</c>
+	    <p>Other (rare) error condition, for instance <c>{error, estale}</c>
 	    if reading from an NFS file system.</p>
 	  </item>
         </taglist>
@@ -164,6 +161,7 @@
     <func>
       <name name="get_line" arity="1"/>
       <name name="get_line" arity="2"/>
+      <type name="server_no_data"/>
       <fsummary>Read a line</fsummary>
       <desc>
         <p>Reads a line from the standard input (<c><anno>IoDevice</anno></c>),
@@ -172,19 +170,19 @@
           <tag><c><anno>Data</anno></c></tag>
           <item>
             <p>The characters in the line terminated by a LF (or end of
-              file). If the device supports Unicode,
+              file). If the IO device supports Unicode,
             the data  may represent codepoints larger than 255 (the
-            latin1 range). If the io_server() is set to deliver
+            latin1 range). If the I/O server is set to deliver
             binaries, they will be encoded in UTF-8 (regardless of if
-            the device actually supports Unicode or not).</p>
+            the IO device actually supports Unicode or not).</p>
           </item>
           <tag><c>eof</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-	  <tag><c>{error,<anno>Reason</anno>}</c></tag>
+	  <tag><c>{error, <anno>ErrorDescription</anno>}</c></tag>
 	  <item>
-	    <p>Other (rare) error condition, for instance <c>{error,estale}</c>
+	    <p>Other (rare) error condition, for instance <c>{error, estale}</c>
 	    if reading from an NFS file system.</p>
 	  </item>
         </taglist>
@@ -195,7 +193,7 @@
       <name name="getopts" arity="1"/>
       <fsummary>Get the supported options and values from an I/O-server</fsummary>
       <desc>
-      <p>This function requests all available options and their current values for a specific io_device(). Example:</p>
+      <p>This function requests all available options and their current values for a specific IO device. Example:</p>
 <pre>
 1> <input>{ok,F} = file:open("/dev/null",[read]).</input>
 {ok,&lt;0.42.0&gt;}
@@ -217,30 +215,30 @@
       <name name="setopts" arity="2"/>
       <fsummary>Set options</fsummary>
       <desc>
-        <p>Set options for the io_device() (<c><anno>IoDevice</anno></c>).</p>
+        <p>Set options for the standard IO device (<c><anno>IoDevice</anno></c>).</p>
 
         <p>Possible options and values vary depending on the actual
-        io_device(). For a list of supported options and their current values
-        on a specific device, use the <seealso
+        IO device. For a list of supported options and their current values
+        on a specific IO device, use the <seealso
         marker="#getopts/1">getopts/1</seealso> function.</p>
 
-	<p>The options and values supported by the current OTP io_devices are:</p>
+	<p>The options and values supported by the current OTP IO devices are:</p>
         <taglist>
           <tag><c>binary, list or {binary, boolean()}</c></tag>
           <item>
-            <p>If set in binary mode (binary or {binary,true}), the io_server() sends binary data (encoded in UTF-8) as answers to the get_line, get_chars and, if possible, get_until requests (see the I/O protocol description in STDLIB User's Guide for details). The immediate effect is that <c>get_chars/2,3</c> and <c>get_line/1,2</c> return UTF-8 binaries instead of lists of chars for the affected device.</p>
-	    <p>By default, all io_devices in OTP are set in list mode, but the io functions can handle any of these modes and so should other, user written, modules behaving as clients to I/O-servers.</p>
-	    <p>This option is supported by the standard shell (group.erl), the 'oldshell' (user.erl) and the file I/O servers.</p>
+            <p>If set in binary mode (<c>binary</c> or <c>{binary, true}</c>), the I/O server sends binary data (encoded in UTF-8) as answers to the <c>get_line</c>, <c>get_chars</c> and, if possible, <c>get_until</c> requests (see the I/O protocol description in <seealso marker="io_protocol">STDLIB User's Guide</seealso> for details). The immediate effect is that <c>get_chars/2,3</c> and <c>get_line/1,2</c> return UTF-8 binaries instead of lists of chars for the affected IO device.</p>
+	    <p>By default, all IO devices in OTP are set in list mode, but the I/O functions can handle any of these modes and so should other, user written, modules behaving as clients to I/O-servers.</p>
+	    <p>This option is supported by the standard shell (<c>group.erl</c>), the 'oldshell' (<c>user.erl</c>) and the file I/O servers.</p>
           </item>
           <tag><c>{echo, boolean()}</c></tag>
 	  <item>
-	  <p>Denotes if the terminal should echo input. Only supported for the standard shell I/O-server (group.erl)</p>
+	  <p>Denotes if the terminal should echo input. Only supported for the standard shell I/O-server (<c>group.erl</c>)</p>
 	  </item>
           <tag><c>{expand_fun, expand_fun()}</c></tag>
           <item>
             <p>Provide a function for tab-completion (expansion)
-              like the erlang shell. This function is called
-              when the user presses the Tab key. The expansion is
+              like the Erlang shell. This function is called
+              when the user presses the TAB key. The expansion is
               active when calling line-reading functions such as
               <c>get_line/1,2</c>.</p>
             <p>The function is called with the current line, upto
@@ -253,25 +251,25 @@
               will be printed and the current input line will be written
               once again.</p>
             <p>Trivial example (beep on anything except empty line, which
-              is expanded to "quit"):</p>
+              is expanded to <c>"quit"</c>):</p>
             <code type="none">
  fun("") -> {yes, "quit", []};
     (_) -> {no, "", ["quit"]} end</code>
-            <p>This option is supported by the standard shell only (group.erl).</p>
+            <p>This option is supported by the standard shell only (<c>group.erl</c>).</p>
           </item>
           <tag><c>{encoding, latin1 | unicode}</c></tag>
 	  <item>
-	  <p>Specifies how characters are input or output from or to the actual device, implying that i.e. a terminal is set to handle Unicode input and output or a file is set to handle UTF-8 data encoding.</p>
-	  <p>The option <em>does not</em> affect how data is returned from the io-functions or how it is sent in the I/O-protocol, it only affects how the io_device() is to handle Unicode characters towards the &quot;physical&quot; device.</p>
-	  <p>The standard shell will be set for either unicode or latin1 encoding when the system is started. The actual encoding is set with the help of the "LANG" or "LC_CTYPE" environment variables on Unix-like system or by other means on other systems. The bottom line is that the user can input Unicode characters and the device will be in {encoding, unicode} mode if the device supports it. The mode can be changed, if the assumption of the runtime system is wrong, by setting this option.</p>
-	  <p>The io_device() used when Erlang is started with the "-oldshell" or "-noshell" flags is by default set to latin1 encoding, meaning that any characters beyond codepoint 255 will be escaped and that input is expected to be plain 8-bit ISO-latin-1. If the encoding is changed to Unicode, input and output from the standard file descriptors will be in UTF-8 (regardless of operating system).</p>
-	  <p>Files can also be set in {encoding, unicode}, meaning that data is written and read as UTF-8. More encodings are possible for files, see below.</p>
-	  <p>{encoding, unicode | latin1} is supported by both the standard shell (group.erl including werl on windows), the 'oldshell' (user.erl) and the file I/O servers.</p>
+	  <p>Specifies how characters are input or output from or to the actual IO device, implying that i.e. a terminal is set to handle Unicode input and output or a file is set to handle UTF-8 data encoding.</p>
+	  <p>The option <em>does not</em> affect how data is returned from the I/O functions or how it is sent in the I/O-protocol, it only affects how the IO device is to handle Unicode characters towards the &quot;physical&quot; device.</p>
+	  <p>The standard shell will be set for either Unicode or latin1 encoding when the system is started. The actual encoding is set with the help of the <c>LANG</c> or <c>LC_CTYPE</c> environment variables on Unix-like system or by other means on other systems. The bottom line is that the user can input Unicode characters and the IO device will be in <c>{encoding, unicode}</c> mode if the IO device supports it. The mode can be changed, if the assumption of the runtime system is wrong, by setting this option.</p>
+	  <p>The IO device used when Erlang is started with the "-oldshell" or "-noshell" flags is by default set to latin1 encoding, meaning that any characters beyond codepoint 255 will be escaped and that input is expected to be plain 8-bit ISO-latin-1. If the encoding is changed to Unicode, input and output from the standard file descriptors will be in UTF-8 (regardless of operating system).</p>
+	  <p>Files can also be set in <c>{encoding, unicode}</c>, meaning that data is written and read as UTF-8. More encodings are possible for files, see below.</p>
+	  <p><c>{encoding, unicode | latin1}</c> is supported by both the standard shell (<c>group.erl</c> including <c>werl</c> on Windows&reg;), the 'oldshell' (<c>user.erl</c>) and the file I/O servers.</p>
  	  </item>
           <tag><c>{encoding, utf8 | utf16 | utf32 | {utf16,big} | {utf16,little} | {utf32,big} | {utf32,little}}</c></tag>
 	  <item>
 	  <p>For disk files, the encoding can be set to various UTF variants. This will have the effect that data is expected to be read as the specified encoding from the file and the data will be written in the specified encoding to the disk file.</p>
-	  <p>{encoding, utf8} will have the same effect as {encoding,unicode} on files.</p>
+	  <p><c>{encoding, utf8}</c> will have the same effect as <c>{encoding, unicode}</c> on files.</p>
 	  <p>The extended encodings are only supported on disk files (opened by the <seealso marker="kernel:file#open/2">file:open/2</seealso> function)</p>
  	  </item>
         </taglist>
@@ -289,6 +287,7 @@
     <func>
       <name name="read" arity="1"/>
       <name name="read" arity="2"/>
+      <type name="server_no_data"/>
       <fsummary>Read a term</fsummary>
       <desc>
         <p>Reads a term <c><anno>Term</anno></c> from the standard input
@@ -312,21 +311,25 @@
     </func>
     <func>
       <name name="read" arity="3"/>
+      <name name="read" arity="4"/>
+      <type name="server_no_data"/>
       <fsummary>Read a term</fsummary>
       <desc>
         <p>Reads a term <c><anno>Term</anno></c> from <c><anno>IoDevice</anno></c>, prompting it
-          with <c><anno>Prompt</anno></c>. Reading starts at line number
-          <c><anno>StartLine</anno></c>. It returns:</p>
+          with <c><anno>Prompt</anno></c>. Reading starts at location
+          <c><anno>StartLocation</anno></c>. The argument
+          <c><anno>Options</anno></c> is passed on as the <c>Options</c>
+          argument of the <c>erl_scan:tokens/4</c> function. It returns:</p>
         <taglist>
-          <tag><c>{ok, Term, <anno>EndLine</anno>}</c></tag>
+          <tag><c>{ok, Term, <anno>EndLocation</anno>}</c></tag>
           <item>
             <p>The parsing was successful.</p>
           </item>
-          <tag><c>{eof, <anno>EndLine</anno>}</c></tag>
+          <tag><c>{eof, <anno>EndLocation</anno>}</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, <anno>ErrorInfo</anno>, <anno>ErrorLine</anno>}</c></tag>
+          <tag><c>{error, <anno>ErrorInfo</anno>, <anno>ErrorLocation</anno>}</c></tag>
           <item>
             <p>The parsing failed.</p>
           </item>
@@ -377,7 +380,7 @@ ok</pre>
           applicable, it is used for both the field width and precision.
           The default padding character is <c>' '</c> (space).</p>
         <p><c>Mod</c> is the control sequence modifier. It is either a
-	single character (currently only 't', for unicode translation,
+	single character (currently only <c>t</c>, for Unicode translation,
 	is supported) that changes the interpretation of Data.</p>
 
          <p>The following control sequences are available:</p>
@@ -397,9 +400,9 @@ ok</pre>
 2> <input>io:fwrite("|~10.5c|~-10.5c|~5c|~n", [$a, $b, $c]).</input>
 |     aaaaa|bbbbb     |ccccc|
 ok</pre>
-            <p>If the Unicode translation modifier ('t') is in effect,
+            <p>If the Unicode translation modifier (<c>t</c>) is in effect,
 	    the integer argument can be any number representing a
-	    valid unicode codepoint, otherwise it should be an integer
+	    valid Unicode codepoint, otherwise it should be an integer
 	    less than or equal to 255, otherwise it is masked with 16#FF:</p>
 <pre>
 1> <input>io:fwrite("~tc~n",[1024]).</input>
@@ -439,7 +442,7 @@ ok</pre>
           <item>
             <p>Prints the argument with the <c>string</c> syntax. The
               argument is, if no Unicode translation modifier is present, an 
-              iolist(), a binary, or an atom. If the Unicode translation modifier ('t') is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
+              iolist(), a binary, or an atom. If the Unicode translation modifier (<c>t</c>) is in effect, the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters
               are printed without quotes. The string is first truncated
 	      by the given precision and then padded and justified
 	      to the given field width. The default precision is the field width.</p>
@@ -476,8 +479,10 @@ ok
             <p>Writes the data with standard syntax in the same way as
               <c>~w</c>, but breaks terms whose printed representation
               is longer than one line into many lines and indents each
-              line sensibly. It also tries to detect lists of printable
-              characters and to output these as strings. For example:</p>
+              line sensibly. It also tries to detect lists of
+              printable characters and to output these as strings. The
+              Unicode translation modifier is used for determining
+              what characters are printable. For example:</p>
             <pre>
 5> <input>T = [{attributes,[[{id,age,1.50000},{mode,explicit},</input>
 <input>{typename,"INTEGER"}], [{id,cho},{mode,explicit},{typename,'Cho'}]]},</input>
@@ -516,6 +521,19 @@ Here T = [{attributes,[[{id,age,1.5},
           {tag,{'PRIVATE',3}},
           {mode,implicit}]
 ok</pre>
+            <p>Binaries that look like UTF-8 encoded strings will be
+              output with the string syntax if the Unicode translation
+              modifier is given:</p>
+            <pre>
+9> <input>io:fwrite("~p~n",[[1024]]).</input>
+[1024]
+10> <input>io:fwrite("~tp~n",[[1024]]).</input>
+"\x{400}"
+11> <input>io:fwrite("~tp~n", [&lt;&lt;128,128&gt;&gt;]).</input>
+&lt;&lt;128,128&gt;&gt;
+12> <input>io:fwrite("~tp~n", [&lt;&lt;208,128&gt;&gt;]).</input>
+&lt;&lt;"\x{400}"/utf8&gt;&gt;
+ok</pre>
           </item>
           <tag><c>W</c></tag>
           <item>
@@ -583,7 +601,7 @@ ok</pre>
           <tag><c>#</c></tag>
           <item>
             <p>Like <c>B</c>, but prints the number with an Erlang style
-              '#'-separated base prefix.</p>
+              <c>#</c>-separated base prefix.</p>
             <pre>
 16> <input>io:fwrite("~.10#~n", [31]).</input>
 10#31
@@ -633,13 +651,14 @@ ok
                             {shell,eval_loop,3}]}
      in function  io:o_request/2</pre>
         <p>In this example, an attempt was made to output the single
-          character '65' with the aid of the string formatting directive
+          character 65 with the aid of the string formatting directive
           "~s".</p>
       </desc>
     </func>
     <func>
       <name name="fread" arity="2"/>
       <name name="fread" arity="3"/>
+      <type name="server_no_data"/>
       <fsummary>Read formatted input</fsummary>
       <desc>
         <p>Reads characters from the standard input (<c><anno>IoDevice</anno></c>),
@@ -664,7 +683,7 @@ ok
               return suppression character. It provides a method to
               specify a field which is to be omitted. <c>F</c> is the
               <c>field width</c> of the input field, <c>M</c> is an optional
-              translation modifier (of which 't' is the only currently
+              translation modifier (of which <c>t</c> is the only currently
               supported, meaning Unicode translation) and <c>C</c>
               determines the type of control sequence.</p>
 
@@ -690,8 +709,8 @@ ok
               <tag><c>-</c></tag>
               <item>
                 <p>An optional sign character is expected. A sign
-                  character '-' gives the return value <c>-1</c>. Sign
-                  character '+' or none gives <c>1</c>. The field width
+                  character <c>-</c> gives the return value <c>-1</c>. Sign
+                  character <c>+</c> or none gives <c>1</c>. The field width
                   parameter is ignored. Leading white-space characters
                   are not skipped.</p>
               </item>
@@ -713,7 +732,7 @@ ok
                   characters are stripped. An Erlang string (list of
                   characters) is returned.</p>
 
-		  <p>If Unicode translation is in effect (~ts),
+		  <p>If Unicode translation is in effect (<c>~ts</c>),
 		  characters larger than 255 are accepted, otherwise
 		  not. With the translation modifier, the list
 		  returned may as a consequence also contain
@@ -769,10 +788,15 @@ Prompt> <input>&lt;Character beyond latin1 range not printable in this medium&gt
               <item>
                 <p>End of file was encountered.</p>
               </item>
-              <tag><c>{error, <anno>What</anno>}</c></tag>
+              <tag><c>{error, <anno>FreadError</anno>}</c></tag>
+              <item>
+                <p>The reading failed and <c>FreadError</c> gives a
+                  hint about the error.</p>
+              </item>
+              <tag><c>{error, <anno>ErrorDescription</anno>}</c></tag>
               <item>
                 <p>The read operation failed and the parameter
-                  <c><anno>What</anno></c> gives a hint about the error.</p>
+                  <c><anno>ErrorDescription</anno></c> gives a hint about the error.</p>
               </item>
             </taglist>
           </item>
@@ -793,11 +817,11 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
     <func>
       <name name="rows" arity="0"/>
       <name name="rows" arity="1"/>
-      <fsummary>Get the number of rows of a device</fsummary>
+      <fsummary>Get the number of rows of an IO device</fsummary>
       <desc>
           <p>Retrieves the number of rows of the 
           <c><anno>IoDevice</anno></c> (i.e. the height of a terminal). The function
-          only succeeds for terminal devices, for all other devices
+          only succeeds for terminal devices, for all other IO devices
           the function returns <c>{error, enotsup}</c></p>
       </desc>
     </func>
@@ -805,23 +829,28 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
       <name name="scan_erl_exprs" arity="1"/>
       <name name="scan_erl_exprs" arity="2"/>
       <name name="scan_erl_exprs" arity="3"/>
+      <name name="scan_erl_exprs" arity="4"/>
+      <type name="server_no_data"/>
       <fsummary>Read and tokenize Erlang expressions</fsummary>
       <desc>
         <p>Reads data from the standard input (<c>IoDevice</c>),
-          prompting it with <c>Prompt</c>. Reading starts at line number
-          <c>StartLine</c> (1). The data is tokenized as if it were a
-          sequence of Erlang expressions until a final <c>'.'</c> is
+          prompting it with <c>Prompt</c>. Reading starts at location
+          <c>StartLocation</c> (<c>1</c>). The argument <c><anno>Options</anno></c>
+          is passed on as the <c>Options</c> argument of the
+          <c>erl_scan:tokens/4</c> function. The data is tokenized as if
+          it were a
+          sequence of Erlang expressions until a final dot (<c>.</c>) is
           reached. This token is also returned. It returns:</p>
         <taglist>
-          <tag><c>{ok, Tokens, EndLine}</c></tag>
+          <tag><c>{ok, Tokens, EndLocation}</c></tag>
           <item>
             <p>The tokenization succeeded.</p>
           </item>
-          <tag><c>{eof, EndLine}</c></tag>
+          <tag><c>{eof, EndLocation}</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, ErrorLine}</c></tag>
+          <tag><c>{error, ErrorInfo, ErrorLocation}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -840,13 +869,18 @@ enter><input>1.0er.</input>
       <name name="scan_erl_form" arity="1"/>
       <name name="scan_erl_form" arity="2"/>
       <name name="scan_erl_form" arity="3"/>
+      <name name="scan_erl_form" arity="4"/>
+      <type name="server_no_data"/>
       <fsummary>Read and tokenize an Erlang form</fsummary>
       <desc>
         <p>Reads data from the standard input (<c><anno>IoDevice</anno></c>),
-          prompting it with <c><anno>Prompt</anno></c>. Starts reading at line number
-          <c><anno>StartLine</anno></c> (1). The data is tokenized as if it were an
+          prompting it with <c><anno>Prompt</anno></c>. Starts reading
+          at location <c><anno>StartLocation</anno></c> (<c>1</c>). The
+          argument <c><anno>Options</anno></c> is passed on as the
+          <c>Options</c> argument of the <c>erl_scan:tokens/4</c>
+          function. The data is tokenized as if it were an
           Erlang form - one of the valid Erlang expressions in an
-          Erlang source file - until a final <c>'.'</c> is reached.
+          Erlang source file - until a final dot (<c>.</c>) is reached.
           This last token is also returned. The return values are the
           same as for <c>scan_erl_exprs/1,2,3</c> above.</p>
       </desc>
@@ -855,24 +889,30 @@ enter><input>1.0er.</input>
       <name name="parse_erl_exprs" arity="1"/>
       <name name="parse_erl_exprs" arity="2"/>
       <name name="parse_erl_exprs" arity="3"/>
+      <name name="parse_erl_exprs" arity="4"/>
       <type name="parse_ret"/>
+      <type name="server_no_data"/>
       <fsummary>Read, tokenize and parse Erlang expressions</fsummary>
       <desc>
-        <p>Reads data from the standard input (<c><anno>IoDevice</anno></c>),
-          prompting it with <c><anno>Prompt</anno></c>. Starts reading at line number
-          <c><anno>StartLine</anno></c> (1). The data is tokenized and parsed as if
-          it were a sequence of Erlang expressions until a final '.' is
-          reached. It returns:</p>
+        <p>Reads data from the standard input
+          (<c><anno>IoDevice</anno></c>), prompting it with
+          <c><anno>Prompt</anno></c>. Starts reading at location
+          <c><anno>StartLocation</anno></c> (<c>1</c>). The argument
+          <c><anno>Options</anno></c> is passed on as the
+          <c>Options</c> argument of the <c>erl_scan:tokens/4</c>
+          function. The data is tokenized and parsed as if it were a
+          sequence of Erlang expressions until a final dot (<c>.</c>) is reached.
+          It returns:</p>
         <taglist>
-          <tag><c>{ok, ExprList, EndLine}</c></tag>
+          <tag><c>{ok, ExprList, EndLocation}</c></tag>
           <item>
             <p>The parsing was successful.</p>
           </item>
-          <tag><c>{eof, EndLine}</c></tag>
+          <tag><c>{eof, EndLocation}</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, ErrorLine}</c></tag>
+          <tag><c>{error, ErrorInfo, ErrorLocation}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -891,25 +931,30 @@ enter><input>abc("hey".</input>
       <name name="parse_erl_form" arity="1"/>
       <name name="parse_erl_form" arity="2"/>
       <name name="parse_erl_form" arity="3"/>
+      <name name="parse_erl_form" arity="4"/>
       <type name="parse_form_ret"/>
+      <type name="server_no_data"/>
       <fsummary>Read, tokenize and parse an Erlang form</fsummary>
       <desc>
         <p>Reads data from the standard input (<c><anno>IoDevice</anno></c>),
-          prompting it with <c><anno>Prompt</anno></c>. Starts reading at line number
-          <c><anno>StartLine</anno></c> (1). The data is tokenized and parsed as if
+          prompting it with <c><anno>Prompt</anno></c>. Starts reading at
+          location <c><anno>StartLocation</anno></c> (<c>1</c>). The argument
+          <c><anno>Options</anno></c> is passed on as the
+          <c>Options</c> argument of the <c>erl_scan:tokens/4</c>
+          function. The data is tokenized and parsed as if
           it were an Erlang form - one of the valid Erlang expressions
-          in an Erlang source file - until a final '.' is reached. It
+          in an Erlang source file - until a final dot (<c>.</c>) is reached. It
           returns:</p>
         <taglist>
-          <tag><c>{ok, AbsForm, EndLine}</c></tag>
+          <tag><c>{ok, AbsForm, EndLocation}</c></tag>
           <item>
             <p>The parsing was successful.</p>
           </item>
-          <tag><c>{eof, EndLine}</c></tag>
+          <tag><c>{eof, EndLocation}</c></tag>
           <item>
             <p>End of file was encountered.</p>
           </item>
-          <tag><c>{error, ErrorInfo, ErrorLine}</c></tag>
+          <tag><c>{error, ErrorInfo, ErrorLocation}</c></tag>
           <item>
             <p>An error occurred.</p>
           </item>
@@ -940,7 +985,7 @@ enter><input>bar.</input>
   </section>
  <section>
     <title>Standard Error</title>
-    <p>In certain situations, especially when the standard output is redirected, access to an io_server() specific for error messages might be convenient. The io_device 'standard_error' can be used to direct output to whatever the current operating system considers a suitable device for error output. Example on a Unix-like operating system:</p>
+    <p>In certain situations, especially when the standard output is redirected, access to an I/O-server specific for error messages might be convenient. The IO device <c>standard_error</c> can be used to direct output to whatever the current operating system considers a suitable IO device for error output. Example on a Unix-like operating system:</p>
 <pre>
 $ <input>erl -noshell -noinput -eval 'io:format(standard_error,"Error: ~s~n",["error 11"]),'\</input>
 <input>'init:stop().' > /dev/null</input>
@@ -956,7 +1001,7 @@ Error: error 11</pre>
       <c>ErrorInfo</c> structure which is returned from all IO modules.
       It has the format:</p>
     <code type="none">
-{ErrorLine, Module, ErrorDescriptor}</code>
+{ErrorLocation, Module, ErrorDescriptor}</code>
     <p>A string which describes the error is obtained with the following
       call:</p>
     <code type="none">
diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index 506c1792f1..617a6b74fc 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -43,6 +43,12 @@
       <name name="chars"/>
     </datatype>
     <datatype>
+      <name name="unicode_chars"/>
+    </datatype>
+    <datatype>
+      <name name="unicode_string"/>
+    </datatype>
+    <datatype>
       <name name="continuation"/>
       <desc><p>A continuation as returned by <seealso marker="#fread/3"><c>fread/3</c></seealso>.</p>
       </desc>
@@ -50,6 +56,9 @@
     <datatype>
       <name name="depth"/>
     </datatype>
+    <datatype>
+      <name name="fread_error"/>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
@@ -209,6 +218,23 @@
       </desc>
     </func>
     <func>
+      <name name="write_unicode_string" arity="1"/>
+      <fsummary>Write a Unicode string</fsummary>
+      <desc>
+        <p>Returns the list of characters needed to print
+          <c><anno>UnicodeString</anno></c> as a string.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="write_unicode_string_as_latin1" arity="1"/>
+      <fsummary>Write a Unicode string</fsummary>
+      <desc>
+        <p>Returns the list of characters needed to print
+          <c><anno>UnicodeString</anno></c> as a string. Non-Latin-1
+          characters are escaped.</p>
+      </desc>
+    </func>
+    <func>
       <name name="write_char" arity="1"/>
       <fsummary>Write a character</fsummary>
       <desc>
@@ -217,6 +243,23 @@
       </desc>
     </func>
     <func>
+      <name name="write_unicode_char" arity="1"/>
+      <fsummary>Write a Unicode character</fsummary>
+      <desc>
+        <p>Returns the list of characters needed to print a character
+          constant in the Unicode character set.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="write_unicode_char_as_latin1" arity="1"/>
+      <fsummary>Write a Unicode character</fsummary>
+      <desc>
+        <p>Returns the list of characters needed to print a character
+          constant in the Unicode character set. Non-Latin-1 characters
+          are escaped.</p>
+      </desc>
+    </func>
+    <func>
       <name name="indentation" arity="2"/>
       <fsummary>Indentation after printing string</fsummary>
       <desc>
@@ -233,6 +276,14 @@
       </desc>
     </func>
     <func>
+      <name name="unicode_char_list" arity="1"/>
+      <fsummary>Test for a list of Unicode characters</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
+          characters in the Unicode range, otherwise it returns <c>false</c>.</p>
+      </desc>
+    </func>
+    <func>
       <name name="deep_char_list" arity="1"/>
       <fsummary>Test for a deep list of characters</fsummary>
       <desc>
@@ -241,6 +292,14 @@
       </desc>
     </func>
     <func>
+      <name name="deep_unicode_char_list" arity="1"/>
+      <fsummary>Test for a deep list of Unicode characters</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a, possibly deep, list
+          of characters in the Unicode range, otherwise it returns <c>false</c>.</p>
+      </desc>
+    </func>
+    <func>
       <name name="printable_list" arity="1"/>
       <fsummary>Test for a list of printable ISO-latin-1 characters</fsummary>
       <desc>
@@ -248,6 +307,14 @@
           printable ISO-latin-1 characters, otherwise it returns <c>false</c>.</p>
       </desc>
     </func>
+    <func>
+      <name name="printable_unicode_list" arity="1"/>
+      <fsummary>Test for a list of printable Unicode characters</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
+          printable Unicode characters, otherwise it returns <c>false</c>.</p>
+      </desc>
+    </func>
   </funcs>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml
index 0ff3d5c1ee..d36bf2042f 100644
--- a/lib/stdlib/doc/src/io_protocol.xml
+++ b/lib/stdlib/doc/src/io_protocol.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,10 +35,10 @@
 
 
 <p>The I/O-protocol in Erlang specifies a way for a client to communicate
-with an io_server and vice versa. The io_server is a process handling the
-requests and that performs the requested task on i.e. a device. The
+with an I/O server and vice versa. The I/O server is a process that handles
+the requests and performs the requested task on e.g. an IO device. The
 client is any Erlang process wishing to read or write data from/to the
-device.</p> 
+IO device.</p> 
 
 <p>The common I/O-protocol has been present in OTP since the
 beginning, but has been fairly undocumented and has also somewhat
@@ -53,85 +53,85 @@ implement than the original. It can certainly be argumented that the
 current protocol is too complex, but this text describes how it looks
 today, not how it should have looked.</p>
 
-<p>The basic ideas from the original protocol still hold. The io_server
+<p>The basic ideas from the original protocol still hold. The I/O server
 and client communicate with one single, rather simplistic protocol and
-no server state is ever present in the client. Any io_server can be
+no server state is ever present in the client. Any I/O server can be
 used together with any client code and client code need not be aware
-of the actual device the io_server communicates with.</p>
+of the actual IO device the I/O server communicates with.</p>
 
 <section>
-<title>Protocol basics</title>
+<title>Protocol Basics</title>
 
-<p>As described in Robert's paper, servers and clients communicate using
-io_request/io_reply tuples as follows:</p>
+<p>As described in Robert's paper, I/O servers and clients communicate using
+<c>io_request</c>/<c>io_reply</c> tuples as follows:</p>
 
 <p><em>{io_request, From, ReplyAs, Request}</em><br/>
 <em>{io_reply, ReplyAs, Reply}</em></p>
 
-<p>The client sends an io_request to the io_server and the server
-eventually sends a corresponding reply.</p>
+<p>The client sends an <c>io_request</c> tuple to the I/O server and
+the server eventually sends a corresponding <c>io_reply</c> tuple.</p>
 
 <list type="bulleted">
-<item>From is the pid() of the client, the process which the io_server
-sends the reply to.</item>
-
-<item>ReplyAs can be any datum and is simply returned in the corresponding
-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 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
-process, not necessarily the actual io_server. The ReplyAs element is
-the only thing that connects one io_request with an io_reply.</item>
-
-<item>Request and Reply are described below.</item>
+<item><c>From</c> is the <c>pid()</c> of the client, the process which
+the I/O server sends the IO reply to.</item>
+
+<item><c>ReplyAs</c> can be any datum and is returned in the corresponding
+<c>io_reply</c>. The <seealso marker="stdlib:io">io</seealso> module simply uses the pid()
+of the I/O server as the <c>ReplyAs</c> datum, but a more complicated client
+could have several outstanding I/O requests to the same I/O server and
+would then use i.e. a <c>reference()</c> or something else to differentiate among
+the incoming IO replies. The <c>ReplyAs</c> element should be considered
+opaque by the I/O server. Note that the <c>pid()</c> of the I/O server is not
+explicitly present in the <c>io_reply</c> tuple. The reply can be sent from any
+process, not necessarily the actual I/O server. The <c>ReplyAs</c> element is
+the only thing that connects one I/O request with an I/O-reply.</item>
+
+<item><c>Request</c> and <c>Reply</c> are described below.</item>
 </list>
 
-<p>When an io_server receives an io_request, it acts upon the actual
-Request part and eventually sends an io_reply with the corresponding
-Reply part.</p> 
+<p>When an I/O server receives an <c>io_request</c> tuple, it acts upon the actual
+<c>Request</c> part and eventually sends an <c>io_reply</c> tuple with the corresponding
+<c>Reply</c> part.</p> 
 </section>
 <section>
-<title>Output requests</title>
+<title>Output Requests</title>
 
-<p>To output characters on a device, the following Requests exist:</p>
+<p>To output characters on an IO device, the following <c>Request</c>s exist:</p>
 
 <p>
 <em>{put_chars, Encoding, Characters}</em><br/>
 <em>{put_chars, Encoding, Module, Function, Args}</em>
 </p>
 <list type="bulleted">
-<item>Encoding is either 'unicode' or 'latin1', meaning that the
+<item><c>Encoding</c> is either <c>unicode</c> or <c>latin1</c>, meaning that the
   characters are (in case of binaries) encoded as either UTF-8 or
-  iso-latin-1 (pure bytes). A well behaved io_server should also
-  return error if list elements contain integers > 255 when the
-  Encoding is set to latin1. Note that this does not in any way tell
-  how characters should be put on the actual device or how the
-  io_server should handle them. Different io_servers may handle the
-  characters however they want, this simply tells the io_server which
-  format the data is expected to have. In the Module/Function/argument
-  case, the Encoding tells which format the designated function
-  produces. Note that byte-oriented data is simplest sent using latin1
-  Encoding</item>
-
-<item>Characters are the data to be put on the device. If Encoding is
-  latin1, this is an iolist(). If Encoding is unicode, this is an
-  Erlang standard mixed unicode list (one integer in a list per
+  ISO-latin-1 (pure bytes). A well behaved I/O server should also
+  return error if list elements contain integers > 255 when
+  <c>Encoding</c> is set to <c>latin1</c>. Note that this does not in any way tell
+  how characters should be put on the actual IO device or how the
+  I/O server should handle them. Different I/O servers may handle the
+  characters however they want, this simply tells the I/O server which
+  format the data is expected to have. In the <c>Module</c>/<c>Function</c>/<c>Args</c>
+  case, <c>Encoding</c> tells which format the designated function
+  produces. Note that byte-oriented data is simplest sent using the ISO-latin-1
+  encoding.</item>
+
+<item>Characters are the data to be put on the IO device. If <c>Encoding</c> is
+  <c>latin1</c>, this is an <c>iolist()</c>. If <c>Encoding</c> is <c>unicode</c>, this is an
+  Erlang standard mixed Unicode list (one integer in a list per
   character, characters in binaries represented as UTF-8).</item>
 
-<item>Module, Function, Args denotes a function which will be called to
-  produce the data (like io_lib:format). Args is a list of arguments
+<item><c>Module</c>, <c>Function</c>, and <c>Args</c> denote a function which will be called to
+  produce the data (like <c>io_lib:format/2</c>). <c>Args</c> is a list of arguments
   to the function. The function should produce data in the given
-  Encoding. The io_server should call the function as apply(Mod, Func,
-  Args) and will put the returned data on the device as if it was sent
-  in a {put_chars, Encoding, Characters} request. If the function
+  <c>Encoding</c>. The I/O server should call the function as
+  <c>apply(Mod, Func, Args)</c> and will put the returned data on the IO device as if it was sent
+  in a <c>{put_chars, Encoding, Characters}</c> request. If the function
   returns anything else than a binary or list or throws an exception,
   an error should be sent back to the client.</item>
 </list>
 
-<p>The server replies to the client with an io_reply where the Reply
+<p>The I/O server replies to the client with an <c>io_reply</c> tuple where the <c>Reply</c>
 element is one of:</p>
 <p>
 <em>ok</em><br/>
@@ -139,49 +139,50 @@ element is one of:</p>
 </p>
 
 <list type="bulleted">
-<item>Error describes the error to the client, which may do whatever it
-  wants with it. The Erlang io-module typically returns it as is.</item>
+<item><c>Error</c> describes the error to the client, which may do whatever
+  it wants with it. The Erlang <seealso marker="stdlib:io">io</seealso>
+  module typically returns it as is.</item>
 </list>
 
-<p>For backward compatibility the following Requests should also be
-handled by an io_server (these messages should not be present after
+<p>For backward compatibility the following <c>Request</c>s should also be
+handled by an I/O server (these requests should not be present after
 R15B of OTP):</p>
 <p>
 <em>{put_chars, Characters}</em><br/>
 <em>{put_chars, Module, Function, Args}</em>
 </p>
 
-<p>These should behave as {put_chars, latin1, Characters} and {put_chars,
-latin1, Module, Function, Args} respectively. </p>
+<p>These should behave as <c>{put_chars, latin1, Characters}</c> and
+<c>{put_chars, latin1, Module, Function, Args}</c> respectively. </p>
 </section>
 <section>
 <title>Input Requests</title>
 
-<p>To read characters from a device, the following Requests exist:</p>
+<p>To read characters from an IO device, the following <c>Request</c>s exist:</p>
 
 <p><em>{get_until, Encoding, Prompt, Module, Function, ExtraArgs}</em></p>
 
 <list type="bulleted">
-<item>Encoding denotes how data is to be sent back to the client and
+<item><c>Encoding</c> denotes how data is to be sent back to the client and
   what data is sent to the function denoted by
-  Module/Function/ExtraArgs. If the function supplied returns data as a
+  <c>Module</c>/<c>Function</c>/<c>ExtraArgs</c>. If the function supplied returns data as a
   list, the data is converted to this encoding. If however the
   function supplied returns data in some other format, no conversion
-  can be done and it's up to the client supplied function to return
-  data in a proper way. If Encoding is latin1, lists of integers
+  can be done and it is up to the client supplied function to return
+  data in a proper way. If <c>Encoding</c> is <c>latin1</c>, lists of integers
   0..255 or binaries containing plain bytes are sent back to the
-  client when possible, if Encoding is unicode, lists with integers in
-  the whole unicode range or binaries encoded in UTF-8 are sent to the
+  client when possible; if <c>Encoding</c> is <c>unicode</c>, lists with integers in
+  the whole Unicode range or binaries encoded in UTF-8 are sent to the
   client. The user supplied function will always see lists of integers, never
-  binaries, but the list may contain numbers > 255 if the Encoding is
-  'unicode'.</item>
+  binaries, but the list may contain numbers > 255 if the <c>Encoding</c> is
+  <c>unicode</c>.</item>
 
-<item>Prompt is a list of characters (not mixed, no binaries) or an atom()
-  to be output as a prompt for input on the device. The Prompt is
-  often ignored by the io_server and a Prompt set to '' should always
-  be ignored (and result in nothing being written to the device).</item>
+<item><c>Prompt</c> is a list of characters (not mixed, no binaries) or an atom
+  to be output as a prompt for input on the IO device. <c>Prompt</c> is
+  often ignored by the I/O server and if set to <c>''</c> it should always
+  be ignored (and result in nothing being written to the IO device).</item>
 
-<item><p>Module, Function, ExtraArgs denotes a function and arguments to
+<item><p><c>Module</c>, <c>Function</c>, and <c>ExtraArgs</c> denote a function and arguments to
   determine when enough data is written. The function should take two
   additional arguments, the last state, and a list of characters. The
   function should return one of:</p>
@@ -189,23 +190,23 @@ latin1, Module, Function, Args} respectively. </p>
 <em>{done, Result, RestChars}</em><br/>
 <em>{more, Continuation}</em>
 </p>
-  <p>The Result can be any Erlang term, but if it is a list(), the
-  io_server may convert it to a binary() of appropriate format before
-  returning it to the client, if the server is set in binary mode (see
+  <p>The <c>Result</c> can be any Erlang term, but if it is a <c>list()</c>, the
+  I/O server may convert it to a <c>binary()</c> of appropriate format before
+  returning it to the client, if the I/O server is set in binary mode (see
   below).</p>
 
-  <p>The function will be called with the data the io_server finds on
-  its device, returning {done, Result, RestChars} when enough data is
-  read (in which case Result is sent to the client and RestChars are
-  kept in the io_server as a buffer for subsequent input) or {more,
-  Continuation}, indicating that more characters are needed to
-  complete the request. The Continuation will be sent as the state in
+  <p>The function will be called with the data the I/O server finds on
+  its IO device, returning <c>{done, Result, RestChars}</c> when enough data is
+  read (in which case <c>Result</c> is sent to the client and <c>RestChars</c> is
+  kept in the I/O server as a buffer for subsequent input) or
+  <c>{more, Continuation}</c>, indicating that more characters are needed to
+  complete the request. The <c>Continuation</c> will be sent as the state in
   subsequent calls to the function when more characters are
   available. When no more characters are available, the function
-  shall return {done,eof,Rest}. 
+  shall return <c>{done, eof, Rest}</c>.
   The initial state is the empty list and the data when an
-  end of file is reached on the device is the atom 'eof'. An emulation
-  of the get_line request could be (inefficiently) implemented using
+  end of file is reached on the IO device is the atom <c>eof</c>. An emulation
+  of the <c>get_line</c> request could be (inefficiently) implemented using
   the following functions:</p>
 <code>
 -module(demo).
@@ -214,7 +215,9 @@ latin1, Module, Function, Args} respectively. </p>
 until_newline(_ThisFar,eof,_MyStopCharacter) -&gt;
     {done,eof,[]};
 until_newline(ThisFar,CharList,MyStopCharacter) -&gt;
-    case lists:splitwith(fun(X) -&gt; X =/= MyStopCharacter end,  CharList) of
+    case
+        lists:splitwith(fun(X) -&gt; X =/= MyStopCharacter end,  CharList)
+    of
 	{L,[]} -&gt;
             {more,ThisFar++L};
 	{L2,[MyStopCharacter|Rest]} -&gt;
@@ -222,45 +225,47 @@ until_newline(ThisFar,CharList,MyStopCharacter) -&gt;
     end.
 
 get_line(IoServer) -&gt;
-    IoServer ! {io_request, self(), IoServer, {get_until, unicode, '',
-                                               ?MODULE, until_newline, [$\n]}},
+    IoServer ! {io_request,
+                self(),
+                IoServer,
+                {get_until, unicode, '', ?MODULE, until_newline, [$\n]}},
     receive
         {io_reply, IoServer, Data} -&gt;
 	    Data
     end.
 </code>
- <p>Note especially that the last element in the Request tuple ([$\n])
+ <p>Note especially that the last element in the <c>Request</c> tuple (<c>[$\n]</c>)
   is appended to the argument list when the function is called. The
   function should be called like 
-  apply(Module, Function, [ State, Data | ExtraArgs ]) by the io_server</p>
+  <c>apply(Module, Function, [ State, Data | ExtraArgs ])</c> by the I/O server</p>
 </item>
 </list>
 
-<p>A defined number of characters is requested using this Request:</p>
+<p>A fixed number of characters is requested using this <c>Request</c>:</p>
 <p>
 <em>{get_chars, Encoding, Prompt, N}</em>
 </p>
 
 <list type="bulleted">
-<item>Encoding and Prompt as for get_until.</item>
+<item><c>Encoding</c> and <c>Prompt</c> as for <c>get_until</c>.</item>
 
-<item>N is the number of characters to be read from the device.</item>
+<item><c>N</c> is the number of characters to be read from the IO device.</item>
 </list>
 
-<p>A single line (like in the example above) is requested with this Request:</p>
+<p>A single line (like in the example above) is requested with this <c>Request</c>:</p>
 <p>
 <em>{get_line, Encoding, Prompt}</em>
 </p>
 
 <list type="bulleted">
-<item>Encoding and prompt as above.</item>
+<item><c>Encoding</c> and <c>Prompt</c> as above.</item>
 </list>
 
-<p>Obviously, get_chars and get_line could be implemented with the
-get_until request (and indeed was originally), but demands for
+<p>Obviously, the <c>get_chars</c> and <c>get_line</c> could be implemented with the
+<c>get_until</c> request (and indeed they were originally), but demands for
 efficiency has made these additions necessary.</p>
 
-<p>The server replies to the client with an io_reply where the Reply
+<p>The I/O server replies to the client with an <c>io_reply</c> tuple where the <c>Reply</c>
 element is one of:</p>
 <p>
 <em>Data</em><br/>
@@ -269,16 +274,17 @@ element is one of:</p>
 </p>
 
 <list type="bulleted">
-<item>Data is the characters read, in either list or binary form
-  (depending on the io_server mode, see below).</item>
-<item>Error describes the error to the client, which may do whatever it
-  wants with it. The Erlang io-module typically returns it as is.</item>
-<item>eof is returned when input end is reached and no more data is
+<item><c>Data</c> is the characters read, in either list or binary form
+  (depending on the I/O server mode, see below).</item>
+<item><c>Error</c> describes the error to the client, which may do whatever it
+  wants with it. The Erlang <seealso marker="stdlib:io">io</seealso>
+  module typically returns it as is.</item>
+<item><c>eof</c> is returned when input end is reached and no more data is
 available to the client process.</item>
 </list>
 
-<p>For backward compatibility the following Requests should also be
-handled by an io_server (these messages should not be present after
+<p>For backward compatibility the following <c>Request</c>s should also be
+handled by an I/O server (these reqeusts should not be present after
 R15B of OTP):</p>
 
 <p>
@@ -287,30 +293,30 @@ R15B of OTP):</p>
 <em>{get_line, Prompt}</em><br/>
 </p>
 
-<p>These should behave as {get_until, latin1, Prompt, Module, Function,
-ExtraArgs}, {get_chars, latin1, Prompt, N} and {get_line, latin1,
-Prompt} respectively.</p>
+<p>These should behave as <c>{get_until, latin1, Prompt, Module, Function,
+ExtraArgs}</c>, <c>{get_chars, latin1, Prompt, N}</c> and <c>{get_line, latin1,
+Prompt}</c> respectively.</p>
 </section>
 <section>
-<title>I/O-server modes</title>
-
-<p>Demands for efficiency when reading data from an io_server has not
-only lead to the addition of the get_line and get_chars requests, but
-has also added the concept of io_server options. No options are
-mandatory to implement, but all io_servers in the Erlang standard
-libraries honor the 'binary' option, which allows the Data in the
-io_reply to be binary instead of in list form <em>when possible</em>. 
+<title>I/O-server Modes</title>
+
+<p>Demands for efficiency when reading data from an I/O server has not
+only lead to the addition of the <c>get_line</c> and <c>get_chars</c> requests, but
+has also added the concept of I/O server options. No options are
+mandatory to implement, but all I/O servers in the Erlang standard
+libraries honor the <c>binary</c> option, which allows the <c>Data</c> element of the
+<c>io_reply</c> tuple to be a binary instead of a list <em>when possible</em>. 
 If the data is sent as a binary, Unicode data will be sent in the 
-standard Erlang unicode
-format, i.e. UTF-8 (note that the function in get_until still gets
-list data regardless of the io_server mode).</p>
+standard Erlang Unicode
+format, i.e. UTF-8 (note that the function of the <c>get_until</c> request still gets
+list data regardless of the I/O server mode).</p>
 
-<p>Note that i.e. the <c>get_until</c> request allows for a function with the data specified as always being a list. Also the return value data from such a function can be of any type (as is indeed the case when an io:fread request is sent to an io_server). The client has to be prepared for data received as answers to those requests to be in a variety of forms, but the server should convert the results to binaries whenever possible (i.e. when the function supplied to get_until actually returns a list). The example shown later in this text does just that.</p>
+<p>Note that i.e. the <c>get_until</c> request allows for a function with the data specified as always being a list. Also the return value data from such a function can be of any type (as is indeed the case when an <c>io:fread</c> request is sent to an I/O server). The client has to be prepared for data received as answers to those requests to be in a variety of forms, but the I/O server should convert the results to binaries whenever possible (i.e. when the function supplied to <c>get_until</c> actually returns a list). The example shown later in this text does just that.</p>
 
 <p>An I/O-server in binary mode will affect the data sent to the client,
 so that it has to be able to handle binary data. For convenience, it
-is possible to set and retrieve the modes of an io_server using the
-following I/O-requests:</p>
+is possible to set and retrieve the modes of an I/O server using the
+following I/O requests:</p>
 
 <p>
 <em>{setopts, Opts}</em>
@@ -318,72 +324,72 @@ following I/O-requests:</p>
 
 
 <list type="bulleted">
-<item>Opts is a list of options in the format recognized by proplists (and
-  of course by the io_server itself).</item>
+<item><c>Opts</c> is a list of options in the format recognized by <seealso marker="stdlib:proplists">proplists</seealso> (and
+  of course by the I/O server itself).</item>
 </list>
-<p>As an example, the io_server for the interactive shell (in group.erl)
+<p>As an example, the I/O server for the interactive shell (in <c>group.erl</c>)
 understands the following options:</p>
 <p>
-<em>{binary, bool()} (or 'binary'/'list')</em><br/>
-<em>{echo, bool()}</em><br/>
+<em>{binary, boolean()}</em> (or <em>binary</em>/<em>list</em>)<br/>
+<em>{echo, boolean()}</em><br/>
 <em>{expand_fun, fun()}</em><br/>
-<em>{encoding, 'unicode'/'latin1'} (or 'unicode'/'latin1')</em>
+<em>{encoding, unicode/latin1}</em> (or <em>unicode</em>/<em>latin1</em>)
 </p>
 
-<p>- of which the 'binary' and 'encoding' options are common for all
-io_servers in OTP, while 'echo' and 'expand' is valid only for this
-io_server. It's worth noting that the 'unicode' option notifies how
-characters are actually put on the physical device, i.e. if the
-terminal per se is unicode aware, it does not affect how characters
+<p>- of which the <c>binary</c> and <c>encoding</c> options are common for all
+I/O servers in OTP, while <c>echo</c> and <c>expand</c> are valid only for this
+I/O server. It is worth noting that the <c>unicode</c> option notifies how
+characters are actually put on the physical IO device, i.e. if the
+terminal per se is Unicode aware, it does not affect how characters
 are sent in the I/O-protocol, where each request contains encoding
 information for the provided or returned data.</p>
 
-<p>The server should send one of the following as Reply:</p>
+<p>The I/O server should send one of the following as <c>Reply</c>:</p>
 <p>
 <em>ok</em><br/>
 <em>{error, Error}</em>
 </p>
 
-<p>An error (preferably enotsup) is to be expected if the option is
-not supported by the io_server (like if an 'echo' option is sent in a
-setopt Request to a plain file).</p>
+<p>An error (preferably <c>enotsup</c>) is to be expected if the option is
+not supported by the I/O server (like if an <c>echo</c> option is sent in a
+<c>setopts</c> request to a plain file).</p>
 
-<p>To retrieve options, this message is used:</p>
+<p>To retrieve options, this request is used:</p>
 <p>
 <em>getopts</em>
 </p>
 
-<p>The 'getopts' message requests a complete list of all options
-supported by the io_server as well as their current values.</p>
+<p>The <c>getopts</c> request asks for a complete list of all options
+supported by the I/O server as well as their current values.</p>
 
-<p>The server replies:</p>
+<p>The I/O server replies:</p>
 <p>
 <em>OptList</em><br/>
-<em>{error,Error}</em>
+<em>{error, Error}</em>
 </p>
 
 <list type="bulleted">
-<item>OptList is a list of tuples {Option, Value} where Option is always
+<item><c>OptList</c> is a list of tuples <c>{Option, Value}</c> where <c>Option</c> is always
   an atom.</item>
 </list>
 </section>
 <section>
-<title>Multiple I/O requests</title>
+<title>Multiple I/O Requests</title>
 
-<p>The Request element can in itself contain several Requests by using
+<p>The <c>Request</c> element can in itself contain several <c>Request</c>s by using
 the following format:</p>
 <p>
 <em>{requests, Requests}</em>
 </p>
 <list type="bulleted">
-<item>Requests is a list of valid Request tuples for the protocol, they
+<item><c>Requests</c> is a list of valid <c>io_request</c> tuples for the protocol, they
   shall be executed in the order in which they appear in the list and
   the execution should continue until one of the requests result in an
   error or the list is consumed. The result of the last request is
   sent back to the client.</item>
 </list>
 
-<p>The server can for a list of requests send any of the valid results in
+<p>The I/O server can for a list of requests send any of the valid results in
 the reply:</p>
 
 <p>
@@ -395,7 +401,7 @@ the reply:</p>
 <p>- depending on the actual requests in the list.</p>
 </section>
 <section>
-<title>Optional I/O-requests</title>
+<title>Optional I/O Requests</title>
 
 <p>The following I/O request is optional to implement and a client
 should be prepared for an error return:</p>
@@ -403,47 +409,47 @@ should be prepared for an error return:</p>
 <em>{get_geometry, Geometry}</em>
 </p>
 <list type="bulleted">
-<item>Geometry is either the atom 'rows' or the atom 'columns'.</item>
+<item><c>Geometry</c> is either the atom <c>rows</c> or the atom <c>columns</c>.</item>
 </list>
-<p>The server should send the Reply as:</p>
+<p>The I/O server should send the <c>Reply</c> as:</p>
 <p>
 <em>{ok, N}</em><br/>
 <em>{error, Error}</em>
 </p>
 
 <list type="bulleted">
-<item>N is the number of character rows or columns the device has, if
-  applicable to the device the io_server handles, otherwise {error,
-  enotsup} is a good answer.</item>
+<item><c>N</c> is the number of character rows or columns the IO device has, if
+  applicable to the IO device the I/O server handles, otherwise <c>{error,
+  enotsup}</c> is a good answer.</item>
 </list>
 </section>
 <section>
-<title>Unimplemented request types:</title>
+<title>Unimplemented Request Types</title>
 
-<p>If an io_server encounters a request it does not recognize (i.e. the
-io_request tuple is in the expected format, but the actual Request is
-unknown), the server should send a valid reply with the error tuple:</p>
+<p>If an I/O server encounters a request it does not recognize (i.e. the
+<c>io_request</c> tuple is in the expected format, but the actual <c>Request</c> is
+unknown), the I/O server should send a valid reply with the error tuple:</p>
 <p>
 <em>{error, request}</em>
 </p>
 
-<p>This makes it possible to extend the protocol with optional messages
+<p>This makes it possible to extend the protocol with optional requests
 and for the clients to be somewhat backwards compatible.</p>
 </section>
 <section>
-<title>An annotated and working example io_server:</title>
+<title>An Annotated and Working Example I/O Server</title>
 
-<p>An io_server is any process capable of handling the protocol. There is
-no generic io_server behavior, but could well be. The framework is
+<p>An I/O server is any process capable of handling the I/O protocol. There is
+no generic I/O server behavior, but could well be. The framework is
 simple enough, a process handling incoming requests, usually both
-io_requests and other device-specific requests (for i.e. positioning ,
+I/O-requests and other IO device-specific requests (for i.e. positioning,
 closing etc.).</p>
 
-<p>Our example io_server stores characters in an ets table, making up a
+<p>Our example I/O server stores characters in an ETS table, making up a
 fairly crude ram-file (it is probably not useful, but working).</p>
 
 <p>The module begins with the usual directives, a function to start the
-server and a main loop handling the requests:</p> 
+I/O server and a main loop handling the requests:</p> 
 
 <code>
 -module(ets_io_server).
@@ -486,18 +492,19 @@ loop(State) -&gt;
 </code>
 
 <p>The main loop receives messages from the client (which might be using
-the io-module to send requests). For each request the function
-request/2 is called and a reply is eventually sent using the reply/3
+the <seealso marker="stdlib:io">io</seealso> module to send requests).
+For each request the function
+<c>request/2</c> is called and a reply is eventually sent using the <c>reply/3</c>
 function.</p>
 
-<p>The &quot;private&quot; message {From, rewind} results in the
+<p>The &quot;private&quot; message <c>{From, rewind}</c> results in the
 current position in the pseudo-file to be reset to 0 (the beginning of
-the &quot;file&quot;). This is a typical example of device-specific
+the &quot;file&quot;). This is a typical example of IO device-specific
 messages not being part of the I/O-protocol. It is usually a bad idea
-to embed such private messages in io_request tuples, as that might be
+to embed such private messages in <c>io_request</c> tuples, as that might be
 confusing to the reader.</p>
 
-<p>Let's look at the reply function first...</p>
+<p>Let us look at the reply function first...</p>
 
 <code>
 
@@ -506,8 +513,8 @@ reply(From, ReplyAs, Reply) -&gt;
 
 </code>
 
-<p>Simple enough, it sends the io_reply tuple back to the client,
-providing the ReplyAs element received in the request along with the
+<p>Simple enough, it sends the <c>io_reply</c> tuple back to the client,
+providing the <c>ReplyAs</c> element received in the request along with the
 result of the request, as described above.</p>
 
 <p>Now look at the different requests we need to handle. First the
@@ -525,18 +532,18 @@ request({put_chars, Encoding, Module, Function, Args}, State) -&gt;
     end;
 </code>
 
-<p>The Encoding tells us how the characters in the message are
+<p>The <c>Encoding</c> tells us how the characters in the request are
 represented. We want to store the characters as lists in the
-ets-table, so we convert them to lists using the
-unicode:characters_to_list/2 function. The conversion function
-conveniently accepts the encoding types unicode or latin1, so we can
-use the Encoding parameter directly.</p>
+ETS table, so we convert them to lists using the
+<seealso marker="stdlib:unicode#characters_to_list/2"><c>unicode:characters_to_list/2</c></seealso> function. The conversion function
+conveniently accepts the encoding types <c>unicode</c> or <c>latin1</c>, so we can
+use <c>Encoding</c> directly.</p>
 
-<p>When Module, Function and Arguments are provided, we simply apply it
+<p>When <c>Module</c>, <c>Function</c> and <c>Arguments</c> are provided, we simply apply it
 and do the same thing with the result as if the data was provided
 directly.</p>
 
-<p>Let's handle the requests for retrieving data too:</p>
+<p>Let us handle the requests for retrieving data too:</p>
 
 <code>
 request({get_until, Encoding, _Prompt, M, F, As}, State) -&gt;
@@ -550,11 +557,11 @@ request({get_line, Encoding, _Prompt}, State) -&gt;
 </code>
 
 <p>Here we have cheated a little by more or less only implementing
-get_until and using internal helpers to implement get_chars and
-get_line. In production code, this might be to inefficient, but that
+<c>get_until</c> and using internal helpers to implement <c>get_chars</c> and
+<c>get_line</c>. In production code, this might be too inefficient, but that
 of course depends on the frequency of the different requests. Before
-we start actually implementing the functions put_chars/2 and
-get_until/5, lets look into the few remaining requests:</p>
+we start actually implementing the functions <c>put_chars/2</c> and
+<c>get_until/5</c>, let us look into the few remaining requests:</p>
 
 <code>
 request({get_geometry,_}, State) -&gt;
@@ -567,18 +574,18 @@ request({requests, Reqs}, State) -&gt;
      multi_request(Reqs, {ok, ok, State});
 </code>
 
-<p>The get_geometry request has no meaning for this io_server, so the
-reply will be {error, enotsup}. The only option we handle is the
-binary/list option, which is done in separate functions.</p>
+<p>The <c>get_geometry</c> request has no meaning for this I/O server, so the
+reply will be <c>{error, enotsup}</c>. The only option we handle is the
+<c>binary</c>/<c>list</c> option, which is done in separate functions.</p>
 
-<p>The multi-request tag (requests) is handled in a separate loop
+<p>The multi-request tag (<c>requests</c>) is handled in a separate loop
 function applying the requests in the list one after another,
 returning the last result.</p>
 
-<p>What's left is to handle backward compatibility and the file-module
+<p>What is left is to handle backward compatibility and the <seealso marker="kernel:file">file</seealso> module
 (which uses the old requests until backward compatibility with pre-R13
-nodes is no longer needed). Note that the io_server will not work with
-a simple file:write if these are not added:</p>
+nodes is no longer needed). Note that the I/O server will not work with
+a simple <c>file:write/2</c> if these are not added:</p>
 
 <code>
 request({put_chars,Chars}, State) -&gt;
@@ -593,7 +600,7 @@ request({get_until, Prompt,M,F,As}, State) -&gt;
     request({get_until,latin1,Prompt,M,F,As}, State);
 </code>
 
-<p>Ok, what's left now is to return {error, request} if the request is
+<p>OK, what is left now is to return <c>{error, request}</c> if the request is
 not recognized:</p>
 
 <code>
@@ -601,7 +608,7 @@ request(_Other, State) -&gt;
     {error, {error, request}, State}.
 </code>
 
-<p>Let's move further and actually handle the different requests, first
+<p>Let us move further and actually handle the different requests, first
 the fairly generic multi-request type:</p>
 
 <code>
@@ -615,10 +622,10 @@ multi_request([], Result) -&gt;
 
 <p>We loop through the requests one at the time, stopping when we either
 encounter an error or the list is exhausted. The last return value is
-sent back to the client (it's first returned to the main loop and then
-sent back by the function io_reply).</p>
+sent back to the client (it is first returned to the main loop and then
+sent back by the function <c>io_reply</c>).</p>
 
-<p>The getopt and setopt requests are also simple to handle, we just
+<p>The <c>getopts</c> and <c>setopts</c> requests are also simple to handle, we just
 change or read our state record:</p>
 
 <code>
@@ -656,24 +663,24 @@ getopts(#state{mode=M} = S) -&gt;
 		  end}],S}.
 </code>
 
-<p>As a convention, all io_servers handle both {setopts, [binary]},
-{setopts, [list]} and {setopts,[{binary, bool()}]}, hence the trick
-with proplists:substitute_negations/2 and proplists:unfold/1. If
-invalid options are sent to us, we send {error,enotsup} back to the
+<p>As a convention, all I/O servers handle both <c>{setopts, [binary]}</c>,
+<c>{setopts, [list]}</c> and <c>{setopts,[{binary, boolean()}]}</c>, hence the trick
+with <c>proplists:substitute_negations/2</c> and <c>proplists:unfold/1</c>. If
+invalid options are sent to us, we send <c>{error, enotsup}</c> back to the
 client.</p>
 
-<p>The getopts request should return a list of {Option, Value} tuples,
+<p>The <c>getopts</c> request should return a list of <c>{Option, Value}</c> tuples,
 which has the twofold function of providing both the current values
-and the available options of this io_server. We have only one option,
+and the available options of this I/O server. We have only one option,
 and hence return that.</p>
 
-<p>So far our io_server has been fairly generic (except for the rewind
-request handled in the main loop and the creation of an ets table). 
-Most io_servers contain code similar to what's above.</p>
+<p>So far our I/O server has been fairly generic (except for the <c>rewind</c>
+request handled in the main loop and the creation of an ETS table). 
+Most I/O servers contain code similar to the one above.</p>
 
 <p>To make the example runnable, we now start implementing the actual
-reading and writing of the data to/from the ets-table. First the
-put_chars function:</p>
+reading and writing of the data to/from the ETS table. First the
+<c>put_chars/3</c> function:</p>
 
 <code>
 put_chars(Chars, #state{table = T, position = P} = State) -&gt;
@@ -686,10 +693,10 @@ put_chars(Chars, #state{table = T, position = P} = State) -&gt;
 <p>We already have the data as (Unicode) lists and therefore just split
 the list in runs of a predefined size and put each run in the
 table at the current position (and forward). The functions
-split_data/3 and apply_update/2 are implemented below.</p>
+<c>split_data/3</c> and <c>apply_update/2</c> are implemented below.</p>
 
-<p>Now we want to read data from the table. The get_until function reads
-data and applies the function until it says it's done. The result is
+<p>Now we want to read data from the table. The <c>get_until/5</c> function reads
+data and applies the function until it says it is done. The result is
 sent back to the client:</p>
 
 <code>
@@ -700,11 +707,12 @@ get_until(Encoding, Mod, Func, As,
 	    if
 		M =:= binary -&gt; 
 		    {ok, 
-		     unicode:characters_to_binary(Data,unicode,Encoding),
+		     unicode:characters_to_binary(Data, unicode, Encoding),
 		     State#state{position = NewP}};
 		true -&gt;
 		    case check(Encoding, 
-				unicode:characters_to_list(Data, unicode)) of
+		               unicode:characters_to_list(Data, unicode))
+                    of
 			{error, _} = E -&gt;
 			    {error, E, State};
 			List -&gt;
@@ -730,24 +738,24 @@ get_loop(M,F,A,T,P,C) -&gt;
     end.
 </code>
 
-<p>Here we also handle the mode (binary or list) that can be set by
-the setopts request. By default, all OTP io_servers send data back to
-the client as lists, but switching mode to binary might increase
-efficiency if the server handles it in an appropriate way. The
-implementation of get_until is hard to get efficient as the supplied
-function is defined to take lists as arguments, but get_chars and
-get_line can be optimized for binary mode. This example does not
+<p>Here we also handle the mode (<c>binary</c> or <c>list</c>) that can be set by
+the <c>setopts</c> request. By default, all OTP I/O servers send data back to
+the client as lists, but switching mode to <c>binary</c> might increase
+efficiency if the I/O server handles it in an appropriate way. The
+implementation of <c>get_until</c> is hard to get efficient as the supplied
+function is defined to take lists as arguments, but <c>get_chars</c> and
+<c>get_line</c> can be optimized for binary mode. This example does not
 optimize anything however. It is important though that the returned
 data is of the right type depending on the options set, so we convert
 the lists to binaries in the correct encoding <em>if possible</em>
-before returning. The function supplied in the get_until request may,
+before returning. The function supplied in the <c>get_until</c> request tuple may,
 as its final result return anything, so only functions actually
 returning lists can get them converted to binaries. If the request
-contained the encoding tag unicode, the lists can contain all unicode
+contained the encoding tag <c>unicode</c>, the lists can contain all Unicode
 codepoints and the binaries should be in UTF-8, if the encoding tag
-was latin1, the client should only get characters in the range
-0..255. The function check/2 takes care of not returning arbitrary
-unicode codepoints in lists if the encoding was given as latin1. If
+was <c>latin1</c>, the client should only get characters in the range
+0..255. The function <c>check/2</c> takes care of not returning arbitrary
+Unicode codepoints in lists if the encoding was given as <c>latin1</c>. If
 the function did not return a list, the check cannot be performed and
 the result will be that of the supplied function untouched.</p>
 
@@ -768,13 +776,13 @@ check(latin1, List) -&gt;
     end.
 </code>
 
-<p>The function check takes care of providing an error tuple if unicode
+<p>The function check takes care of providing an error tuple if Unicode
 codepoints above 255 is to be returned if the client requested
 latin1.</p>
 
-<p>The two functions until_newline/3 and until_enough/3 are helpers used 
-together with the get_until function to implement get_chars and
-get_line (inefficiently):</p>
+<p>The two functions <c>until_newline/3</c> and <c>until_enough/3</c> are helpers used 
+together with the <c>get_until/5</c> function to implement <c>get_chars</c> and
+<c>get_line</c> (inefficiently):</p>
 	
 <code>
 until_newline([],eof,_MyStopCharacter) -&gt;
@@ -782,7 +790,9 @@ until_newline([],eof,_MyStopCharacter) -&gt;
 until_newline(ThisFar,eof,_MyStopCharacter) -&gt;
     {done,ThisFar,[]};
 until_newline(ThisFar,CharList,MyStopCharacter) -&gt;
-    case lists:splitwith(fun(X) -&gt; X =/= MyStopCharacter end,  CharList) of
+    case
+        lists:splitwith(fun(X) -&gt; X =/= MyStopCharacter end,  CharList)
+    of
 	{L,[]} -&gt;
             {more,ThisFar++L};
 	{L2,[MyStopCharacter|Rest]} -&gt;
@@ -802,10 +812,10 @@ until_enough(ThisFar,CharList,_N) -&gt;
 </code>
 
 <p>As can be seen, the functions above are just the type of functions
-that should be provided in get_until requests.</p>
+that should be provided in <c>get_until</c> requests.</p>
 
 <p>Now we only need to read and write the table in an appropriate way to
-complete the server:</p>
+complete the I/O server:</p>
 
 <code>
 get(P,Tab) -&gt;
@@ -847,13 +857,13 @@ apply_update(Table, {Row, Col, List}) -&gt;
     end.
 </code>
 
-<p>The table is read or written in chunks of ?CHARS_PER_REC, overwriting
+<p>The table is read or written in chunks of <c>?CHARS_PER_REC</c>, overwriting
 when necessary. The implementation is obviously not efficient, it is
 just working.</p>
 
 <p>This concludes the example. It is fully runnable and you can read or
-write to the io_server by using i.e. the io_module or even the file
-module. It's as simple as that to implement a fully fledged io_server
+write to the I/O server by using i.e. the <seealso marker="stdlib:io">io</seealso> module or even the <seealso marker="kernel:file">file</seealso>
+module. It is as simple as that to implement a fully fledged I/O server
 in Erlang.</p>
 </section>
 </chapter>
diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml
index 225c5e97eb..8d64319344 100644
--- a/lib/stdlib/doc/src/proplists.xml
+++ b/lib/stdlib/doc/src/proplists.xml
@@ -70,7 +70,7 @@
       <fsummary></fsummary>
       <desc>
         <p>Minimizes the representation of all entries in the list. This is
-          equivalent to <c><![CDATA[[property(P) || P <- List]]]></c>.</p>
+          equivalent to <c><![CDATA[[property(P) || P <- ListIn]]]></c>.</p>
         <p>See also: <c>property/1</c>, <c>unfold/1</c>.</p>
       </desc>
     </func>
@@ -88,11 +88,11 @@
       <desc>
         <p>Expands particular properties to corresponding sets of
           properties (or other terms). For each pair <c>{<anno>Property</anno>, <anno>Expansion</anno>}</c> in <c><anno>Expansions</anno></c>, if <c>E</c> is
-          the first entry in <c><anno>List</anno></c> with the same key as
+          the first entry in <c><anno>ListIn</anno></c> with the same key as
           <c><anno>Property</anno></c>, and <c>E</c> and <c><anno>Property</anno></c>
           have equivalent normal forms, then <c>E</c> is replaced with
           the terms in <c><anno>Expansion</anno></c>, and any following entries with
-          the same key are deleted from <c><anno>List</anno></c>.</p>
+          the same key are deleted from <c><anno>ListIn</anno></c>.</p>
         <p>For example, the following expressions all return <c>[fie, bar, baz, fum]</c>:</p>
         <code type="none">
           expand([{foo, [bar, baz]}],
@@ -198,7 +198,7 @@
       <name name="normalize" arity="2"/>
       <fsummary></fsummary>
       <desc>
-        <p>Passes <c><anno>List</anno></c> through a sequence of
+        <p>Passes <c><anno>ListIn</anno></c> through a sequence of
           substitution/expansion stages. For an <c>aliases</c> operation,
           the function <c>substitute_aliases/2</c> is applied using the
           given list of aliases; for a <c>negations</c> operation,
@@ -221,9 +221,9 @@
       <fsummary></fsummary>
       <desc>
         <p>Creates a normal form (minimal) representation of a property. If
-          <c><anno>Property</anno></c> is <c>{Key, true}</c> where <c>Key</c> is
-          an atom, this returns <c>Key</c>, otherwise the whole term
-          <c><anno>Property</anno></c> is returned.</p>
+          <c><anno>PropertyIn</anno></c> is <c>{Key, true}</c> where
+	  <c>Key</c> is an atom, this returns <c>Key</c>, otherwise
+	  the whole term <c><anno>PropertyIn</anno></c> is returned.</p>
         <p>See also: <c>property/2</c>.</p>
       </desc>
     </func>
@@ -260,7 +260,7 @@
       <fsummary></fsummary>
       <desc>
         <p>Substitutes keys of properties. For each entry in
-          <c><anno>List</anno></c>, if it is associated with some key <c>K1</c>
+          <c><anno>ListIn</anno></c>, if it is associated with some key <c>K1</c>
           such that <c>{K1, K2}</c> occurs in <c><anno>Aliases</anno></c>, the
           key of the entry is changed to <c>K2</c>. If the same
           <c>K1</c> occurs more than once in <c><anno>Aliases</anno></c>, only
@@ -278,13 +278,13 @@
       <desc>
         <p>Substitutes keys of boolean-valued properties and
           simultaneously negates their values. For each entry in
-          <c><anno>List</anno></c>, if it is associated with some key <c>K1</c>
+          <c><anno>ListIn</anno></c>, if it is associated with some key <c>K1</c>
           such that <c>{K1, K2}</c> occurs in <c><anno>Negations</anno></c>, then
           if the entry was <c>{K1, true}</c> it will be replaced with
           <c>{K2, false}</c>, otherwise it will be replaced with
           <c>{K2, true}</c>, thus changing the name of the option and
           simultaneously negating the value given by
-          <c>get_bool(List)</c>. If the same <c>K1</c> occurs more
+          <c>get_bool(ListIn)</c>. If the same <c>K1</c> occurs more
           than once in <c><anno>Negations</anno></c>, only the first occurrence is
           used.</p>
         <p>Example: <c>substitute_negations([{no_foo, foo}], L)</c>
@@ -300,7 +300,7 @@
       <name name="unfold" arity="1"/>
       <fsummary></fsummary>
       <desc>
-        <p>Unfolds all occurrences of atoms in <c><anno>List</anno></c> to tuples
+        <p>Unfolds all occurrences of atoms in <c><anno>ListIn</anno></c> to tuples
           <c>{Atom, true}</c>.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 2211bfb925..71a6e34513 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -96,12 +96,12 @@
       subjects during the program's lifetime. Compiling once and
       executing many times is far more efficient than compiling each
       time one wants to match.</p>
-      <p>When the unicode option is given, the regular expression should be given as a valid unicode <c>charlist()</c>, otherwise as any valid <c>iodata()</c>.</p>
+      <p>When the unicode option is given, the regular expression should be given as a valid Unicode <c>charlist()</c>, otherwise as any valid <c>iodata()</c>.</p>
 
       <p><marker id="compile_options"/>The options have the following meanings:</p>
       <taglist>
       <tag><c>unicode</c></tag>
-      <item>The regular expression is given as a unicode <c>charlist()</c> and the resulting regular expression code is to be run against a valid unicode <c>charlist()</c> subject.</item>
+      <item>The regular expression is given as a Unicode <c>charlist()</c> and the resulting regular expression code is to be run against a valid Unicode <c>charlist()</c> subject.</item>
       <tag><c>anchored</c></tag>
       <item>The pattern is forced to be "anchored", that is, it is constrained to match only at the first matching point in the string that is being searched (the "subject string"). This effect can also be achieved by appropriate constructs in the pattern itself.</item>
       <tag><c>caseless</c></tag>
@@ -478,7 +478,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <p>Replaces the matched part of the <c><anno>Subject</anno></c> string with the contents of <c><anno>Replacement</anno></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, <anno>ReturnType</anno>}</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
+      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>
 
       <p>As in the <c>re:run/3</c> function, an <c>mp()</c> compiled
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index 1f6cbaccd7..d235f3e180 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -32,9 +32,9 @@
   <module>unicode</module>
   <modulesummary>Functions for converting Unicode characters</modulesummary>
   <description>
-  <p>This module contains functions for converting between different character representations. Basically it converts between iso-latin-1 characters and Unicode ditto, but it can also convert between different Unicode encodings (like UTF-8, UTF-16 and UTF-32).</p>
+  <p>This module contains functions for converting between different character representations. Basically it converts between ISO-latin-1 characters and Unicode ditto, but it can also convert between different Unicode encodings (like UTF-8, UTF-16 and UTF-32).</p>
   <p>The default Unicode encoding in Erlang is in binaries UTF-8, which is also the format in which built in functions and libraries in OTP expect to find binary Unicode data. In lists, Unicode data is encoded as integers, each integer representing one character and encoded simply as the Unicode codepoint for the character.</p> 
-  <p>Other Unicode encodings than integers representing codepoints or UTF-8 in binaries are referred to as &quot;external encodings&quot;. The iso-latin-1 encoding is in binaries and lists referred to as latin1-encoding.</p>
+  <p>Other Unicode encodings than integers representing codepoints or UTF-8 in binaries are referred to as &quot;external encodings&quot;. The ISO-latin-1 encoding is in binaries and lists referred to as latin1-encoding.</p>
   <p>It is recommended to only use external encodings for communication with external entities where this is required. When working inside the Erlang/OTP environment, it is recommended to keep binaries in UTF-8 when representing Unicode characters. Latin1 encoding is supported both for backward compatibility and for communication with external entities not supporting Unicode character sets.</p>
   </description>
 
@@ -48,13 +48,13 @@
     <datatype>
       <name name="unicode_binary"/>
       <desc>
-        <p>A binary() with characters encoded in the UTF-8 coding standard.</p>
+        <p>A <c>binary()</c> with characters encoded in the UTF-8 coding standard.</p>
       </desc>
     </datatype>
     <datatype>
       <name name="unicode_char"/>
       <desc>
-        <p>An integer() representing a valid unicode codepoint.</p>
+        <p>An <c>integer()</c> representing a valid Unicode codepoint.</p>
       </desc>
     </datatype>
     <datatype>
@@ -63,7 +63,7 @@
     <datatype>
       <name name="charlist"/>
       <desc>
-        <p>A unicode_binary is allowed as the tail of the list.</p>
+        <p>A <c>unicode_binary()</c> is allowed as the tail of the list.</p>
       </desc>
     </datatype>
     <datatype>
@@ -85,7 +85,7 @@
     </datatype>
     <datatype>
       <name name="latin1_binary"/>
-      <desc><p>A <c>binary()</c> with characters coded in iso-latin-1.</p>
+      <desc><p>A <c>binary()</c> with characters coded in ISO-latin-1.</p>
       </desc>
     </datatype>
     <datatype>
@@ -110,7 +110,9 @@
       <name name="bom_to_encoding" arity="1"/>
       <fsummary>Identify UTF byte order marks in a binary.</fsummary>
       <type name="endian"/>
-      <type_desc variable="Bin">A binary() of byte_size 4 or more.</type_desc>
+      <type_desc variable="Bin">
+        A <c>binary()</c> such that <c>byte_size(<anno>Bin</anno>) >= 4</c>.
+      </type_desc>
       <desc>
 
       <p>Check for a UTF byte order mark (BOM) in the beginning of a
@@ -126,7 +128,7 @@
       <name name="characters_to_list" arity="1"/>
       <fsummary>Convert a collection of characters to list of Unicode characters</fsummary>
       <desc>
-      <p>Same as characters_to_list(<anno>Data</anno>,unicode).</p>
+      <p>Same as <c>characters_to_list(<anno>Data</anno>, unicode)</c>.</p>
       </desc>
     </func>
     <func>
@@ -134,8 +136,8 @@
       <fsummary>Convert a collection of characters to list of Unicode characters</fsummary>
       <desc>
 
-      <p>This function converts a possibly deep list of integers and
-      binaries into a list of integers representing unicode
+      <p>Converts a possibly deep list of integers and
+      binaries into a list of integers representing Unicode
       characters. The binaries in the input may have characters
       encoded as latin1 (0 - 255, one character per byte), in which
       case the <c><anno>InEncoding</anno></c> parameter should be given as
@@ -148,18 +150,18 @@
       <p>If <c><anno>InEncoding</anno></c> is <c>latin1</c>, the <c><anno>Data</anno></c> parameter
       corresponds to the <c>iodata()</c> type, but for <c>unicode</c>,
       the <c><anno>Data</anno></c> parameter can contain integers greater than 255
-      (unicode characters beyond the iso-latin-1 range), which would
+      (Unicode characters beyond the ISO-latin-1 range), which would
       make it invalid as <c>iodata()</c>.</p>
 
       <p>The purpose of the function is mainly to be able to convert
-      combinations of unicode characters into a pure unicode
+      combinations of Unicode characters into a pure Unicode
       string in list representation for further processing. For
       writing the data to an external entity, the reverse function
       <seealso
-      marker="#characters_to_binary/3">characters_to_binary/3</seealso>
+      marker="#characters_to_binary/3"><c>characters_to_binary/3</c></seealso>
       comes in handy.</p>
  
-       <p>The option <c>unicode</c> is an alias for <c>utf8</c>, as this is the
+      <p>The option <c>unicode</c> is an alias for <c>utf8</c>, as this is the
       preferred encoding for Unicode characters in
       binaries. <c>utf16</c> is an alias for <c>{utf16,big}</c> and
       <c>utf32</c> is an alias for <c>{utf32,big}</c>. The <c>big</c>
@@ -167,7 +169,7 @@
       encoding.</p> 
 
       <p>If for some reason, the data cannot be converted, either
-      because of illegal unicode/latin1 characters in the list, or
+      because of illegal Unicode/latin1 characters in the list, or
       because of invalid UTF encoding in any binaries, an error
       tuple is returned. The error tuple contains the tag
       <c>error</c>, a list representing the characters that could be
@@ -176,7 +178,7 @@
       last part is mostly for debugging as it still constitutes a
       possibly deep and/or mixed list, not necessarily of the same
       depth as the original data. The error occurs when traversing the
-      list and whatever's left to decode is simply returned as is.</p>
+      list and whatever is left to decode is simply returned as is.</p>
 
       <p>However, if the input <c><anno>Data</anno></c> is a pure binary, the third
       part of the error tuple is guaranteed to be a binary as
@@ -191,7 +193,7 @@
 	   of a Unicode type, an error occurs whenever an integer
 	   <list type="bulleted">
 	     <item>greater than <c>16#10FFFF</c>
-	     (the maximum unicode character),</item>
+	     (the maximum Unicode character),</item>
 	     <item>in the range <c>16#D800</c> to <c>16#DFFF</c>
 	       (invalid range reserved for UTF-16 surrogate pairs)</item>
 	   </list>
@@ -205,14 +207,14 @@
 	   (like the upper
 	   bits of the bytes being wrong), the bytes are decoded to a
 	   too large number, the bytes are decoded to a code-point in the 
-	   invalid unicode
-	   range or encoding is &quot;overlong&quot;, meaning that a
+	   invalid Unicode
+	   range, or encoding is &quot;overlong&quot;, meaning that a
 	   number should have been encoded in fewer bytes. The
 	   case of a truncated UTF is handled specially, see the
 	   paragraph about incomplete binaries below. If
 	   <c><anno>InEncoding</anno></c> is <c>latin1</c>, binaries are always valid
 	   as long as they contain whole bytes,
-	   as each byte falls into the valid iso-latin-1 range.</item>
+	   as each byte falls into the valid ISO-latin-1 range.</item>
 
       </list>	   
 
@@ -250,7 +252,7 @@
       ever be decoded.</p>
 
       <p>If any parameters are of the wrong type, the list structure
-      is invalid (a number as tail) or the binaries does not contain
+      is invalid (a number as tail) or the binaries do not contain
       whole bytes (bit-strings), a <c>badarg</c> exception is
       thrown.</p>
  
@@ -258,28 +260,27 @@
     </func>
     <func>
      <name name="characters_to_binary" arity="1"/>
-      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
+      <fsummary>Convert a collection of characters to a UTF-8 binary</fsummary>
       <desc>
-      <p>Same as characters_to_binary(Data, unicode, unicode).</p>
+      <p>Same as <c>characters_to_binary(<anno>Data</anno>, unicode, unicode)</c>.</p>
       </desc>
     </func>
     <func>    
      <name name="characters_to_binary" arity="2"/>
-      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
+      <fsummary>Convert a collection of characters to a UTF-8 binary</fsummary>
 
       <desc>
-      <p>Same as characters_to_binary(<anno>Data</anno>, <anno>InEncoding</anno>, unicode).</p>
+      <p>Same as <c>characters_to_binary(<anno>Data</anno>, <anno>InEncoding</anno>, unicode)</c>.</p>
       </desc>
     </func>    
     <func>
       <name name="characters_to_binary" arity="3"/>
-      <fsummary>Convert a collection of characters to an UTF-8 binary</fsummary>
+      <fsummary>Convert a collection of characters to a UTF-8 binary</fsummary>
       <desc>
 
-      <p>This function behaves as <seealso
-      marker="#characters_to_list/2">
-      characters_to_list/2</seealso>, but produces an binary
-      instead of a unicode list. The
+      <p>Behaves as <seealso marker="#characters_to_list/2">
+      <c>characters_to_list/2</c></seealso>, but produces an binary
+      instead of a Unicode list. The
       <c><anno>InEncoding</anno></c> defines how input is to be interpreted if
       binaries are present in the <c>Data</c>, while
       <c><anno>OutEncoding</anno></c> defines in what format output is to be
@@ -294,7 +295,7 @@
 
       <p>Errors and exceptions occur as in <seealso
       marker="#characters_to_list/2">
-      characters_to_list/2</seealso>, but the second element
+      <c>characters_to_list/2</c></seealso>, but the second element
       in the <c>error</c> or
       <c>incomplete</c> tuple will be a <c>binary()</c> and not a
       <c>list()</c>.</p>
@@ -304,16 +305,18 @@
     <func>
       <name name="encoding_to_bom" arity="1"/>
       <fsummary>Create a binary UTF byte order mark from encoding.</fsummary>
-      <type_desc variable="Bin">A binary() of byte_size 4 or more.</type_desc>
+      <type_desc variable="Bin">
+        A <c>binary()</c> such that <c>byte_size(<anno>Bin</anno>) >= 4</c>.
+      </type_desc>
       <desc>
 
-      <p>Create an UTF byte order mark (BOM) as a binary from the
+      <p>Create a UTF byte order mark (BOM) as a binary from the
       supplied <c><anno>InEncoding</anno></c>. The BOM is, if supported at all,
       expected to be placed first in UTF encoded files or
       messages.</p>
 
       <p>The function returns <c>&lt;&lt;&gt;&gt;</c> for the
-      <c>latin1</c> encoding, there is no BOM for ISO-latin-1.</p>
+      <c>latin1</c> encoding as there is no BOM for ISO-latin-1.</p>
 
       <p>It can be noted that the BOM for UTF-8 is seldom used, and it
       is really not a <em>byte order</em> mark. There are obviously no
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index bbcd49a934..320b5b2e84 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -33,14 +33,14 @@
     <file>unicode_usage.xml</file>
   </header>
 <p>Implementing support for Unicode character sets is an ongoing process. The Erlang Enhancement Proposal (EEP) 10 outlines the basics of Unicode support and also specifies a default encoding in binaries that all Unicode-aware modules should handle in the future.</p>
-<p>The functionality described in EEP10 is implemented in Erlang/OTP as of R13A, but that's by no means the end of it. More functionality will be needed in the future and more OTP-libraries might need updating to cope with Unicode data. One example of future development is obvious when reading this manual, our documentation format is limited to the ISO-latin-1 character range, why no Unicode characters beyond that range will occur in this document.</p>
+<p>The functionality described in EEP10 is implemented in Erlang/OTP as of R13A, but that is by no means the end of it. More functionality will be needed in the future and more OTP-libraries might need updating to cope with Unicode data.</p>
 <p>This guide outlines the current Unicode support and gives a couple of recipes for working with Unicode data.</p>
 <section>
-<title>What Unicode is</title>
+<title>What Unicode Is</title>
 <p>Unicode is a standard defining codepoints (numbers) for all known, living or dead, scripts. In principle, every known symbol used in any language has a Unicode codepoint.</p>
 <p>Unicode codepoints are defined and published by the <em>Unicode Consortium</em>, which is a non profit organization.</p>
 <p>Support for Unicode is increasing throughout the world of computing, as the benefits of one common character set are overwhelming when programs are used in a global environment.</p>
-<p>Along with the base of the standard, the codepoints for all the scripts, there are a couple of encoding standards available. Different operating systems and tools support different encodings. For example Linux and MacOS X has chosen the UTF-8 encoding, which is backwards compatible with 7-bit ASCII and therefore affects programs written in plain English the least. Windows&reg; on the other hand supports a limited version of UTF-16, namely all the code planes where the characters can be stored in one single 16-bit entity, which includes most living languages.</p>
+<p>Along with the base of the standard, the codepoints for all the scripts, there are a couple of encoding standards available. Different operating systems and tools support different encodings. For example Linux and MacOSX has chosen the UTF-8 encoding, which is backwards compatible with 7-bit ASCII and therefore affects programs written in plain English the least. Windows&reg; on the other hand supports a limited version of UTF-16, namely all the code planes where the characters can be stored in one single 16-bit entity, which includes most living languages.</p>
 <p>The most widely spread encodings are:</p>
 <taglist>
 <tag>UTF-8</tag>
@@ -56,38 +56,47 @@
 <p>Additionally, the codepoint 16#FEFF is used for byte order marks (BOM's) and use of that character is not encouraged in other contexts than that. It actually is valid though, as the character "ZWNBS" (Zero Width Non Breaking Space). BOM's are used to identify encodings and byte order for programs where such parameters are not known in advance. Byte order marks are more seldom used than one could expect, but their use is becoming more widely spread as they provide the means for programs to make educated guesses about the Unicode format of a certain file.</p>
 </section>
 <section>
-<title>Standard Unicode representation in Erlang</title>
+<title>Standard Unicode Representation in Erlang</title>
 <p>In Erlang, strings are actually lists of integers. A string is defined to be encoded in the ISO-latin-1 (ISO8859-1) character set, which is, codepoint by codepoint, a sub-range of the Unicode character set.</p>
 <p>The standard list encoding for strings is therefore easily extendible to cope with the whole Unicode range: A Unicode string in Erlang is simply a list containing integers, each integer being a valid Unicode codepoint and representing one character in the Unicode character set.</p>
-<p>Regular Erlang strings in ISO-latin-1 are a subset of their Unicode strings.</p>
+<p>Regular Erlang strings in ISO-latin-1 are a subset of their Unicode
+strings.</p>
 
-<p>Binaries on the other hand are more troublesome. For performance reasons, programs often store textual data in binaries instead of lists, mainly because they are more compact (one byte per character instead of two words per character, as is the case with lists). Using erlang:list_to_binary/1, an regular Erlang string can be converted into a binary, effectively using the ISO-latin-1 encoding in the binary - one byte per character. This is very convenient for those regular Erlang strings, but cannot be done for Unicode lists.</p>
+<p>Binaries on the other hand are more troublesome. For performance reasons, programs often store textual data in binaries instead of lists, mainly because they are more compact (one byte per character instead of two words per character, as is the case with lists). Using <c>erlang:list_to_binary/1</c>, a regular Erlang string can be converted into a binary, effectively using the ISO-latin-1 encoding in the binary - one byte per character. This is very convenient for those regular Erlang strings, but cannot be done for Unicode lists.</p>
 <p>As the UTF-8 encoding is widely spread and provides the most compact storage, it is selected as the standard encoding of Unicode characters in binaries for Erlang.</p>
 <p>The standard binary encoding is used whenever a library function in Erlang should cope with Unicode data in binaries, but is of course not enforced when communicating externally. Functions and bit-syntax exist to encode and decode both UTF-8, UTF-16 and UTF-32 in binaries. Library functions dealing with binaries and Unicode in general, however, only deal with the default encoding.</p>
 
-<p>Character data may be combined from several sources, sometimes available in a mix of strings and binaries. Erlang has for long had the concept of iodata or iolists, where binaries and lists can be combined to represent a sequence of bytes. In the same way, the Unicode aware modules often allow for combinations of binaries and lists where the binaries have characters encoded in UTF-8 and the lists contain such binaries or numbers representing Unicode codepoints:</p>
+<p>Character data may be combined from several sources, sometimes available in a mix of strings and binaries. Erlang has for long had the concept of <c>iodata</c> or <c>iolists</c>, where binaries and lists can be combined to represent a sequence of bytes. In the same way, the Unicode aware modules often allow for combinations of binaries and lists where the binaries have characters encoded in UTF-8 and the lists contain such binaries or numbers representing Unicode codepoints:</p>
 <code type="none">
 unicode_binary() = binary() with characters encoded in UTF-8 coding standard
-unicode_char() = integer() representing valid unicode codepoint
+unicode_char() = integer() >= 0 representing valid Unicode codepoint
 
 chardata() = charlist() | unicode_binary()
 
 charlist() = [unicode_char() | unicode_binary() | charlist()]
   a unicode_binary is allowed as the tail of the list</code>
-<p>The module <c>unicode</c> in stdlib even supports similar mixes with binaries containing other encodings than UTF-8, but that is a special case to allow for conversions to and from external data:</p>
+<p>The module <c>unicode</c> in STDLIB even supports similar mixes with binaries containing other encodings than UTF-8, but that is a special case to allow for conversions to and from external data:</p>
     <code type="none">
-external_unicode_binary() = binary() with characters coded in a user specified Unicode 
-  encoding other than UTF-8 (UTF-16 or UTF-32)
+external_unicode_binary() = binary() with characters coded in
+  a user specified Unicode encoding other than UTF-8 (UTF-16 or UTF-32)
 
 external_chardata() = external_charlist() | external_unicode_binary()
 
-external_charlist() = [unicode_char() | external_unicode_binary() | external_charlist()]
-  an external_unicode_binary is allowed as the tail of the list</code>
+external_charlist() = [unicode_char() |
+                       external_unicode_binary() |
+                       external_charlist()]
+  an external_unicode_binary() is allowed as the tail of the list</code>
 </section>
 <section>
-<title>Basic language support for Unicode</title>
-<p>First of all, Erlang is still defined to be written in the ISO-latin-1 character set. Functions have to be named in that character set, atoms are restricted to ISO-latin-1 and regular strings are still lists of characters 0..255 in the ISO-latin-1 encoding. This has not (yet) changed, but the language has been slightly extended to cope with Unicode characters and encodings.</p>
-
+<title>Basic Language Support for Unicode</title>
+<p><marker id="unicode_in_erlang"/>As of Erlang/OTP R16 Erlang can be
+written in ISO-latin-1 or Unicode (UTF-8). The details on how to state
+the encoding of an Erlang source file can be found in <seealso
+marker="stdlib:epp#encoding">epp(3)</seealso>. Strings and comments
+can be written using Unicode, but functions still have to be named in
+ISO-latin-1 and atoms are restricted to ISO-latin-1. Erlang/OTP R18 is
+expected to handle functions named in Unicode as well as Unicode
+atoms.</p>
 <section>
 <title>Bit-syntax</title>
 <p>The bit-syntax contains types for coping with binary data in the three main encodings. The types are named <c>utf8</c>, <c>utf16</c> and <c>utf32</c> respectively. The <c>utf16</c> and <c>utf32</c> types can be in a big- or little-endian variant:</p>
@@ -101,74 +110,79 @@ Bin3 = &lt;&lt;$H/utf32-little, $e/utf32-little, $l/utf32-little, $l/utf32-littl
 Bin4 = &lt;&lt;"Hello"/utf16&gt;&gt;,</code>
 </section>
 <section>
-<title>String- and character-literals</title>
-<warning>
-<p>The literal syntax described here may be subject to change in R13B, it has not yet passed the usual process for language changes approval.</p>
-</warning>
-<p>It is convenient to be able to write a list of Unicode characters in the string syntax. However, the language specifies strings as being in the ISO-latin-1 character set which the compiler tool chain as well as many other tools expect.</p>
-<p>Also the source code is (for now) still expected to be written using the ISO-latin-1 character set, why Unicode characters beyond that range cannot be entered in string literals.</p>
-<p>To make it easier to enter Unicode characters in the shell, it allows strings with Unicode characters on input, immediately converting them to regular lists of integers. They will, by the evaluator etc be viewed as if they were input using the regular list syntax, which is - in the end - how the language actually treats them. They will in the same way not be output as strings by i.e <c>io:write/2</c> or <c>io:format/3</c> unless the format string supplied to <c>io:format</c> uses the Unicode translation modifier (which we will talk about later).</p>
-<p>For source code, there is an extension to the \OOO (backslash followed by three octal numbers) and \xHH (backslash followed by 'x', followed by two hexadecimal characters) syntax, namely \x{H ...} (a backslash followed by an 'x', followed by left curly bracket, any number of hexadecimal digits and a terminating right curly bracket). This allows for entering characters of any codepoint literally in a string. The string is immediately converted into a list by the scanner however, which is obvious when calling it directly:</p>
-<pre>
-1> <input>erl_scan:string("\"X\".").</input>
-{ok,[{string,1,"X"},{dot,1}],1}
-2> <input>erl_scan:string("\"\x{400}\".").</input>
-{ok,[{'[',1},{integer,1,1024},{']',1},{dot,1}],1}</pre>
-<p>Character literals, or rather integers representing Unicode codepoints can be expressed in a similar way using $\x{H ...}:</p>
-<pre>
-4> <input>$\x{400}.</input>
-1024</pre>
-<p>This also is a translation by the scanner:</p>
-<pre>
-5> <input>erl_scan:string("$Y.").</input>
-{ok,[{char,1,89},{dot,1}],1}
-6> <input>erl_scan:string("$\x{400}.").</input>
-{ok,[{integer,1,1024},{dot,1}],1}</pre>
-<p>In the shell, if using a Unicode input device, '$' can be followed directly by a Unicode character producing an integer. In the following example, let's imagine the character 'c' is actually a Cyrillic 's' (looking fairly similar):</p>
+<title>String- and Character-literals</title>
+<p>For source code, there is an extension to the <c>\</c>OOO (backslash
+followed by three octal numbers) and <c>\x</c>HH (backslash followed by <c>x</c>,
+followed by two hexadecimal characters) syntax, namely <c>\x{</c>H ...<c>}</c> (a
+backslash followed by an <c>x</c>, followed by left curly bracket, any
+number of hexadecimal digits and a terminating right curly bracket).
+This allows for entering characters of any codepoint literally in a
+string even when the encoding is ISO-latin-1.</p>
+</section>
+<p>In the shell, if using a Unicode input device, <c>$</c> can be followed directly by a Unicode character producing an integer. In the following example the codepoint of a Cyrillic <c>s</c> is output:</p>
 <pre>
-7> <input>$c.</input>
+7> <input>$с.</input>
 1089</pre>
 </section>
-<p>The literal syntax allowing Unicode characters is to be viewed as "syntactic sugar", but is, as such, fairly useful.</p>
-</section> 
 <section>
-<title>The interactive shell</title>
+<title>The Interactive Shell</title>
 <p>The interactive Erlang shell, when started towards a terminal or started using the <c>werl</c> command on windows, can support Unicode input and output.</p>
-<p>On Windows&reg;, proper operation requires that a suitable font is installed and selected for the Erlang application to use. If no suitable font is available on your system, try installing the DejaVu fonts (dejavu-fonts.org), which are freely available and then select that font in the Erlang shell application.</p>
-<p>On Unix&reg;-like operating systems, the terminal should be able to handle UTF-8 on input and output (modern versions of XTerm, KDE konsole and the Gnome terminal do for example) and your locale settings have to be proper. As an example, my LANG environment variable is set as this:</p>
+<p>On Windows&reg;, proper operation requires that a suitable font is installed and selected for the Erlang application to use. If no suitable font is available on your system, try installing the DejaVu fonts (<c>dejavu-fonts.org</c>), which are freely available and then select that font in the Erlang shell application.</p>
+<p>On Unix&reg;-like operating systems, the terminal should be able to handle UTF-8 on input and output (modern versions of XTerm, KDE konsole and the Gnome terminal do for example) and your locale settings have to be proper. As an example, my <c>LANG</c> environment variable is set as this:</p>
 <pre>
 $ <input>echo $LANG</input>
 en_US.UTF-8</pre>
-<p>Actually, most systems handle the LC_CTYPE variable before LANG, so if that is set, it has to be set to UTF-8:</p>
+<p>Actually, most systems handle the <c>LC_CTYPE</c> variable before <c>LANG</c>, so if that is set, it has to be set to <c>UTF-8</c>:</p>
 <pre>
 $ echo <input>$LC_CTYPE</input>
 en_US.UTF-8</pre>
-<p>The LANG or LC_CTYPE setting should be consistent with what the terminal is capable of, there is no portable way for Erlang to ask the actual terminal about its UTF-8 capacity, we have to rely on the language and character type settings.</p>
+<p>The <c>LANG</c> or <c>LC_CTYPE</c> setting should be consistent with what the terminal is capable of, there is no portable way for Erlang to ask the actual terminal about its UTF-8 capacity, we have to rely on the language and character type settings.</p>
 <p>To investigate what Erlang thinks about the terminal, the <c>io:getopts()</c> call can be used when the shell is started:</p>
 <pre>
 $ <input>LC_CTYPE=en_US.ISO-8859-1 erl</input>
-Erlang R13A (erts-5.7) [source] [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+Erlang R16B (erts-5.10) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
-Eshell V5.7  (abort with ^G)
-1> <input>lists:keyfind(encoding,1,io:getopts()).</input>
+Eshell V5.10  (abort with ^G)
+1> <input>lists:keyfind(encoding, 1, io:getopts()).</input>
 {encoding,latin1}
 2> <input>q().</input>
 ok
 $ <input>LC_CTYPE=en_US.UTF-8 erl</input>
-Erlang R13A (erts-5.7) [source] [64-bit] [smp:4:4] [rq:4] [async-threads:0] [kernel-poll:false]
+Erlang R16B (erts-5.10) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
-Eshell V5.7  (abort with ^G)
-1> <input>lists:keyfind(encoding,1,io:getopts()).</input>
+Eshell V5.10  (abort with ^G)
+1> <input>lists:keyfind(encoding, 1, io:getopts()).</input>
 {encoding,unicode}
 2></pre>
 <p>When (finally?) everything is in order with the locale settings, fonts and the terminal emulator, you probably also have discovered a way to input characters in the script you desire. For testing, the simplest way is to add some keyboard mappings for other languages, usually done with some applet in your desktop environment. In my KDE environment, I start the KDE Control Center (Personal Settings), select "Regional and Accessibility" and then "Keyboard Layout". On Windows XP&reg;, I start Control Panel->Regional and Language Options, select the Language tab and click the Details... button in the square named "Text services and input Languages". Your environment probably provides similar means of changing the keyboard layout. Make sure you have a way to easily switch back and forth between keyboards if you are not used to this, entering commands using a Cyrillic character set is, as an example, not easily done in the Erlang shell.</p>
 <p>Now you are set up for some Unicode input and output. The simplest thing to do is of course to enter a string in the shell:</p>
-<image file="ushell1.gif"><icaption>Cyrillic characters in an Erlang shell</icaption></image>
+<pre>
+$ <input>erl</input>
+Erlang R16B (erts-5.10) [source] [async-threads:0] [hipe] [kernel-poll:false]
+
+Eshell V5.10  (abort with ^G)
+1> <input>lists:keyfind(encoding, 1, io:getopts()).</input>
+{encoding,unicode}
+2> <input>"уницоде"</input>
+"уницоде"
+3> <input>io:format("~ts~n", [v(2)]).</input>
+уницоде
+ok
+4> </pre>
 <p>While strings can be input as Unicode characters, the language elements are still limited to the ISO-latin-1 character set. Only character constants and strings are allowed to be beyond that range:</p>
-<image file="ushell2.gif"><icaption>Unicode characters in allowed and disallowed context</icaption></image>
+<pre>
+$ <input>erl</input>
+Erlang R16B (erts-5.10) [source] [async-threads:0] [hipe] [kernel-poll:false]
+
+Eshell V5.10  (abort with ^G)
+1> <input>$ξ</input>
+958
+2> <input>уницоде.</input>
+* 1: illegal character
+2> </pre>
 </section> 
 <section>
-<title>Unicode file names</title>
+<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>
@@ -183,7 +197,7 @@ Eshell V5.7  (abort with ^G)
 <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>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 is 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>
 
@@ -193,31 +207,32 @@ Eshell V5.7  (abort with ^G)
 
 <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> 
+<note><p>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.</p></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>
+<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>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 <seealso marker="erts:erl"><c>erl(1)</c></seealso> 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>
+<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>
+<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 in environment variables and parameters</title>
+<title>Unicode in Environment Variables and Parameters</title>
 <p>Environment variables and their interpretation is handled much in the same way as file names. If Unicode file names are enabled, environment variables as well as parameters to the Erlang VM are expected to be in Unicode.</p>
 <p>If Unicode file names are enabled, the calls to <seealso marker="kernel:os#getenv/0"><c>os:getenv/0</c></seealso>, <seealso marker="kernel:os#getenv/1"><c>os:getenv/1</c></seealso> and <seealso marker="kernel:os#putenv/2"><c>os:putenv/2</c></seealso> will handle Unicode strings. On Unix-like platforms, the built-in functions will translate environment variables in UTF-8 to/from Unicode strings, possibly with codepoints > 255. On Windows the Unicode versions of the environment system API will be used, also allowing for codepoints > 255.</p>
 <p>On Unix-like operating systems, parameters are expected to be UTF-8 without translation if Unicode file names are enabled.</p>
 </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>
+<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 should not 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>
 <p>Fortunately, most textual data has been stored in lists and range checking has been sparse, why modules like <c>string</c> works well for Unicode lists with little need for conversion or extension.</p>
 <p>Some modules are however changed to be explicitly Unicode-aware. These modules include:</p>
@@ -230,7 +245,7 @@ Eshell V5.7  (abort with ^G)
 <item>
 <p>The <seealso marker="stdlib:io">io</seealso> module has been extended along with the actual I/O-protocol to handle Unicode data. This means that several functions require binaries to be in UTF-8 and there are modifiers to formatting control sequences to allow for outputting of Unicode strings.</p>
 </item>
-<tag><c>file</c>, <c>group</c> and <c>user</c></tag>
+<tag><c>file</c>, <c>group</c>, <c>user</c></tag>
 <item>
 <p>I/O-servers throughout the system are able both to handle Unicode data and has options for converting data upon actual output or input to/from the device. As shown earlier, the <seealso marker="stdlib:shell">shell</seealso> has support for Unicode terminals and the  <seealso marker="kernel:file">file</seealso> module allows for translation to and from various Unicode formats on disk.</p>
 <p>The actual reading and writing of files with Unicode data is however not best done with the <c>file</c> module as its interface is byte oriented. A file opened with a Unicode encoding (like UTF-8), is then best read or written using the <seealso marker="stdlib:io">io</seealso> module.</p>
@@ -247,10 +262,10 @@ Eshell V5.7  (abort with ^G)
 <p>The module <seealso marker="stdlib:string">string</seealso> works perfect for Unicode strings as well as for ISO-latin-1 strings with the exception of the language-dependent <seealso marker="stdlib:string#to_upper/1">to_upper</seealso> and <seealso marker="stdlib:string#to_lower/1">to_lower</seealso> functions, which are only correct for the ISO-latin-1 character set. Actually they can never function correctly for Unicode characters in their current form, there are language and locale issues as well as multi-character mappings to consider when conversion text between cases. Converting case in an international environment is a big subject not yet addressed in OTP.</p>
 </section>
 <section>
-<title>Unicode recipes</title>
+<title>Unicode Recipes</title>
 <p>When starting with Unicode, one often stumbles over some common issues. I try to outline some methods of dealing with Unicode data in this section.</p>
 <section>
-<title>Byte order marks</title>
+<title>Byte Order Marks</title>
 <p>A common method of identifying encoding in text-files is to put a byte order mark (BOM) first in the file. The BOM is the codepoint 16#FEFF encoded in the same way as the rest of the file. If such a file is to be read, the first few bytes (depending on encoding) is not part of the actual text. This code outlines how to open a file which is believed to have a BOM and set the files encoding and position for further sequential reading (preferably using the <seealso marker="stdlib:io">io</seealso> module). Note that error handling is omitted from the code:</p>
 <code>
 open_bom_file_for_reading(File) -&gt;
@@ -261,7 +276,7 @@ open_bom_file_for_reading(File) -&gt;
     io:setopts(F,[{encoding,Type}]),
     {ok,F}.
 </code>
-<p>The <c>unicode:bom_to_encoding/1</c> function identifies the encoding from a binary of at least four bytes. It returns, along with an term suitable for setting the encoding of the file, the actual length of the BOM, so that the file position can be set accordingly. Note that <c>file:position</c> always works on byte-offsets, so that the actual byte-length of the BOM is needed.</p>
+<p>The <c>unicode:bom_to_encoding/1</c> function identifies the encoding from a binary of at least four bytes. It returns, along with an term suitable for setting the encoding of the file, the actual length of the BOM, so that the file position can be set accordingly. Note that <c>file:position/2</c> always works on byte-offsets, so that the actual byte-length of the BOM is needed.</p>
 <p>To open a file for writing and putting the BOM first is even simpler:</p>
 <code>
 open_bom_file_for_writing(File,Encoding) -&gt;
@@ -273,24 +288,33 @@ open_bom_file_for_writing(File,Encoding) -&gt;
 <p>In both cases the file is then best processed using the <c>io</c> module, as the functions in <c>io</c> can handle codepoints beyond the ISO-latin-1 range.</p>
 </section>
 <section>
-<title>Formatted input and output</title>
-<p>When reading and writing to Unicode-aware entities, like the User or a file opened for Unicode translation, you will probably want to format text strings using the functions in <seealso marker="stdlib:io">io</seealso> or <seealso marker="stdlib:io_lib">io_lib</seealso>. For backward compatibility reasons, these functions don't accept just any list as a string, but require e special "translation modifier" when working with Unicode texts. The modifier is "t". When applied to the "s" control character in a formatting string, it accepts all Unicode codepoints and expect binaries to be in UTF-8:</p>
+<title>Formatted Input and Output</title>
+<p>When reading and writing to Unicode-aware entities, like the User or a file opened for Unicode translation, you will probably want to format text strings using the functions in <seealso marker="stdlib:io">io</seealso> or <seealso marker="stdlib:io_lib">io_lib</seealso>. For backward compatibility reasons, these functions do not accept just any list as a string, but require a special <em>translation modifier</em> when working with Unicode texts. The modifier is <c>t</c>. When applied to the <c>s</c> control character in a formatting string, it accepts all Unicode codepoints and expect binaries to be in UTF-8:</p>
 <pre>
-1> <input>io:format("~ts~n",[&lt;&lt;"���"/utf8&gt;&gt;]).</input>
-���
-ok
-2> <input>io:format("~s~n",[&lt;&lt;"���"/utf8&gt;&gt;]).</input>
+1> <input>io:format("~ts~n",[&lt;&lt;"åäö"/utf8&gt;&gt;]).</input>
 åäö
+ok
+2> <input>io:format("~s~n",[&lt;&lt;"åäö"/utf8&gt;&gt;]).</input>
+åäö
+ok</pre>
+<p>Obviously the second <c>io:format/2</c> gives undesired output because the UTF-8 binary is not in latin1. Because ISO-latin-1 is still the defined character set of Erlang, the non prefixed <c>s</c> control character expects ISO-latin-1 in binaries as well as lists.</p>
+<p>As long as the data is always lists, the <c>t</c> modifier can be used for any string, but when binary data is involved, care must be taken to make the right choice of formatting characters.</p>
+<p>The function <c>format/2</c> in <c>io_lib</c> behaves similarly. This function is defined to return a deep list of characters and the output could easily be converted to binary data for outputting on a device of any kind by a simple <c>erlang:list_to_binary/1</c>. When the translation modifier is used, the list can however contain characters that cannot be stored in one byte. The call to <c>erlang:list_to_binary/1</c> will in that case fail. However, if the I/O server you want to communicate with is Unicode-aware, the list returned can still be used directly:</p>
+<pre>
+$ <input>erl</input>
+Erlang R16B (erts-5.10) [source] [async-threads:0] [hipe] [kernel-poll:false]
+
+Eshell V5.10 (abort with ^G)
+1> <input>io_lib:format("~ts~n", ["θνιψοδε"]).</input>
+["θνιψοδε","\n"]
+2> <input>io:put_chars(io_lib:format("~ts~n", ["θνιψοδε"])).</input>
+θνιψοδε
 ok</pre>
-<p>Obviously the second <c>io:format</c> gives undesired output because the UTF-8 binary is not in latin1. Because ISO-latin-1 is still the defined character set of Erlang, the non prefixed "s" control character expects ISO-latin-1 in binaries as well as lists.</p>
-<p>As long as the data is always lists, the "t" modifier can be used for any string, but when binary data is involved, care must be taken to make the tight choice of formatting characters.</p>
-<p>The function <c>format</c> in <c>io_lib</c> behaves similarly. This function is defined to return a deep list of characters and the output could easily be converted to binary data for outputting on a device of any kind by a simple <c>erlang:list_to_binary</c>. When the translation modifier is used, the list can however contain characters that cannot be stored in one byte. The call to <c>erlang:list_to_binary</c> will in that case fail. However, if the io_server you want to communicate with is Unicode-aware, the list returned can still be used directly:</p>
-<image file="ushell3.gif"><icaption>io_lib:format with Unicode translation</icaption></image>
-<p>The Unicode string is returned as a Unicode list, why the return value of <c>io_lib:format</c> no longer qualifies as a regular Erlang string (the function <seealso marker="stdlib:io_lib#deep_char_list/1">io_lib:deep_char_list</seealso> will, as an example, return <c>false</c>). The Unicode list is however valid input to the <seealso marker="stdlib:io#put_chars/2">io:put_chars</seealso> function, so data can be output on any Unicode capable device anyway. If the device is a terminal, characters will be output in the \x{H ...} format if encoding is <c>latin1</c> otherwise in UTF-8 (for the non-interactive terminal - "oldshell" or "noshell") or whatever is suitable to show the character properly (for an interactive terminal - the regular shell). The bottom line is that you can always send Unicode data to the <c>standard_io</c> device. Files will however only accept Unicode codepoints beyond ISO-latin-1 if <c>encoding</c> is set to something else than <c>latin1</c>.</p>
+<p>The Unicode string is returned as a Unicode list, which is recognized as such since the Erlang shell uses the Unicode encoding. The Unicode list is valid input to the <seealso marker="stdlib:io#put_chars/2">io:put_chars/2</seealso> function, so data can be output on any Unicode capable device. If the device is a terminal, characters will be output in the <c>\x{</c>H ...<c>}</c> format if encoding is <c>latin1</c> otherwise in UTF-8 (for the non-interactive terminal - "oldshell" or "noshell") or whatever is suitable to show the character properly (for an interactive terminal - the regular shell). The bottom line is that you can always send Unicode data to the <c>standard_io</c> device. Files will however only accept Unicode codepoints beyond ISO-latin-1 if <c>encoding</c> is set to something else than <c>latin1</c>.</p>
 </section>
 <section>
-<title>Heuristic identification of UTF-8</title>
-<p>While it's strongly encouraged that the actual encoding of characters in binary data is known prior to processing, that is not always possible. On a typical Linux&reg; system, there is a mix of UTF-8 and ISO-latin-1 text files and there are seldom any BOM's in the files to identify them.</p>
+<title>Heuristic Identification of UTF-8</title>
+<p>While it iss strongly encouraged that the actual encoding of characters in binary data is known prior to processing, that is not always possible. On a typical Linux&reg; system, there is a mix of UTF-8 and ISO-latin-1 text files and there are seldom any BOM's in the files to identify them.</p>
 <p>UTF-8 is designed in such a way that ISO-latin-1 characters with numbers beyond the 7-bit ASCII range are seldom considered valid when decoded as UTF-8. Therefore one can usually use heuristics to determine if a file is in UTF-8 or if it is encoded in ISO-latin-1 (one byte per character) encoding. The <c>unicode</c> module can be used to determine if data can be interpreted as UTF-8:</p>
 <code>
 heuristic_encoding_bin(Bin) when is_binary(Bin) -&gt;
diff --git a/lib/stdlib/doc/src/ushell1.gif b/lib/stdlib/doc/src/ushell1.gif
deleted file mode 100644
index 7c46464fd2..0000000000
--- a/lib/stdlib/doc/src/ushell1.gif
+++ /dev/null
diff --git a/lib/stdlib/doc/src/ushell1.ps b/lib/stdlib/doc/src/ushell1.ps
deleted file mode 100644
index 95bfebf194..0000000000
--- a/lib/stdlib/doc/src/ushell1.ps
+++ /dev/null
@@ -1,1196 +0,0 @@
-%!PS-Adobe-3.0
-%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
-%%Title: ushell1.ps
-%%CreationDate: Mon Mar 16 09:53:27 2009
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%Pages: 1
-%%BoundingBox: 14 14 468 142
-%%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 127.55905511811024 translate
-453.54330708661422 -127.55905511811024 scale
-% Image geometry
-640 180 8
-% Transformation matrix
-[ 640 0 0 180 0 0 ]
-% Strings to hold RGB-samples per scanline
-/rstr 640 string def
-/gstr 640 string def
-/bstr 640 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:        67571 ASCII Bytes
-colorimage
-JP1PeJP1PeJP1L~>
-JP1PeJP1PeJP1L~>
-JP1PeJP1PeJP1L~>
-!!e'9JNA?CJNABDJ,~>
-!!e'9JNA?CJNABDJ,~>
-!!e'9JNA?CJNABDJ,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$2%<!Lr-2rr]6=Dt\b^JcC<$JcD\KJ,~>
-!$2%<!Lr-2rr]6=Dt\b^JcC<$JcD\KJ,~>
-!$2%<!Lr-2rr]6=Dt\b^JcC<$JcD\KJ,~>
-#9EjEY>Q6)=6BMbc`J;XJcC<$JcC<$W;hA~>
-#9EjEY>Q6)=6BMbc`J;XJcC<$JcC<$W;hA~>
-#9EjEY>Q6)=6BMbc`J;XJcC<$JcC<$W;hA~>
-#T`rUH-/@H`Dbmu!A3bks+13$s+13Ks*t~>
-#T`rUH-/@H`Dbmu!A3bks+13$s+13Ks*t~>
-#T`rUH-/@H`Dbmu!A3bks+13$s+13Ks*t~>
-#T`rEG5Y4]rp0@Z!W@cP*=4P!s-oDP9H?1krVlmMmt(Lis+13$s/>sJ~>
-#T`rEG5Y4]rp0@Z!W@cP*=4P!s-oDP9H?1krVlmMmt(Lis+13$s/>sJ~>
-#T`rEG5Y4]rp0@Z!W@cP*=4P!s-oDP9H?1krVlmMmt(Lis+13$s/>sJ~>
-#9EjER>jY@r:g3lQA5D=$0F2Hs)Ak%s4op<rrF_?JcC<$JcC<$W;hA~>
-#9EjER>jY@r:g3lQA5D=$0F2Hs)Ak%s4op<rrF_?JcC<$JcC<$W;hA~>
-#9EjER>jY@r:g3lQA5D=$0F2Hs)Ak%s4op<rrF_?JcC<$JcC<$W;hA~>
-!$2(="-F9Q\G-"(Q=^'2$*?/ds)G.?s5e.srrF_?JcC<$JcC<$W;hA~>
-!$2(="-F9Q\G-"(Q=^'2$*?/ds)G.?s5e.srrF_?JcC<$JcC<$W;hA~>
-!$2(="-F9Q\G-"(Q=^'2$*?/ds)G.?s5e.srrF_?JcC<$JcC<$W;hA~>
-!$2%<"&I0WZ2">"Q8&8B"FpIOENK!9!A3bks+13$s+13Ks*t~>
-!$2%<"&I0WZ2">"Q8&8B"FpIOENK!9!A3bks+13$s+13Ks*t~>
-!$2%<"&I0WZ2">"Q8&8B"FpIOENK!9!A3bks+13$s+13Ks*t~>
-#T`rq^Ah!RpEo\8!LAK:rrI,@q>UIImt(Lis+13$s/>sJ~>
-#T`rq^Ah!RpEo\8!LAK:rrI,@q>UIImt(Lis+13$s/>sJ~>
-#T`rq^Ah!RpEo\8!LAK:rrI,@q>UIImt(Lis+13$s/>sJ~>
-#T`s"JSH?.CSgh+!RuStC&iMXrrI,@qu6esC(k*/JcC<$JcC<$WW.J~>
-#T`s"JSH?.CSgh+!RuStC&iMXrrI,@qu6esC(k*/JcC<$JcC<$WW.J~>
-#T`s"JSH?.CSgh+!RuStC&iMXrrI,@qu6esC(k*/JcC<$JcC<$WW.J~>
-#9EjEgp/o#[J'V#fD`&U])M^1eE6Z.!7LkP!5F*bJcC<$JcD_LJ,~>
-#9EjEgp/o#[J'V#fD`&U])M^1eE6Z.!7LkP!5F*bJcC<$JcD_LJ,~>
-#9EjEgp/o#[J'V#fD`&U])M^1eE6Z.!7LkP!5F*bJcC<$JcD_LJ,~>
-!$2%<!T*O$s+13$s+13+s*t~>
-!$2%<!T*O$s+13$s+13+s*t~>
-!$2%<!T*O$s+13$s+13+s*t~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$.X1!VbZgrrMcToD\g]rn%5Fci4"4rn%5Kp&>-Vf\#!)rr_95f\lE%"5DJ\kK!T&r;P=KmIgJZ
-p&<SDo\]ZKoD[ABp@\Fcm/GW;rJ1CTgXt0Ap&>$hrn%5=kPp&~>
-!$.X1!VbZgrrMcToD\g]rn%5Fci4"4rn%5Kp&>-Vf\#!)rr_95f\lE%"5DJ\kK!T&r;P=KmIgJZ
-p&<SDo\]ZKoD[ABp@\Fcm/GW;rJ1CTgXt0Ap&>$hrn%5=kPp&~>
-!$.X1!VbZgrrMcToD\g]rn%5Fci4"4rn%5Kp&>-Vf\#!)rr_95f\lE%"5DJ\kK!T&r;P=KmIgJZ
-p&<SDo\]ZKoD[ABp@\Fcm/GW;rJ1CTgXt0Ap&>$hrn%5=kPp&~>
-!Zh=)r4;sJp\t?M]=[dnrrC^M])^+RrrBt8rrCOG])^O`rrN,;oD\mfUOUkp!5JHD!:K[_!<2l-
-"nM]nb];P3rrf;C6q#_Srrf>i6k8JSrrZO_6rs9d"4Ffn`;BQ8r5SL2!SZc5rrL6To`##66p3I#
-rrWs'7#p%%s5ESL#i+SBs6i?D-]@Zt"M5R?7*O]k#gN&Bs2.5m(WQ.J"Fqsi7/+e&!SceorrM<;
-mf3=!!7LiG"&[email protected])jpjdIXT/=<lMlA~>
-!Zh=)r4;sJp\t?M]=[dnrrC^M])^+RrrBt8rrCOG])^O`rrN,;oD\mfUOUkp!5JHD!:K[_!<2l-
-"nM]nb];P3rrf;C6q#_Srrf>i6k8JSrrZO_6rs9d"4Ffn`;BQ8r5SL2!SZc5rrL6To`##66p3I#
-rrWs'7#p%%s5ESL#i+SBs6i?D-]@Zt"M5R?7*O]k#gN&Bs2.5m(WQ.J"Fqsi7/+e&!SceorrM<;
-mf3=!!7LiG"&[email protected])jpjdIXT/=<lMlA~>
-!Zh=)r4;sJp\t?M]=[dnrrC^M])^+RrrBt8rrCOG])^O`rrN,;oD\mfUOUkp!5JHD!:K[_!<2l-
-"nM]nb];P3rrf;C6q#_Srrf>i6k8JSrrZO_6rs9d"4Ffn`;BQ8r5SL2!SZc5rrL6To`##66p3I#
-rrWs'7#p%%s5ESL#i+SBs6i?D-]@Zt"M5R?7*O]k#gN&Bs2.5m(WQ.J"Fqsi7/+e&!SceorrM<;
-mf3=!!7LiG"&[email protected])jpjdIXT/=<lMlA~>
-"!.E>/H&uWGk_4?XC2t&hZ!Um6iLKpEPqeU!Nm==rrAJc@0&Z7rr3%sBt![6!U2E,rrMo!m/I&"
-r*]TWq>UHor*]UHci3qFSUgA4!NC.^rrFq?p&>%u_#438a`V$#Fo21>SLO=5!Hk=9rrIX^qu6]"
-qYL3mju2l3!$0bm!oI+@o`#!G9q_Fa!Ki<5rrK`?iVrtr.,4\"!ER55rrIY@bPqUQnGW@fGGa6s
-!Mju/rrf?1@<TfkrrKf@p&>'T2Z3RT*U<ZT~>
-"!.E>/H&uWGk_4?XC2t&hZ!Um6iLKpEPqeU!Nm==rrAJc@0&Z7rr3%sBt![6!U2E,rrMo!m/I&"
-r*]TWq>UHor*]UHci3qFSUgA4!NC.^rrFq?p&>%u_#438a`V$#Fo21>SLO=5!Hk=9rrIX^qu6]"
-qYL3mju2l3!$0bm!oI+@o`#!G9q_Fa!Ki<5rrK`?iVrtr.,4\"!ER55rrIY@bPqUQnGW@fGGa6s
-!Mju/rrf?1@<TfkrrKf@p&>'T2Z3RT*U<ZT~>
-"!.E>/H&uWGk_4?XC2t&hZ!Um6iLKpEPqeU!Nm==rrAJc@0&Z7rr3%sBt![6!U2E,rrMo!m/I&"
-r*]TWq>UHor*]UHci3qFSUgA4!NC.^rrFq?p&>%u_#438a`V$#Fo21>SLO=5!Hk=9rrIX^qu6]"
-qYL3mju2l3!$0bm!oI+@o`#!G9q_Fa!Ki<5rrK`?iVrtr.,4\"!ER55rrIY@bPqUQnGW@fGGa6s
-!Mju/rrf?1@<TfkrrKf@p&>'T2Z3RT*U<ZT~>
-"!.E>Fn#D352P/r!Go">rs$)Ds8SmD(]"(;jFF`>s."Z-J$8PF!JQp-rrML@m/I&+mf*?sJ*6h2
-!mQ8Ap&>&lF34F_1[4T4!F<M>rrU8keG9+GR!:(SrrI8?nc&V>o(r@eju2l3!$0en"6=u%O7iMT
-gjhP\r;Qe[MtR)N]4'_!"297-g\h'P<lXh4!J$`arrGO?rVlnBVV_=RUj2D/#+pAEs3lJ>rVlo3
[email protected]#ju3/;!$1A)J,~>
-"!.E>Fn#D352P/r!Go">rs$)Ds8SmD(]"(;jFF`>s."Z-J$8PF!JQp-rrML@m/I&+mf*?sJ*6h2
-!mQ8Ap&>&lF34F_1[4T4!F<M>rrU8keG9+GR!:(SrrI8?nc&V>o(r@eju2l3!$0en"6=u%O7iMT
-gjhP\r;Qe[MtR)N]4'_!"297-g\h'P<lXh4!J$`arrGO?rVlnBVV_=RUj2D/#+pAEs3lJ>rVlo3
[email protected]#ju3/;!$1A)J,~>
-"!.E>Fn#D352P/r!Go">rs$)Ds8SmD(]"(;jFF`>s."Z-J$8PF!JQp-rrML@m/I&+mf*?sJ*6h2
-!mQ8Ap&>&lF34F_1[4T4!F<M>rrU8keG9+GR!:(SrrI8?nc&V>o(r@eju2l3!$0en"6=u%O7iMT
-gjhP\r;Qe[MtR)N]4'_!"297-g\h'P<lXh4!J$`arrGO?rVlnBVV_=RUj2D/#+pAEs3lJ>rVlo3
[email protected]#ju3/;!$1A)J,~>
-"!.E>Fo21B`NfH(A8hDG!C#B=rrB%tA-dJ\s0]Y*A7U/grro!)A9-Unq#:A2Yl=Y,]4(`5N:.e`
-rsS:7]`8"tO7rV9LTgFO!$1t:!-S9O&?Pp3K(J/9A?l17I9dLsA@MR<!+u4@!5/(+!?L;$A,sX@
-rrHo@r;QeISb<!`WH8";!8%0["6KR_df!\YlMob-rr3C]n,M+2s.s7:o`+s/rF?$+s8Th3A,uW,
-rrFq?p&>%u_#=96O,`u8"-Sf5.JNiGFf1%+A;L6b!gR;1rVm%pA.`0ZP5P=\ju2l3!$1t:!.4]U%
-&a.*Lh(\`A?>h2KC/YK!3uM&!omgerVm#hE4h0krVlrPA?Pn2"QaaBIA$N<!Ki<5rrK`?rVm2rJ
-cEJqAD7(`h>Updc%Y]errTT=df'1K_1:6*g\h'P<lXh4!J$a=rrBe3A-;i2s1/,>"DIi8`ioCA#
-^67J_6fbDA97bM!36$/!-n8<'sV9g<Fg^]s*(>sA7UJqs/40BEb(..rrA/[A,qbkrr@uVA,qqpr
-s4?iA;[1-s8RZLA,r>%rrVe&PlC[`45p2=!K3->rrKf@p&>'T2Z3RT*W?!?Us]5;rF?8Ss8R9Bc
-X^S/s8RT~>
-"!.E>Fo21B`NfH(A8hDG!C#B=rrB%tA-dJ\s0]Y*A7U/grro!)A9-Unq#:A2Yl=Y,]4(`5N:.e`
-rsS:7]`8"tO7rV9LTgFO!$1t:!-S9O&?Pp3K(J/9A?l17I9dLsA@MR<!+u4@!5/(+!?L;$A,sX@
-rrHo@r;QeISb<!`WH8";!8%0["6KR_df!\YlMob-rr3C]n,M+2s.s7:o`+s/rF?$+s8Th3A,uW,
-rrFq?p&>%u_#=96O,`u8"-Sf5.JNiGFf1%+A;L6b!gR;1rVm%pA.`0ZP5P=\ju2l3!$1t:!.4]U%
-&a.*Lh(\`A?>h2KC/YK!3uM&!omgerVm#hE4h0krVlrPA?Pn2"QaaBIA$N<!Ki<5rrK`?rVm2rJ
-cEJqAD7(`h>Updc%Y]errTT=df'1K_1:6*g\h'P<lXh4!J$a=rrBe3A-;i2s1/,>"DIi8`ioCA#
-^67J_6fbDA97bM!36$/!-n8<'sV9g<Fg^]s*(>sA7UJqs/40BEb(..rrA/[A,qbkrr@uVA,qqpr
-s4?iA;[1-s8RZLA,r>%rrVe&PlC[`45p2=!K3->rrKf@p&>'T2Z3RT*W?!?Us]5;rF?8Ss8R9Bc
-X^S/s8RT~>
-"!.E>Fo21B`NfH(A8hDG!C#B=rrB%tA-dJ\s0]Y*A7U/grro!)A9-Unq#:A2Yl=Y,]4(`5N:.e`
-rsS:7]`8"tO7rV9LTgFO!$1t:!-S9O&?Pp3K(J/9A?l17I9dLsA@MR<!+u4@!5/(+!?L;$A,sX@
-rrHo@r;QeISb<!`WH8";!8%0["6KR_df!\YlMob-rr3C]n,M+2s.s7:o`+s/rF?$+s8Th3A,uW,
-rrFq?p&>%u_#=96O,`u8"-Sf5.JNiGFf1%+A;L6b!gR;1rVm%pA.`0ZP5P=\ju2l3!$1t:!.4]U%
-&a.*Lh(\`A?>h2KC/YK!3uM&!omgerVm#hE4h0krVlrPA?Pn2"QaaBIA$N<!Ki<5rrK`?rVm2rJ
-cEJqAD7(`h>Updc%Y]errTT=df'1K_1:6*g\h'P<lXh4!J$a=rrBe3A-;i2s1/,>"DIi8`ioCA#
-^67J_6fbDA97bM!36$/!-n8<'sV9g<Fg^]s*(>sA7UJqs/40BEb(..rrA/[A,qbkrr@uVA,qqpr
-s4?iA;[1-s8RZLA,r>%rrVe&PlC[`45p2=!K3->rrKf@p&>'T2Z3RT*W?!?Us]5;rF?8Ss8R9Bc
-X^S/s8RT~>
-"!.E>+oY"=nGiOLJ4Q':Y\F(9!C#B=rrC[M[h5T^s+Mqh\$r2\s.PF]\#s&_q#:A21B'fKA^g\.
-li/"%rrth%K`D'Nb5VDAU3cP5!$2";!HG1>[hOJ#s2@f;\$pmts21i\\$t2ns'E/5[fL`lq#:@.
->Q2)4ER=CY!i_%@r;QeISb<!`WH8%<!Tdkj[f]k-he;tt"'>BB;Z?\)39C2.O@Y5;[oi[TF8`QM
->5uWerO2c3r;QdRl1P&W?,6F="cnXr84[+erreOOo(+=)rsNs&T!u2#L]@D"[ho#C"k:"&Y.)XQ
-rrM7?o`"n3r;QeBVuF.6Lo^P:UT.b3KX(P47fKjtJ@GOX!mgp]rVm"#a8_-[rVlr7!.+YE"nc'C
-s*^R<rrJ7?p&>')@K$34qP-T)\$ol2lsTh%!c/D1rr3%Q!4Dh+"j;#Cs$>E;rrH0?p&>&CSc&Kf
-iVg4f>lVWdrjN$<@K3$Jrr3BIs8SH4NjlL"D?$enrjMp-F85bQgUAo,\&JCIG;#Mr\"8?Sen[gZ
-\!r?VOdQ-W"IG;Os2k8L%$R(YKV,`_S1]'dI\ZnO!K<iRrrVKd:]C@p45p2=!K3->rrKf@p&>'T
-2Z3R\*WQ/Q8;ZX3=oGf:EmOcj88>WCDUnc;~>
-"!.E>+oY"=nGiOLJ4Q':Y\F(9!C#B=rrC[M[h5T^s+Mqh\$r2\s.PF]\#s&_q#:A21B'fKA^g\.
-li/"%rrth%K`D'Nb5VDAU3cP5!$2";!HG1>[hOJ#s2@f;\$pmts21i\\$t2ns'E/5[fL`lq#:@.
->Q2)4ER=CY!i_%@r;QeISb<!`WH8%<!Tdkj[f]k-he;tt"'>BB;Z?\)39C2.O@Y5;[oi[TF8`QM
->5uWerO2c3r;QdRl1P&W?,6F="cnXr84[+erreOOo(+=)rsNs&T!u2#L]@D"[ho#C"k:"&Y.)XQ
-rrM7?o`"n3r;QeBVuF.6Lo^P:UT.b3KX(P47fKjtJ@GOX!mgp]rVm"#a8_-[rVlr7!.+YE"nc'C
-s*^R<rrJ7?p&>')@K$34qP-T)\$ol2lsTh%!c/D1rr3%Q!4Dh+"j;#Cs$>E;rrH0?p&>&CSc&Kf
-iVg4f>lVWdrjN$<@K3$Jrr3BIs8SH4NjlL"D?$enrjMp-F85bQgUAo,\&JCIG;#Mr\"8?Sen[gZ
-\!r?VOdQ-W"IG;Os2k8L%$R(YKV,`_S1]'dI\ZnO!K<iRrrVKd:]C@p45p2=!K3->rrKf@p&>'T
-2Z3R\*WQ/Q8;ZX3=oGf:EmOcj88>WCDUnc;~>
-"!.E>+oY"=nGiOLJ4Q':Y\F(9!C#B=rrC[M[h5T^s+Mqh\$r2\s.PF]\#s&_q#:A21B'fKA^g\.
-li/"%rrth%K`D'Nb5VDAU3cP5!$2";!HG1>[hOJ#s2@f;\$pmts21i\\$t2ns'E/5[fL`lq#:@.
->Q2)4ER=CY!i_%@r;QeISb<!`WH8%<!Tdkj[f]k-he;tt"'>BB;Z?\)39C2.O@Y5;[oi[TF8`QM
->5uWerO2c3r;QdRl1P&W?,6F="cnXr84[+erreOOo(+=)rsNs&T!u2#L]@D"[ho#C"k:"&Y.)XQ
-rrM7?o`"n3r;QeBVuF.6Lo^P:UT.b3KX(P47fKjtJ@GOX!mgp]rVm"#a8_-[rVlr7!.+YE"nc'C
-s*^R<rrJ7?p&>')@K$34qP-T)\$ol2lsTh%!c/D1rr3%Q!4Dh+"j;#Cs$>E;rrH0?p&>&CSc&Kf
-iVg4f>lVWdrjN$<@K3$Jrr3BIs8SH4NjlL"D?$enrjMp-F85bQgUAo,\&JCIG;#Mr\"8?Sen[gZ
-\!r?VOdQ-W"IG;Os2k8L%$R(YKV,`_S1]'dI\ZnO!K<iRrrVKd:]C@p45p2=!K3->rrKf@p&>'T
-2Z3R\*WQ/Q8;ZX3=oGf:EmOcj88>WCDUnc;~>
-"!.E>@K+aVr;Q`rJHPNDmOnJ<!C#B9rt+!Ns+Ppms8UV?s*^O>s62?6rrm5&e/6]nr;Qa;qYpcM
-e=;Er;p,+>!MXo6rr=);rrG.?rr3F`PlLb'g].;(SH&WV0`:qO+T;<>"6]4S55Zo5_Z/6Crr3"*
-^@hL,Lm7f:!Ip[5rrK*?rVloQ62gfch#5\orVlsEq8uV7rsUmKs8Sm*mJm2,s1)Y<rr^sSZ#'C=
-!$2";!Aj!5rrHE@rVmFi(nB+*^0^i/Nq35A.KBF4r$r%hs)j7ms8U&>rVlj<qu6[Ho(r@eju2l3
-!$2";!CPT?rs\;\s#T/u49(2%s"_RmrrI\?rr3&oeE6c1"\.)Cs,E*<rrViBl2L\d6/2G>IA$N<
-!Ki<5rrK`?r;R&L5j&+H4l>?\rr3&Z/Ed$4$gQ75s8UhXjo>?Hg\h'P<lXh4!J$a8rrX;AWH8(=
-"TI-TTmQe=$m#BJQu;Bms6)??OGs2="8^pTS,=c:AcD]17+hJ<&U0-*s8U)>s8Prqqu=?:s(8b>
-rrKN?qu7)+E;rqZs8VbKGlLIarr3#elMgebr7'^)rrG4?rr3"WP5YC]]jUO5!Tl<<rs0Y*.qmH"
-s8O,<rsE/Hs6;)ns8Q3>s*t~>
-"!.E>@K+aVr;Q`rJHPNDmOnJ<!C#B9rt+!Ns+Ppms8UV?s*^O>s62?6rrm5&e/6]nr;Qa;qYpcM
-e=;Er;p,+>!MXo6rr=);rrG.?rr3F`PlLb'g].;(SH&WV0`:qO+T;<>"6]4S55Zo5_Z/6Crr3"*
-^@hL,Lm7f:!Ip[5rrK*?rVloQ62gfch#5\orVlsEq8uV7rsUmKs8Sm*mJm2,s1)Y<rr^sSZ#'C=
-!$2";!Aj!5rrHE@rVmFi(nB+*^0^i/Nq35A.KBF4r$r%hs)j7ms8U&>rVlj<qu6[Ho(r@eju2l3
-!$2";!CPT?rs\;\s#T/u49(2%s"_RmrrI\?rr3&oeE6c1"\.)Cs,E*<rrViBl2L\d6/2G>IA$N<
-!Ki<5rrK`?r;R&L5j&+H4l>?\rr3&Z/Ed$4$gQ75s8UhXjo>?Hg\h'P<lXh4!J$a8rrX;AWH8(=
-"TI-TTmQe=$m#BJQu;Bms6)??OGs2="8^pTS,=c:AcD]17+hJ<&U0-*s8U)>s8Prqqu=?:s(8b>
-rrKN?qu7)+E;rqZs8VbKGlLIarr3#elMgebr7'^)rrG4?rr3"WP5YC]]jUO5!Tl<<rs0Y*.qmH"
-s8O,<rsE/Hs6;)ns8Q3>s*t~>
-"!.E>@K+aVr;Q`rJHPNDmOnJ<!C#B9rt+!Ns+Ppms8UV?s*^O>s62?6rrm5&e/6]nr;Qa;qYpcM
-e=;Er;p,+>!MXo6rr=);rrG.?rr3F`PlLb'g].;(SH&WV0`:qO+T;<>"6]4S55Zo5_Z/6Crr3"*
-^@hL,Lm7f:!Ip[5rrK*?rVloQ62gfch#5\orVlsEq8uV7rsUmKs8Sm*mJm2,s1)Y<rr^sSZ#'C=
-!$2";!Aj!5rrHE@rVmFi(nB+*^0^i/Nq35A.KBF4r$r%hs)j7ms8U&>rVlj<qu6[Ho(r@eju2l3
-!$2";!CPT?rs\;\s#T/u49(2%s"_RmrrI\?rr3&oeE6c1"\.)Cs,E*<rrViBl2L\d6/2G>IA$N<
-!Ki<5rrK`?r;R&L5j&+H4l>?\rr3&Z/Ed$4$gQ75s8UhXjo>?Hg\h'P<lXh4!J$a8rrX;AWH8(=
-"TI-TTmQe=$m#BJQu;Bms6)??OGs2="8^pTS,=c:AcD]17+hJ<&U0-*s8U)>s8Prqqu=?:s(8b>
-rrKN?qu7)+E;rqZs8VbKGlLIarr3#elMgebr7'^)rrG4?rr3"WP5YC]]jUO5!Tl<<rs0Y*.qmH"
-s8O,<rsE/Hs6;)ns8Q3>s*t~>
-"!.E>Fo)+AJXc]>rq-0h!C#B>rrMn@rZ)+Z5Q?G(rr38S8H4C6nF56up\tD5YlF#Po_e^h*VfX;
-WcJ,<(]GEU&pj9O!$2";!BD(t*<[.Hs8O,=rrr2os8VI?r;Qfh+9!8_PktFNr:'daqu6\'^@qR.
-Wd+@:rrIV?p&>&lF8c+>rO`"K"3gbn9)\bl,PfJ[rr3-]jo>@VGlI^FoDc@2qu6]%%/h1H.fB;I
-1[4T4!F<M>rt(6GqZ$TP56$WZ*??+'>Q=KrnH8IaFf56=!QA.=rr=):rrFV?qYpTY2Y@"L*W5p<
-ofW3o%!VLH3o]*[s,*$?1@+r>!J-a8rr=\N*WHZN[eTk&+9!8^%MHbZrrJ7?p&>')@Jp-+cqXN>
-"82WS3;rjX2<Xf8!S.q`*<HH`q>L<o<lXh4!J$a>rrMt`r>btZs8%lW*<[SWs.Of=rraABs-SK=
-rrhOCs,`3:rrDlmnGr7]rrGO?rVlnBVZ-T(``E->;9](?qtC&%(&f3V)0#WK;Z7[>'QF(PaSu2B
-Uj2q47/e2-Dts,-!B]9>rrJ%@[email protected]#ju3/;!ua,Xm/?qa')`gR'Ysb61B.:TpAFr@~>
-"!.E>Fo)+AJXc]>rq-0h!C#B>rrMn@rZ)+Z5Q?G(rr38S8H4C6nF56up\tD5YlF#Po_e^h*VfX;
-WcJ,<(]GEU&pj9O!$2";!BD(t*<[.Hs8O,=rrr2os8VI?r;Qfh+9!8_PktFNr:'daqu6\'^@qR.
-Wd+@:rrIV?p&>&lF8c+>rO`"K"3gbn9)\bl,PfJ[rr3-]jo>@VGlI^FoDc@2qu6]%%/h1H.fB;I
-1[4T4!F<M>rt(6GqZ$TP56$WZ*??+'>Q=KrnH8IaFf56=!QA.=rr=):rrFV?qYpTY2Y@"L*W5p<
-ofW3o%!VLH3o]*[s,*$?1@+r>!J-a8rr=\N*WHZN[eTk&+9!8^%MHbZrrJ7?p&>')@Jp-+cqXN>
-"82WS3;rjX2<Xf8!S.q`*<HH`q>L<o<lXh4!J$a>rrMt`r>btZs8%lW*<[SWs.Of=rraABs-SK=
-rrhOCs,`3:rrDlmnGr7]rrGO?rVlnBVZ-T(``E->;9](?qtC&%(&f3V)0#WK;Z7[>'QF(PaSu2B
-Uj2q47/e2-Dts,-!B]9>rrJ%@[email protected]#ju3/;!ua,Xm/?qa')`gR'Ysb61B.:TpAFr@~>
-"!.E>Fo)+AJXc]>rq-0h!C#B>rrMn@rZ)+Z5Q?G(rr38S8H4C6nF56up\tD5YlF#Po_e^h*VfX;
-WcJ,<(]GEU&pj9O!$2";!BD(t*<[.Hs8O,=rrr2os8VI?r;Qfh+9!8_PktFNr:'daqu6\'^@qR.
-Wd+@:rrIV?p&>&lF8c+>rO`"K"3gbn9)\bl,PfJ[rr3-]jo>@VGlI^FoDc@2qu6]%%/h1H.fB;I
-1[4T4!F<M>rt(6GqZ$TP56$WZ*??+'>Q=KrnH8IaFf56=!QA.=rr=):rrFV?qYpTY2Y@"L*W5p<
-ofW3o%!VLH3o]*[s,*$?1@+r>!J-a8rr=\N*WHZN[eTk&+9!8^%MHbZrrJ7?p&>')@Jp-+cqXN>
-"82WS3;rjX2<Xf8!S.q`*<HH`q>L<o<lXh4!J$a>rrMt`r>btZs8%lW*<[SWs.Of=rraABs-SK=
-rrhOCs,`3:rrDlmnGr7]rrGO?rVlnBVZ-T(``E->;9](?qtC&%(&f3V)0#WK;Z7[>'QF(PaSu2B
-Uj2q47/e2-Dts,-!B]9>rrJ%@[email protected]#ju3/;!ua,Xm/?qa')`gR'Ysb61B.:TpAFr@~>
-"!.E>Fo)+=JXcK8!C#B>s8S,ZrrrD25Q?G(rr35R8H7pi/1a!Yrs!;Ds8UtYjSf)Y*W?!=j7N?N
-"KHMB;p,+>!MXo6rrGC?rVlmYj8/cU*W#d@m4eS?kjSQ)rVln:Xn_nrf_tgN?G?F=!qFb*rVlrl
-R#h.E!q(Q@p&>&lF8c+>q;2)M""Woj9)\bl,PfJ[rr3-]jo>@VGl7RB\RYU<"5*XYD"mr11[4T4
-!F<M>rrJ1?rr3#U55bE]o-sG6#'Ggrs8U&>rVlj<qu6dKo)J:BrVlo\2Y@"L*W5p<htd9O%$HMJ
-3o]*[s,*$?1;s1l!J-a>rrVrDjneuXNK=&<!qat*qYpSET`"fjOc/o4!P;e<rrLJ@r;QfZ3<&pZ
-i@O0krrVK7o(r@e6/2>;!ER55rrIY@rVlo(C]=>:fH("]kPkJiq'?!6HiO-#)uor*K`:uSkV`C%
-N;ihXqVLrG#=R5EpYc'qVZ-T!``E->;9\t<!G8h<rt/POs8VeRE;rqZs8V_IGlQ^rrr3"hJc>ZN
-r6sX(rrucDs8VSDV>^Dp]jUO5!Tl<<rs0Y+/83N"s8O,9rrMC?qu;0~>
-"!.E>Fo)+=JXcK8!C#B>s8S,ZrrrD25Q?G(rr35R8H7pi/1a!Yrs!;Ds8UtYjSf)Y*W?!=j7N?N
-"KHMB;p,+>!MXo6rrGC?rVlmYj8/cU*W#d@m4eS?kjSQ)rVln:Xn_nrf_tgN?G?F=!qFb*rVlrl
-R#h.E!q(Q@p&>&lF8c+>q;2)M""Woj9)\bl,PfJ[rr3-]jo>@VGl7RB\RYU<"5*XYD"mr11[4T4
-!F<M>rrJ1?rr3#U55bE]o-sG6#'Ggrs8U&>rVlj<qu6dKo)J:BrVlo\2Y@"L*W5p<htd9O%$HMJ
-3o]*[s,*$?1;s1l!J-a>rrVrDjneuXNK=&<!qat*qYpSET`"fjOc/o4!P;e<rrLJ@r;QfZ3<&pZ
-i@O0krrVK7o(r@e6/2>;!ER55rrIY@rVlo(C]=>:fH("]kPkJiq'?!6HiO-#)uor*K`:uSkV`C%
-N;ihXqVLrG#=R5EpYc'qVZ-T!``E->;9\t<!G8h<rt/POs8VeRE;rqZs8V_IGlQ^rrr3"hJc>ZN
-r6sX(rrucDs8VSDV>^Dp]jUO5!Tl<<rs0Y+/83N"s8O,9rrMC?qu;0~>
-"!.E>Fo)+=JXcK8!C#B>s8S,ZrrrD25Q?G(rr35R8H7pi/1a!Yrs!;Ds8UtYjSf)Y*W?!=j7N?N
-"KHMB;p,+>!MXo6rrGC?rVlmYj8/cU*W#d@m4eS?kjSQ)rVln:Xn_nrf_tgN?G?F=!qFb*rVlrl
-R#h.E!q(Q@p&>&lF8c+>q;2)M""Woj9)\bl,PfJ[rr3-]jo>@VGl7RB\RYU<"5*XYD"mr11[4T4
-!F<M>rrJ1?rr3#U55bE]o-sG6#'Ggrs8U&>rVlj<qu6dKo)J:BrVlo\2Y@"L*W5p<htd9O%$HMJ
-3o]*[s,*$?1;s1l!J-a>rrVrDjneuXNK=&<!qat*qYpSET`"fjOc/o4!P;e<rrLJ@r;QfZ3<&pZ
-i@O0krrVK7o(r@e6/2>;!ER55rrIY@rVlo(C]=>:fH("]kPkJiq'?!6HiO-#)uor*K`:uSkV`C%
-N;ihXqVLrG#=R5EpYc'qVZ-T!``E->;9\t<!G8h<rt/POs8VeRE;rqZs8V_IGlQ^rrr3"hJc>ZN
-r6sX(rrucDs8VSDV>^Dp]jUO5!Tl<<rs0Y+/83N"s8O,9rrMC?qu;0~>
-"!.E><;j6._>jOdS,<3sfsWK(^&S,8L:4Ot5<o1%Qi@!feO]_7NW-?d`V9B5Cp<p=%(fsJe$c\"
-[^O]cMOa[S"Ho5R;p,+>!MXo6rrM@?rVln=WrBF,f`(mN*W#dAnm/]4I)#\h[JmT8GfBIX!*]?0
-!HHNdrrT>'N;`bW_HQg9!M+c5rrK*?rVlo[Ac9%>>P6lerO)f1qq5fb[KU*@s8Sm>r;QfBF8`NL
->Q;`frO2V'!Aj!5rrHE@rVlo%L&SL]W-/%<!V7c7rsa*)S[PttL]@D![M?6mrVm"5Z*os^rVlo\
-2Y@"L*W5p<Gc(JK%#:qa3o]FGs,*$?1.V>P!J%]ZrrUOIC&7i1NK=&<!l+e^qYpSET`"fjOc/o4
-!P;e<rrLJ@r;Qfa@K*\:C_,_.rrRiR[JKn(6/2>;!ER55rrIY@rVlo>GQ,#R<ZM.VHN(>]ZXWsI
-I^Z[i'EA*"K`:uSkV`CEL&SL]WH@k6#C<5TTn35fVZ-T!``E->;9\t<!Ki`J[M6pbs,3AT[\#9n
-s+R&Q[[]!qs*pdB[K2>`rr3&c!)NRn"CAOFOdu@L!PMn6rrM7?r;R$Cs8Tc(M<Y%DrO)jhs8V@>
-qu;0~>
-"!.E><;j6._>jOdS,<3sfsWK(^&S,8L:4Ot5<o1%Qi@!feO]_7NW-?d`V9B5Cp<p=%(fsJe$c\"
-[^O]cMOa[S"Ho5R;p,+>!MXo6rrM@?rVln=WrBF,f`(mN*W#dAnm/]4I)#\h[JmT8GfBIX!*]?0
-!HHNdrrT>'N;`bW_HQg9!M+c5rrK*?rVlo[Ac9%>>P6lerO)f1qq5fb[KU*@s8Sm>r;QfBF8`NL
->Q;`frO2V'!Aj!5rrHE@rVlo%L&SL]W-/%<!V7c7rsa*)S[PttL]@D![M?6mrVm"5Z*os^rVlo\
-2Y@"L*W5p<Gc(JK%#:qa3o]FGs,*$?1.V>P!J%]ZrrUOIC&7i1NK=&<!l+e^qYpSET`"fjOc/o4
-!P;e<rrLJ@r;Qfa@K*\:C_,_.rrRiR[JKn(6/2>;!ER55rrIY@rVlo>GQ,#R<ZM.VHN(>]ZXWsI
-I^Z[i'EA*"K`:uSkV`CEL&SL]WH@k6#C<5TTn35fVZ-T!``E->;9\t<!Ki`J[M6pbs,3AT[\#9n
-s+R&Q[[]!qs*pdB[K2>`rr3&c!)NRn"CAOFOdu@L!PMn6rrM7?r;R$Cs8Tc(M<Y%DrO)jhs8V@>
-qu;0~>
-"!.E><;j6._>jOdS,<3sfsWK(^&S,8L:4Ot5<o1%Qi@!feO]_7NW-?d`V9B5Cp<p=%(fsJe$c\"
-[^O]cMOa[S"Ho5R;p,+>!MXo6rrM@?rVln=WrBF,f`(mN*W#dAnm/]4I)#\h[JmT8GfBIX!*]?0
-!HHNdrrT>'N;`bW_HQg9!M+c5rrK*?rVlo[Ac9%>>P6lerO)f1qq5fb[KU*@s8Sm>r;QfBF8`NL
->Q;`frO2V'!Aj!5rrHE@rVlo%L&SL]W-/%<!V7c7rsa*)S[PttL]@D![M?6mrVm"5Z*os^rVlo\
-2Y@"L*W5p<Gc(JK%#:qa3o]FGs,*$?1.V>P!J%]ZrrUOIC&7i1NK=&<!l+e^qYpSET`"fjOc/o4
-!P;e<rrLJ@r;Qfa@K*\:C_,_.rrRiR[JKn(6/2>;!ER55rrIY@rVlo>GQ,#R<ZM.VHN(>]ZXWsI
-I^Z[i'EA*"K`:uSkV`CEL&SL]WH@k6#C<5TTn35fVZ-T!``E->;9\t<!Ki`J[M6pbs,3AT[\#9n
-s+R&Q[[]!qs*pdB[K2>`rr3&c!)NRn"CAOFOdu@L!PMn6rrM7?r;R$Cs8Tc(M<Y%DrO)jhs8V@>
-qu;0~>
-!Zh<`r+6(Zs8TIDqu6Z!ral.Qrr38'AnGcCN;p?%rr3,`OoNUMral1M\bQ1*VpPGC"4j.FUASU*
-V>pRRral;$s8SGCrr3#>YP.ttno2/<rr@6AAcSt4rr@9=rr_7mB".d>!,):C!5/(+!;?A'!65!;
-!mYDhrVloQSGW<fj+Xf2rs,MlR@3@?s4I9^"6KR_e,<k\lMpn0ral>jGQ7]bY5A5!_u40Lq>^K/
-rFQ<6s8UK7R31\drrZPJRA9c]!36$1!."[email protected];Qh8As<5o"1">P
-2Y@"O(n$f.rr2tGral;2s8RrDrr3,2^AftMral/8rVlrZAu5A(!P?#CrrUkcYPS8)Z,ZhDp6h=M
-MtR)U]/uFKj8]/>Pl(I\hYq*gc8FearrTT?e,'(MNTpKChjKlh`qB?:J6nY3qu?]2ral<"GQ7]S
-ral.Frr383AnL-Fs8TpCrr3,kL&_1Rral.Uo`#,DAqU-`Xi^SB"l5XIs-DU?rrA2\AcS"nrt(-$
-AqnR0s8RjdArFa5s8R]MAcSS(rrVe(Q2L[^AcS:urr]!`EFAJ>#Nd.sRF;-8GQ%ODV:,D=rFQ2O
-s8VYCqu;0~>
-!Zh<`r+6(Zs8TIDqu6Z!ral.Qrr38'AnGcCN;p?%rr3,`OoNUMral1M\bQ1*VpPGC"4j.FUASU*
-V>pRRral;$s8SGCrr3#>YP.ttno2/<rr@6AAcSt4rr@9=rr_7mB".d>!,):C!5/(+!;?A'!65!;
-!mYDhrVloQSGW<fj+Xf2rs,MlR@3@?s4I9^"6KR_e,<k\lMpn0ral>jGQ7]bY5A5!_u40Lq>^K/
-rFQ<6s8UK7R31\drrZPJRA9c]!36$1!."[email protected];Qh8As<5o"1">P
-2Y@"O(n$f.rr2tGral;2s8RrDrr3,2^AftMral/8rVlrZAu5A(!P?#CrrUkcYPS8)Z,ZhDp6h=M
-MtR)U]/uFKj8]/>Pl(I\hYq*gc8FearrTT?e,'(MNTpKChjKlh`qB?:J6nY3qu?]2ral<"GQ7]S
-ral.Frr383AnL-Fs8TpCrr3,kL&_1Rral.Uo`#,DAqU-`Xi^SB"l5XIs-DU?rrA2\AcS"nrt(-$
-AqnR0s8RjdArFa5s8R]MAcSS(rrVe(Q2L[^AcS:urr]!`EFAJ>#Nd.sRF;-8GQ%ODV:,D=rFQ2O
-s8VYCqu;0~>
-!Zh<`r+6(Zs8TIDqu6Z!ral.Qrr38'AnGcCN;p?%rr3,`OoNUMral1M\bQ1*VpPGC"4j.FUASU*
-V>pRRral;$s8SGCrr3#>YP.ttno2/<rr@6AAcSt4rr@9=rr_7mB".d>!,):C!5/(+!;?A'!65!;
-!mYDhrVloQSGW<fj+Xf2rs,MlR@3@?s4I9^"6KR_e,<k\lMpn0ral>jGQ7]bY5A5!_u40Lq>^K/
-rFQ<6s8UK7R31\drrZPJRA9c]!36$1!."[email protected];Qh8As<5o"1">P
-2Y@"O(n$f.rr2tGral;2s8RrDrr3,2^AftMral/8rVlrZAu5A(!P?#CrrUkcYPS8)Z,ZhDp6h=M
-MtR)U]/uFKj8]/>Pl(I\hYq*gc8FearrTT?e,'(MNTpKChjKlh`qB?:J6nY3qu?]2ral<"GQ7]S
-ral.Frr383AnL-Fs8TpCrr3,kL&_1Rral.Uo`#,DAqU-`Xi^SB"l5XIs-DU?rrA2\AcS"nrt(-$
-AqnR0s8RjdArFa5s8R]MAcSS(rrVe(Q2L[^AcS:urr]!`EFAJ>#Nd.sRF;-8GQ%ODV:,D=rFQ2O
-s8VYCqu;0~>
-!$0_l!I^U>rrL>?c2Rh,WkJE5h6Z_Q!7h($!9VW-!65"j!;,sa"0dE1O3[b-Tn@ugo`##OK7gQ"
-rrFn@g]%9Grdt3jp&>$Krdt4,o)A_JkOAKOfD^C&j7WEP_>]&eqXFLccb08W!$.[2"-%qcZ1\+s
-oDX@BaQNSR~>
-!$0_l!I^U>rrL>?c2Rh,WkJE5h6Z_Q!7h($!9VW-!65"j!;,sa"0dE1O3[b-Tn@ugo`##OK7gQ"
-rrFn@g]%9Grdt3jp&>$Krdt4,o)A_JkOAKOfD^C&j7WEP_>]&eqXFLccb08W!$.[2"-%qcZ1\+s
-oDX@BaQNSR~>
-!$0_l!I^U>rrL>?c2Rh,WkJE5h6Z_Q!7h($!9VW-!65"j!;,sa"0dE1O3[b-Tn@ugo`##OK7gQ"
-rrFn@g]%9Grdt3jp&>$Krdt4,o)A_JkOAKOfD^C&j7WEP_>]&eqXFLccb08W!$.[2"-%qcZ1\+s
-oDX@BaQNSR~>
-!$0_l!R>og?NFuWJcC<$dJj5&laHfo2<W*]!Si8*?N?dNs6ou<~>
-!$0_l!R>og?NFuWJcC<$dJj5&laHfo2<W*]!Si8*?N?dNs6ou<~>
-!$0_l!R>og?NFuWJcC<$dJj5&laHfo2<W*]!Si8*?N?dNs6ou<~>
-!$0\k!7h(]!6TlmJcF*s!Qk2HrrL:<aSu7trk&7.JcG3=J,~>
-!$0\k!7h(]!6TlmJcF*s!Qk2HrrL:<aSu7trk&7.JcG3=J,~>
-!$0\k!7h(]!6TlmJcF*s!Qk2HrrL:<aSu7trk&7.JcG3=J,~>
-!$..#"#_JQH%H!Hs+13$s7lVE~>
-!$..#"#_JQH%H!Hs+13$s7lVE~>
-!$..#"#_JQH%H!Hs+13$s7lVE~>
-!$1P.",Is-hrXk>C)m`\rrQ[N'D)5,m2m?Wo_8@e73")Lrr`#hZsnUdJcC<$JcGNFJ,~>
-!$1P.",Is-hrXk>C)m`\rrQ[N'D)5,m2m?Wo_8@e73")Lrr`#hZsnUdJcC<$JcGNFJ,~>
-!$1P.",Is-hrXk>C)m`\rrQ[N'D)5,m2m?Wo_8@e73")Lrr`#hZsnUdJcC<$JcGNFJ,~>
-!$1J,!C#B#rr=)9rr=)2rraJBs/L,5rrMX?lMgms@Y+Q1s+13$s7lVE~>
-!$1J,!C#B#rr=)9rr=)2rraJBs/L,5rrMX?lMgms@Y+Q1s+13$s7lVE~>
-!$1J,!C#B#rr=)9rr=)2rraJBs/L,5rrMX?lMgms@Y+Q1s+13$s7lVE~>
-#9Ej*e^C_-[/U(*g&A5V[f$.+52Q#5"kqkTZ*D%BrrC@DYlMW<rr=)9rr=)9rrKOBr;R!Er;X^+
-s8Tq7YlN)JrrMX?r;Qc0rilIPrr2u0rilIRr;Qf0@Y+Q1s+13$s7lVE~>
-#9Ej*e^C_-[/U(*g&A5V[f$.+52Q#5"kqkTZ*D%BrrC@DYlMW<rr=)9rr=)9rrKOBr;R!Er;X^+
-s8Tq7YlN)JrrMX?r;Qc0rilIPrr2u0rilIRr;Qf0@Y+Q1s+13$s7lVE~>
-#9Ej*e^C_-[/U(*g&A5V[f$.+52Q#5"kqkTZ*D%BrrC@DYlMW<rr=)9rr=)9rrKOBr;R!Er;X^+
-s8Tq7YlN)JrrMX?r;Qc0rilIPrr2u0rilIRr;Qf0@Y+Q1s+13$s7lVE~>
-$Q]8F7!rccCo%*_JGs<bDQ*O6!C#B6rs=B]GACu7ZN&$mrbDOU[f-4+*W#d9*W#d:$nqPY!?h=<
-rr@rUCB8b%rr3#h/,fJKY]9YX"F\VrXDe)R!IiJqrrK`@JcC<$JcC<$q#>j~>
-$Q]8F7!rccCo%*_JGs<bDQ*O6!C#B6rs=B]GACu7ZN&$mrbDOU[f-4+*W#d9*W#d:$nqPY!?h=<
-rr@rUCB8b%rr3#h/,fJKY]9YX"F\VrXDe)R!IiJqrrK`@JcC<$JcC<$q#>j~>
-$Q]8F7!rccCo%*_JGs<bDQ*O6!C#B6rs=B]GACu7ZN&$mrbDOU[f-4+*W#d9*W#d:$nqPY!?h=<
-rr@rUCB8b%rr3#h/,fJKY]9YX"F\VrXDe)R!IiJqrrK`@JcC<$JcC<$q#>j~>
-$Q]8F50X',pEop4IfB?JmOnJ<!C#B>rrBt7G70i=Ki$S)s4'[?I@pN=!R+C=rr=)9rr=)9rrJ+N
-rr3,"G7Sk^q>UJiHN*pFnLOS<!CGQ?rrgQfs#K-=rrIq?rVlo1@Y+Q1s+13$s7lVE~>
-$Q]8F50X',pEop4IfB?JmOnJ<!C#B>rrBt7G70i=Ki$S)s4'[?I@pN=!R+C=rr=)9rr=)9rrJ+N
-rr3,"G7Sk^q>UJiHN*pFnLOS<!CGQ?rrgQfs#K-=rrIq?rVlo1@Y+Q1s+13$s7lVE~>
-$Q]8F50X',pEop4IfB?JmOnJ<!C#B>rrBt7G70i=Ki$S)s4'[?I@pN=!R+C=rr=)9rr=)9rrJ+N
-rr3,"G7Sk^q>UJiHN*pFnLOS<!CGQ?rrgQfs#K-=rrIq?rVlo1@Y+Q1s+13$s7lVE~>
-"!.E>FoMCDpEop4/cJoS<%e.L!C#B>rrC[KV$"@0KpVf="P$'CI@pN=!R+C=rr=)9rr=)4rrg<;
-'r/;;rr@KH=ogX0rr3#h/,fJK]Oh(G"JPkq3DocZ!AKc:rrK`@JcC<$JcC<$q#>j~>
-"!.E>FoMCDpEop4/cJoS<%e.L!C#B>rrC[KV$"@0KpVf="P$'CI@pN=!R+C=rr=)9rr=)4rrg<;
-'r/;;rr@KH=ogX0rr3#h/,fJK]Oh(G"JPkq3DocZ!AKc:rrK`@JcC<$JcC<$q#>j~>
-"!.E>FoMCDpEop4/cJoS<%e.L!C#B>rrC[KV$"@0KpVf="P$'CI@pN=!R+C=rr=)9rr=)4rrg<;
-'r/;;rr@KH=ogX0rr3#h/,fJK]Oh(G"JPkq3DocZ!AKc:rrK`@JcC<$JcC<$q#>j~>
-"!.E>FoMCDpEop4?i@e@c2IYC52Q#5!JQm>rrgkCs*^O=rrL>?rVlj<qYpO9oD\h6r;HWrI&?nZ
-!IK.lrrMX?r;Qc>rkS_oVuJcYrP8KqrVlo1@Y+Q1s+13$s7lVE~>
-"!.E>FoMCDpEop4?i@e@c2IYC52Q#5!JQm>rrgkCs*^O=rrL>?rVlj<qYpO9oD\h6r;HWrI&?nZ
-!IK.lrrMX?r;Qc>rkS_oVuJcYrP8KqrVlo1@Y+Q1s+13$s7lVE~>
-"!.E>FoMCDpEop4?i@e@c2IYC52Q#5!JQm>rrgkCs*^O=rrL>?rVlj<qYpO9oD\h6r;HWrI&?nZ
-!IK.lrrMX?r;Qc>rkS_oVuJcYrP8KqrVlo1@Y+Q1s+13$s7lVE~>
-"!.E>FoMCDpEop4Ie`pD52Q#5$&'&,s8UV?s*^O=rrL>?rVlj<qYpO9qYpRH9)S\i+T23<##i\E
-s2Pk#rr3#h/,fJK>2T>Z"HeWB3TKo7!P;fls+13$s+14Fs*t~>
-"!.E>FoMCDpEop4Ie`pD52Q#5$&'&,s8UV?s*^O=rrL>?rVlj<qYpO9qYpRH9)S\i+T23<##i\E
-s2Pk#rr3#h/,fJK>2T>Z"HeWB3TKo7!P;fls+13$s+14Fs*t~>
-"!.E>FoMCDpEop4Ie`pD52Q#5$&'&,s8UV?s*^O=rrL>?rVlj<qYpO9qYpRH9)S\i+T23<##i\E
-s2Pk#rr3#h/,fJK>2T>Z"HeWB3TKo7!P;fls+13$s+14Fs*t~>
-"!.EGKDtlRpH/ESNrC%!/H5YPL`IBR1\^nUKp>sb*CB](rG_`V#YFsos(WPm*Duh9"CiGj*Ei=?
-!@1&1rrG%UrVmK-9-#$QWJCNR73*9eGQ7^@4oQH)IJs3D2?"TrLAq2TkiSgQJcC<$JcC<$q#>j~>
-"!.EGKDtlRpH/ESNrC%!/H5YPL`IBR1\^nUKp>sb*CB](rG_`V#YFsos(WPm*Duh9"CiGj*Ei=?
-!@1&1rrG%UrVmK-9-#$QWJCNR73*9eGQ7^@4oQH)IJs3D2?"TrLAq2TkiSgQJcC<$JcC<$q#>j~>
-"!.EGKDtlRpH/ESNrC%!/H5YPL`IBR1\^nUKp>sb*CB](rG_`V#YFsos(WPm*Duh9"CiGj*Ei=?
-!@1&1rrG%UrVmK-9-#$QWJCNR73*9eGQ7^@4oQH)IJs3D2?"TrLAq2TkiSgQJcC<$JcC<$q#>j~>
-!$1"t!JQlGrrY\J2M6S\JcC<$JcGNFJ,~>
-!$1"t!JQlGrrY\J2M6S\JcC<$JcGNFJ,~>
-!$1"t!JQlGrrY\J2M6S\JcC<$JcGNFJ,~>
-!$1"t!JQkks+13$s+13Hs*t~>
-!$1"t!JQkks+13$s+13Hs*t~>
-!$1"t!JQkks+13$s+13Hs*t~>
-!$1"t!P?=%s+13$s+13Hs*t~>
-!$1"t!P?=%s+13$s+13Hs*t~>
-!$1"t!P?=%s+13$s+13Hs*t~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$.@)!V"X)rrM*>JcC<$JcFU,J,~>
-!$.@)!V"X)rrM*>JcC<$JcFU,J,~>
-!$.@)!V"X)rrM*>JcC<$JcFU,J,~>
-!Zh<ur1X1qq#:BJe+3M@aJ,F)rVlu=U8%SZrrL7$rr3)_`W*sUU&`:0rrBk4U&`O-rrVhUQM1=Z
-Z2;uL!p66)pAY0d\+'Cuce\R"!9*mN!;6?k!jdU@JcC<$JcFX-J,~>
-!Zh<ur1X1qq#:BJe+3M@aJ,F)rVlu=U8%SZrrL7$rr3)_`W*sUU&`:0rrBk4U&`O-rrVhUQM1=Z
-Z2;uL!p66)pAY0d\+'Cuce\R"!9*mN!;6?k!jdU@JcC<$JcFX-J,~>
-!Zh<ur1X1qq#:BJe+3M@aJ,F)rVlu=U8%SZrrL7$rr3)_`W*sUU&`:0rrBk4U&`O-rrVhUQM1=Z
-Z2;uL!p66)pAY0d\+'Cuce\R"!9*mN!;6?k!jdU@JcC<$JcFX-J,~>
-"!.E>3;n.'NqiVTQA4u1"0d(en,<7gXEkNRpAY/0Yl=Y*]4(_L=T*OGZ2">!V>Y]@9mZ7-!T6*5
-rrFP?lMgnMW9aHbgNpR2rrLi`rVloY3V!+Sc@:E's8V55rH\HtrVln5Z@W%,s+14-s*t~>
-"!.E>3;n.'NqiVTQA4u1"0d(en,<7gXEkNRpAY/0Yl=Y*]4(_L=T*OGZ2">!V>Y]@9mZ7-!T6*5
-rrFP?lMgnMW9aHbgNpR2rrLi`rVloY3V!+Sc@:E's8V55rH\HtrVln5Z@W%,s+14-s*t~>
-"!.E>3;n.'NqiVTQA4u1"0d(en,<7gXEkNRpAY/0Yl=Y*]4(_L=T*OGZ2">!V>Y]@9mZ7-!T6*5
-rrFP?lMgnMW9aHbgNpR2rrLi`rVloY3V!+Sc@:E's8V55rH\HtrVln5Z@W%,s+14-s*t~>
-"!.E>Fn>V6QA4o/!A3d;rrFG?pAY/0Yl=Y*]4(_L\aTP"fm1^.rrW1;YP%nr..lg)!RjX#rrKB?
-rVloY3V*1UdsK?QFR&nK;Z6UqU](2o_KOsjs+13$s5<p-~>
-"!.E>Fn>V6QA4o/!A3d;rrFG?pAY/0Yl=Y*]4(_L\aTP"fm1^.rrW1;YP%nr..lg)!RjX#rrKB?
-rVloY3V*1UdsK?QFR&nK;Z6UqU](2o_KOsjs+13$s5<p-~>
-"!.E>Fn>V6QA4o/!A3d;rrFG?pAY/0Yl=Y*]4(_L\aTP"fm1^.rrW1;YP%nr..lg)!RjX#rrKB?
-rVloY3V*1UdsK?QFR&nK;Z6UqU](2o_KOsjs+13$s5<p-~>
-"!.E>Fo)+<VuB<p=9&;dL5\bu?2jj(S,Q%\A,Q?-/arT:!@@L6rsdIoh#HGJd/RUdBM2!LoD\j+
-?1.^nrZD%;!*T:o"Ju.u.-LS&!3?,!!)<Gc&@)98@/nYJ9=Os$<^%9l9>1-#!WHO+rs")2s5QaF
-V>gK%nk1e^92!h8j#P!U9*!]@rs@Uudf9?f>5QH?p\t7gd"24Js+14.s*t~>
-"!.E>Fo)+<VuB<p=9&;dL5\bu?2jj(S,Q%\A,Q?-/arT:!@@L6rsdIoh#HGJd/RUdBM2!LoD\j+
-?1.^nrZD%;!*T:o"Ju.u.-LS&!3?,!!)<Gc&@)98@/nYJ9=Os$<^%9l9>1-#!WHO+rs")2s5QaF
-V>gK%nk1e^92!h8j#P!U9*!]@rs@Uudf9?f>5QH?p\t7gd"24Js+14.s*t~>
-"!.E>Fo)+<VuB<p=9&;dL5\bu?2jj(S,Q%\A,Q?-/arT:!@@L6rsdIoh#HGJd/RUdBM2!LoD\j+
-?1.^nrZD%;!*T:o"Ju.u.-LS&!3?,!!)<Gc&@)98@/nYJ9=Os$<^%9l9>1-#!WHO+rs")2s5QaF
-V>gK%nk1e^92!h8j#P!U9*!]@rs@Uudf9?f>5QH?p\t7gd"24Js+14.s*t~>
-"!.E>(&ffgmf3<kIf@_'``2u((m`Rs^g$i5M>km']41a=!A3d;rrFG?p&>IscMuQcs8QRQ\'`Tr
-L%YHIj&b4-rrN*@qu6ZGrm:k!Y5]n0rm:jp[JreDrm;:"]`6A3=4,E7_uJ2f4OMREq#:Bn+8u3D
-:!`k7d=?cHrsJ\OO]TrXo`*qYAcC'X:[RuX!VbILrr^mPb#8!6!DUpls+13$s5<p-~>
-"!.E>(&ffgmf3<kIf@_'``2u((m`Rs^g$i5M>km']41a=!A3d;rrFG?p&>IscMuQcs8QRQ\'`Tr
-L%YHIj&b4-rrN*@qu6ZGrm:k!Y5]n0rm:jp[JreDrm;:"]`6A3=4,E7_uJ2f4OMREq#:Bn+8u3D
-:!`k7d=?cHrsJ\OO]TrXo`*qYAcC'X:[RuX!VbILrr^mPb#8!6!DUpls+13$s5<p-~>
-"!.E>(&ffgmf3<kIf@_'``2u((m`Rs^g$i5M>km']41a=!A3d;rrFG?p&>IscMuQcs8QRQ\'`Tr
-L%YHIj&b4-rrN*@qu6ZGrm:k!Y5]n0rm:jp[JreDrm;:"]`6A3=4,E7_uJ2f4OMREq#:Bn+8u3D
-:!`k7d=?cHrsJ\OO]TrXo`*qYAcC'X:[RuX!VbILrr^mPb#8!6!DUpls+13$s5<p-~>
-"!.E>D>ro*rr<"nIfAsJoC;jHIJNpCju<=#M#R#Idm*g2!A3d;rrFG?p&>J%a8XI[s8V`Yr;Zf'
-C%_K,e4B!,!WF2<rrD`koE9K1s!Zt-rrdSCruh:>rs`nKs7mi/s8QrHs8UP>p&>9q+9/Bms%Ui=
-rrJ[@r;Qf&C]487j#-H-rrFt?nc&g9;ZHc1*>SMP!DUpls+13$s5<p-~>
-"!.E>D>ro*rr<"nIfAsJoC;jHIJNpCju<=#M#R#Idm*g2!A3d;rrFG?p&>J%a8XI[s8V`Yr;Zf'
-C%_K,e4B!,!WF2<rrD`koE9K1s!Zt-rrdSCruh:>rs`nKs7mi/s8QrHs8UP>p&>9q+9/Bms%Ui=
-rrJ[@r;Qf&C]487j#-H-rrFt?nc&g9;ZHc1*>SMP!DUpls+13$s5<p-~>
-"!.E>D>ro*rr<"nIfAsJoC;jHIJNpCju<=#M#R#Idm*g2!A3d;rrFG?p&>J%a8XI[s8V`Yr;Zf'
-C%_K,e4B!,!WF2<rrD`koE9K1s!Zt-rrdSCruh:>rs`nKs7mi/s8QrHs8UP>p&>9q+9/Bms%Ui=
-rrJ[@r;Qf&C]487j#-H-rrFt?nc&g9;ZHc1*>SMP!DUpls+13$s5<p-~>
-"!.E>Fo)+<Q2W071uA7uLAq2Uju<=#(B#W]?2ad(/arT:!@@L4rrOq7-MdZBZYB.5!W"&-rrN*@
-r;QfS2?#!,'V,1Oo`"jnGbtE_rVlg"Dls'8,PqE@dn064#Q5bEV0Dr6ci3qFSUgY<!O6G=rrM.?
-rVlmTkjeZRb#83<!$2";!DUpls+13$s5<p-~>
-"!.E>Fo)+<Q2W071uA7uLAq2Uju<=#(B#W]?2ad(/arT:!@@L4rrOq7-MdZBZYB.5!W"&-rrN*@
-r;QfS2?#!,'V,1Oo`"jnGbtE_rVlg"Dls'8,PqE@dn064#Q5bEV0Dr6ci3qFSUgY<!O6G=rrM.?
-rVlmTkjeZRb#83<!$2";!DUpls+13$s5<p-~>
-"!.E>Fo)+<Q2W071uA7uLAq2Uju<=#(B#W]?2ad(/arT:!@@L4rrOq7-MdZBZYB.5!W"&-rrN*@
-r;QfS2?#!,'V,1Oo`"jnGbtE_rVlg"Dls'8,PqE@dn064#Q5bEV0Dr6ci3qFSUgY<!O6G=rrM.?
-rVlmTkjeZRb#83<!$2";!DUpls+13$s5<p-~>
-"!.E>Fo21>jkTk8"R[oBQA5D="QhZCNfNo7!A3d;rrFG?o`"tIi[4[)!S-Q9rrKH?rVlo1ao)/>
-^0^1+!rc-@rVm0Ym/R+I?(CpC\,QC1GbtE_rVlg"Dls'8,PqEDdn0T>e*Zu2#Q5b5OaQ._ci3qF
-SUgY<#I/(Es2t)r3W8sY2!FK0!Qn==rr=)<rrUech1>TWs+14.s*t~>
-"!.E>Fo21>jkTk8"R[oBQA5D="QhZCNfNo7!A3d;rrFG?o`"tIi[4[)!S-Q9rrKH?rVlo1ao)/>
-^0^1+!rc-@rVm0Ym/R+I?(CpC\,QC1GbtE_rVlg"Dls'8,PqEDdn0T>e*Zu2#Q5b5OaQ._ci3qF
-SUgY<#I/(Es2t)r3W8sY2!FK0!Qn==rr=)<rrUech1>TWs+14.s*t~>
-"!.E>Fo21>jkTk8"R[oBQA5D="QhZCNfNo7!A3d;rrFG?o`"tIi[4[)!S-Q9rrKH?rVlo1ao)/>
-^0^1+!rc-@rVm0Ym/R+I?(CpC\,QC1GbtE_rVlg"Dls'8,PqEDdn0T>e*Zu2#Q5b5OaQ._ci3qF
-SUgY<#I/(Es2t)r3W8sY2!FK0!Qn==rr=)<rrUech1>TWs+14.s*t~>
-"!.E>8H#(]XT-4grga1[IfG^grr3,`2ugF@rga%hrr3,?SK*iqrr3,<SJRZup&>)DQ?rQ1!M>AN
-SH4YDrVlm#2uN[U*U<Y*i&pu<$%SG7SVAkhs!V@USHOD^s)sq3SHO>bs7mo9rrqJ)SXk#Wq>Us(
-Boe[jKQQ2Qn=<r_S`TkN#L@afST*rU3W8sY2!FK0!T%ttSH*F'rrHl?JcC<$JcFX-J,~>
-"!.E>8H#(]XT-4grga1[IfG^grr3,`2ugF@rga%hrr3,?SK*iqrr3,<SJRZup&>)DQ?rQ1!M>AN
-SH4YDrVlm#2uN[U*U<Y*i&pu<$%SG7SVAkhs!V@USHOD^s)sq3SHO>bs7mo9rrqJ)SXk#Wq>Us(
-Boe[jKQQ2Qn=<r_S`TkN#L@afST*rU3W8sY2!FK0!T%ttSH*F'rrHl?JcC<$JcFX-J,~>
-"!.E>8H#(]XT-4grga1[IfG^grr3,`2ugF@rga%hrr3,?SK*iqrr3,<SJRZup&>)DQ?rQ1!M>AN
-SH4YDrVlm#2uN[U*U<Y*i&pu<$%SG7SVAkhs!V@USHOD^s)sq3SHO>bs7mo9rrqJ)SXk#Wq>Us(
-Boe[jKQQ2Qn=<r_S`TkN#L@afST*rU3W8sY2!FK0!T%ttSH*F'rrHl?JcC<$JcFX-J,~>
-!Zh<ir-ng3s8Tn6IftQ,s2r4Xrrhn]s8TS-IfPT0rrBD)IfP`4rrB8%IfPl.rrA)WrrAemIfQ>C
-rrIY>r;QbWlMgqTJ$&\L#`4%\YeSH_POSR$!5ng9!.b&u"NUQBr/pgT"586Sd.dPGn"'LY[+PEY
-lhu;5h#76Waa\g!s7)TWrrJP[nG`L>rI4h<rr3&;J(]DQJcC<$huA3~>
-!Zh<ir-ng3s8Tn6IftQ,s2r4Xrrhn]s8TS-IfPT0rrBD)IfP`4rrB8%IfPl.rrA)WrrAemIfQ>C
-rrIY>r;QbWlMgqTJ$&\L#`4%\YeSH_POSR$!5ng9!.b&u"NUQBr/pgT"586Sd.dPGn"'LY[+PEY
-lhu;5h#76Waa\g!s7)TWrrJP[nG`L>rI4h<rr3&;J(]DQJcC<$huA3~>
-!Zh<ir-ng3s8Tn6IftQ,s2r4Xrrhn]s8TS-IfPT0rrBD)IfP`4rrB8%IfPl.rrA)WrrAemIfQ>C
-rrIY>r;QbWlMgqTJ$&\L#`4%\YeSH_POSR$!5ng9!.b&u"NUQBr/pgT"586Sd.dPGn"'LY[+PEY
-lhu;5h#76Waa\g!s7)TWrrJP[nG`L>rI4h<rr3&;J(]DQJcC<$huA3~>
-!$.@)!U.7_rrLKtJcC<$JcFU,J,~>
-!$.@)!U.7_rrLKtJcC<$JcFU,J,~>
-!$.@)!U.7_rrLKtJcC<$JcFU,J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$2%<!VH<grrMlioD\pdn*g5QrrVf\rndYUo_[nQ"9.cXpAP!ln+6&K!VZ?grrW(rKA$8/oDJXg
-qX=1=rrMiio`#!en,'Hk!THTHrrG4Kqu6[UnU^^ks2P(h~>
-!$2%<!VH<grrMlioD\pdn*g5QrrVf\rndYUo_[nQ"9.cXpAP!ln+6&K!VZ?grrW(rKA$8/oDJXg
-qX=1=rrMiio`#!en,'Hk!THTHrrG4Kqu6[UnU^^ks2P(h~>
-!$2%<!VH<grrMlioD\pdn*g5QrrVf\rndYUo_[nQ"9.cXpAP!ln+6&K!VZ?grrW(rKA$8/oDJXg
-qX=1=rrMiio`#!en,'Hk!THTHrrG4Kqu6[UnU^^ks2P(h~>
-!$2(=!p)_mrVlqdOn//E",\Z;k5>5\CG#,LrrLpOmJd2k_<Lt+`@WZ`lMpn`/RS#I!I1I?rrL/?
-f`).EfDklc/Y1u&!pa0mo`"uX/]ZZH!TE_;rrLpOo)A\1qYpO9qu6]o,(]cFs2P(h~>
-!$2(=!p)_mrVlqdOn//E",\Z;k5>5\CG#,LrrLpOmJd2k_<Lt+`@WZ`lMpn`/RS#I!I1I?rrL/?
-f`).EfDklc/Y1u&!pa0mo`"uX/]ZZH!TE_;rrLpOo)A\1qYpO9qu6]o,(]cFs2P(h~>
-!$2(=!p)_mrVlqdOn//E",\Z;k5>5\CG#,LrrLpOmJd2k_<Lt+`@WZ`lMpn`/RS#I!I1I?rrL/?
-f`).EfDklc/Y1u&!pa0mo`"uX/]ZZH!TE_;rrLpOo)A\1qYpO9qu6]o,(]cFs2P(h~>
-"s*aDh09a\r;Qh\Qh0hK!B0*,rrG1?mJd2k_<Lt&*WQ/%MsLBIGbtH?pRR)lrrGR?i;WoBL*<S@
-rrH*?li-uIiUd'M_-?d9!Ed>=rrW+#a+=8As2Y.i~>
-"s*aDh09a\r;Qh\Qh0hK!B0*,rrG1?mJd2k_<Lt&*WQ/%MsLBIGbtH?pRR)lrrGR?i;WoBL*<S@
-rrH*?li-uIiUd'M_-?d9!Ed>=rrW+#a+=8As2Y.i~>
-"s*aDh09a\r;Qh\Qh0hK!B0*,rrG1?mJd2k_<Lt&*WQ/%MsLBIGbtH?pRR)lrrGR?i;WoBL*<S@
-rrH*?li-uIiUd'M_-?d9!Ed>=rrW+#a+=8As2Y.i~>
-"s*a!J\Fq)qu6_[OS\VL!B0*=rr^-*R/$X[!5JN##d+.,a-\'+R'?Si!4`#q!42V'!M-:jrrH??
-rr3,W`rH(Arg3u*s8TOps8V)prVm0Es8TdDs8Sj]Yl4S&XRlFY!6bBA$(RBM_g&$Xs5Z0;rrE#r
-Qiu"?s.o&]Qil%As7ZDY"5NqVo)4pXi;`iGrg3rB7G%S*R$c5!rrVhrh#<ZClMpnGrg3cHWqlJj
-"R:fBEiSg4"4rp-jSf)YeGYd4rrT]tpAY'lc2O(5o;_ijao7Y5UAt8AQnilQV>gJp_Z#o6WW3"A
-fX$s4XT/=@Qm7?QYl=Y&\GhiqZi0n).e<H9!Tl<;rrLq?JcC<$a8^Y~>
-"s*a!J\Fq)qu6_[OS\VL!B0*=rr^-*R/$X[!5JN##d+.,a-\'+R'?Si!4`#q!42V'!M-:jrrH??
-rr3,W`rH(Arg3u*s8TOps8V)prVm0Es8TdDs8Sj]Yl4S&XRlFY!6bBA$(RBM_g&$Xs5Z0;rrE#r
-Qiu"?s.o&]Qil%As7ZDY"5NqVo)4pXi;`iGrg3rB7G%S*R$c5!rrVhrh#<ZClMpnGrg3cHWqlJj
-"R:fBEiSg4"4rp-jSf)YeGYd4rrT]tpAY'lc2O(5o;_ijao7Y5UAt8AQnilQV>gJp_Z#o6WW3"A
-fX$s4XT/=@Qm7?QYl=Y&\GhiqZi0n).e<H9!Tl<;rrLq?JcC<$a8^Y~>
-"s*a!J\Fq)qu6_[OS\VL!B0*=rr^-*R/$X[!5JN##d+.,a-\'+R'?Si!4`#q!42V'!M-:jrrH??
-rr3,W`rH(Arg3u*s8TOps8V)prVm0Es8TdDs8Sj]Yl4S&XRlFY!6bBA$(RBM_g&$Xs5Z0;rrE#r
-Qiu"?s.o&]Qil%As7ZDY"5NqVo)4pXi;`iGrg3rB7G%S*R$c5!rrVhrh#<ZClMpnGrg3cHWqlJj
-"R:fBEiSg4"4rp-jSf)YeGYd4rrT]tpAY'lc2O(5o;_ijao7Y5UAt8AQnilQV>gJp_Z#o6WW3"A
-fX$s4XT/=@Qm7?QYl=Y&\GhiqZi0n).e<H9!Tl<;rrLq?JcC<$a8^Y~>
-"s*`o]`1dPqYpS`K_59F2Wju<"1Ek"n,E=f]Rg'8%"b>U]S%>KKVAGGZ[r+/!J7HPrrEN]rr3:/
-_>j(QI_5WWK)UE/J\(kRdf9?VB)V`0*W,j<O`W_arrFipre(B(bl<e(KEcrfV>pSV3;idVL])l/
-J(ai;IK"m%Ibk$RrIb9%ir4?(KEH\cqL&9q#C[iJs6,,1M#RDUiu<IHKEHYom!\kd!e,arq>UTZ
-XT*=@p&>-?KJL1=rrL`$rIb0.rVm'u!9sO`c@>hH"FQ[<aajAD%"joHab23XKTuN:_1;N<'S<"X
-IS>?HKS$$"]n@GLKV8AFZ[r+/!J7HQrrFV?qYpTY2Z*LTh*6JjJcEdjJ,~>
-"s*`o]`1dPqYpS`K_59F2Wju<"1Ek"n,E=f]Rg'8%"b>U]S%>KKVAGGZ[r+/!J7HPrrEN]rr3:/
-_>j(QI_5WWK)UE/J\(kRdf9?VB)V`0*W,j<O`W_arrFipre(B(bl<e(KEcrfV>pSV3;idVL])l/
-J(ai;IK"m%Ibk$RrIb9%ir4?(KEH\cqL&9q#C[iJs6,,1M#RDUiu<IHKEHYom!\kd!e,arq>UTZ
-XT*=@p&>-?KJL1=rrL`$rIb0.rVm'u!9sO`c@>hH"FQ[<aajAD%"joHab23XKTuN:_1;N<'S<"X
-IS>?HKS$$"]n@GLKV8AFZ[r+/!J7HQrrFV?qYpTY2Z*LTh*6JjJcEdjJ,~>
-"s*`o]`1dPqYpS`K_59F2Wju<"1Ek"n,E=f]Rg'8%"b>U]S%>KKVAGGZ[r+/!J7HPrrEN]rr3:/
-_>j(QI_5WWK)UE/J\(kRdf9?VB)V`0*W,j<O`W_arrFipre(B(bl<e(KEcrfV>pSV3;idVL])l/
-J(ai;IK"m%Ibk$RrIb9%ir4?(KEH\cqL&9q#C[iJs6,,1M#RDUiu<IHKEHYom!\kd!e,arq>UTZ
-XT*=@p&>-?KJL1=rrL`$rIb0.rVm'u!9sO`c@>hH"FQ[<aajAD%"joHab23XKTuN:_1;N<'S<"X
-IS>?HKS$$"]n@GLKV8AFZ[r+/!J7HQrrFV?qYpTY2Z*LTh*6JjJcEdjJ,~>
-!$2%<!Dgu9rr=)3rrG%?qu6[Kn,E=fI@pN=!URQ"rrG1?rVln7Yl=Y'k/I<!!N!+$rs;oGF(M&\
-s8Q$?rr3M'HN-Ucs8TQ?s8Rm]$XStnrrM%?rVlmQR/[*pJ=QWfo`+sD9;V[gj>d);!$2%<"D>1C
-(pX)?"(&_A*W?!?_!:k?rVlsoch&XbrrU.ifDbdNP_f>=!okQBrr3'WkhAE&rrG^@p&>&5Wq65k
-@CuO=!O6J>rr=)<rs$32p](8dIK'6L*WQ/+L&V)Qk;N>>!E@/=rrIk?rr3;U8,n$Kk5YJ+:]C@p
-45p/<!H#%>rrM9#rr3!Ko(r@eju3,:!Sotks+13js*t~>
-!$2%<!Dgu9rr=)3rrG%?qu6[Kn,E=fI@pN=!URQ"rrG1?rVln7Yl=Y'k/I<!!N!+$rs;oGF(M&\
-s8Q$?rr3M'HN-Ucs8TQ?s8Rm]$XStnrrM%?rVlmQR/[*pJ=QWfo`+sD9;V[gj>d);!$2%<"D>1C
-(pX)?"(&_A*W?!?_!:k?rVlsoch&XbrrU.ifDbdNP_f>=!okQBrr3'WkhAE&rrG^@p&>&5Wq65k
-@CuO=!O6J>rr=)<rs$32p](8dIK'6L*WQ/+L&V)Qk;N>>!E@/=rrIk?rr3;U8,n$Kk5YJ+:]C@p
-45p/<!H#%>rrM9#rr3!Ko(r@eju3,:!Sotks+13js*t~>
-!$2%<!Dgu9rr=)3rrG%?qu6[Kn,E=fI@pN=!URQ"rrG1?rVln7Yl=Y'k/I<!!N!+$rs;oGF(M&\
-s8Q$?rr3M'HN-Ucs8TQ?s8Rm]$XStnrrM%?rVlmQR/[*pJ=QWfo`+sD9;V[gj>d);!$2%<"D>1C
-(pX)?"(&_A*W?!?_!:k?rVlsoch&XbrrU.ifDbdNP_f>=!okQBrr3'WkhAE&rrG^@p&>&5Wq65k
-@CuO=!O6J>rr=)<rs$32p](8dIK'6L*WQ/+L&V)Qk;N>>!E@/=rrIk?rr3;U8,n$Kk5YJ+:]C@p
-45p/<!H#%>rrM9#rr3!Ko(r@eju3,:!Sotks+13js*t~>
-!$2%<!Dgu:rrHN?o`"qMk55/Z/ar]=!T%ep5lbQrrrG1?rVloOB`:9tFSGe;>;EA"rVlms2#]cO
-.=2"ddf9?VB)hnV^)"H2r;QfU4T59\1$no>"G!$B..mN="aHmDs5Z0;rr<r85m&%6ruM(<"(&_A
-*W,j;r?)"<"&7,6./j/H7G%P=!L/E>rrM.?rVlsVkhAE&rrG^@p&>&5Wq65k@CuO=!O6J>rr=)7
-rrJd@rr3*As8SE0r]pQH2ZE^W<65%<!JZp>rrgnCs*gR=rrLA?rr3!\iVicWg1^IO!-A,=!@m[:
-rrM7?qu6]Q5Crics2Y.i~>
-!$2%<!Dgu:rrHN?o`"qMk55/Z/ar]=!T%ep5lbQrrrG1?rVloOB`:9tFSGe;>;EA"rVlms2#]cO
-.=2"ddf9?VB)hnV^)"H2r;QfU4T59\1$no>"G!$B..mN="aHmDs5Z0;rr<r85m&%6ruM(<"(&_A
-*W,j;r?)"<"&7,6./j/H7G%P=!L/E>rrM.?rVlsVkhAE&rrG^@p&>&5Wq65k@CuO=!O6J>rr=)7
-rrJd@rr3*As8SE0r]pQH2ZE^W<65%<!JZp>rrgnCs*gR=rrLA?rr3!\iVicWg1^IO!-A,=!@m[:
-rrM7?qu6]Q5Crics2Y.i~>
-!$2%<!Dgu:rrHN?o`"qMk55/Z/ar]=!T%ep5lbQrrrG1?rVloOB`:9tFSGe;>;EA"rVlms2#]cO
-.=2"ddf9?VB)hnV^)"H2r;QfU4T59\1$no>"G!$B..mN="aHmDs5Z0;rr<r85m&%6ruM(<"(&_A
-*W,j;r?)"<"&7,6./j/H7G%P=!L/E>rrM.?rVlsVkhAE&rrG^@p&>&5Wq65k@CuO=!O6J>rr=)7
-rrJd@rr3*As8SE0r]pQH2ZE^W<65%<!JZp>rrgnCs*gR=rrLA?rr3!\iVicWg1^IO!-A,=!@m[:
-rrM7?qu6]Q5Crics2Y.i~>
-!$2%<!Dgu;rrQWBrUg*j2Wjo:!A3d=rrD9^gB"`srr3![ir&fVk5O*9Wd+=="'_Wb48o0[;m$#Q
-#OMI_df9?VB)V`0*W#d:i&pu<!AWs?rrdkBs![O=rrmYDs8V.>r;Qa:r7_;GruM(<"(&_A*W,j;
-r?)"<"&7,6./j/H7G%P=!L/E>rrM.?rVlsVkk_C[,QXh=p&>&5Wq65k@CuO=!O6J>rr=)7rrMYA
-rZhWqs8SF+rS%>3rr3!uaSl,>L6hi="P-*CI\-Q=!R4F>rrG4?r;[email protected]<H9!Tl<;
-rrLq?JcC<$a8^Y~>
-!$2%<!Dgu;rrQWBrUg*j2Wjo:!A3d=rrD9^gB"`srr3![ir&fVk5O*9Wd+=="'_Wb48o0[;m$#Q
-#OMI_df9?VB)V`0*W#d:i&pu<!AWs?rrdkBs![O=rrmYDs8V.>r;Qa:r7_;GruM(<"(&_A*W,j;
-r?)"<"&7,6./j/H7G%P=!L/E>rrM.?rVlsVkk_C[,QXh=p&>&5Wq65k@CuO=!O6J>rr=)7rrMYA
-rZhWqs8SF+rS%>3rr3!uaSl,>L6hi="P-*CI\-Q=!R4F>rrG4?r;[email protected]<H9!Tl<;
-rrLq?JcC<$a8^Y~>
-!$2%<!Dgu;rrQWBrUg*j2Wjo:!A3d=rrD9^gB"`srr3![ir&fVk5O*9Wd+=="'_Wb48o0[;m$#Q
-#OMI_df9?VB)V`0*W#d:i&pu<!AWs?rrdkBs![O=rrmYDs8V.>r;Qa:r7_;GruM(<"(&_A*W,j;
-r?)"<"&7,6./j/H7G%P=!L/E>rrM.?rVlsVkk_C[,QXh=p&>&5Wq65k@CuO=!O6J>rr=)7rrMYA
-rZhWqs8SF+rS%>3rr3!uaSl,>L6hi="P-*CI\-Q=!R4F>rrG4?r;[email protected]<H9!Tl<;
-rrLq?JcC<$a8^Y~>
-%NYTElKUsRlL"WOoPM5>p&>0dl7pcSrr38pl71QUs8S%KrosO!?iL'19%*"9C]Ag_rosNhDZ0S9
-'/fdh$!Y7@i>l@us'`V?l3Qq[s&m;*`t`4brr=):rs7u:2sU&8s"Wm>rsjRLs#T-(lBDdTs8W)9
->5eI$0`C8=pAb.5rVlt+^Afhal2tM?r@e-7"'3nD2u`(NC^AYmqs&uclMCP@3W8s[2!Egmro*tA
-qu-O&IgEmjs82*HBq4JRrVlq:#grYO#l!UeX6T]a[r;61!&4BO#$)#ps8T-Jro+(Hs8SaFrosLM
-rVm+4]^!gBs,`ECl3YL3s*bTflKZ/krr33rdH\>Ys*h!Il2e2-rr3#p,l7NA,Ph9;!rFA@r;Qii
-#YfmMJcF'rJ,~>
-%NYTElKUsRlL"WOoPM5>p&>0dl7pcSrr38pl71QUs8S%KrosO!?iL'19%*"9C]Ag_rosNhDZ0S9
-'/fdh$!Y7@i>l@us'`V?l3Qq[s&m;*`t`4brr=):rs7u:2sU&8s"Wm>rsjRLs#T-(lBDdTs8W)9
->5eI$0`C8=pAb.5rVlt+^Afhal2tM?r@e-7"'3nD2u`(NC^AYmqs&uclMCP@3W8s[2!Egmro*tA
-qu-O&IgEmjs82*HBq4JRrVlq:#grYO#l!UeX6T]a[r;61!&4BO#$)#ps8T-Jro+(Hs8SaFrosLM
-rVm+4]^!gBs,`ECl3YL3s*bTflKZ/krr33rdH\>Ys*h!Il2e2-rr3#p,l7NA,Ph9;!rFA@r;Qii
-#YfmMJcF'rJ,~>
-%NYTElKUsRlL"WOoPM5>p&>0dl7pcSrr38pl71QUs8S%KrosO!?iL'19%*"9C]Ag_rosNhDZ0S9
-'/fdh$!Y7@i>l@us'`V?l3Qq[s&m;*`t`4brr=):rs7u:2sU&8s"Wm>rsjRLs#T-(lBDdTs8W)9
->5eI$0`C8=pAb.5rVlt+^Afhal2tM?r@e-7"'3nD2u`(NC^AYmqs&uclMCP@3W8s[2!Egmro*tA
-qu-O&IgEmjs82*HBq4JRrVlq:#grYO#l!UeX6T]a[r;61!&4BO#$)#ps8T-Jro+(Hs8SaFrosLM
-rVm+4]^!gBs,`ECl3YL3s*bTflKZ/krr33rdH\>Ys*h!Il2e2-rr3#p,l7NA,Ph9;!rFA@r;Qii
-#YfmMJcF'rJ,~>
-!Zh<Nr%\CPs8SOkoD\fMr\=IJrr2tQr\=IQrr2tJr\=IXr;Qgi11L7_!-.un!,;B2!BaK`rrIJk
-rr3,5NrT,br\=J%rr3+%10(eqrVljiqu6Xfr\=V=s8Q6jrr3:mYlF_b1,=WJ\,QC/dUqP=rrDoo
-1'=ZYs%<7i"+JGnmJSdB])VfmrA"Jks8V!U1'FgqhuD@-1'>l&l!XJi"'k6gV>W.MZMa_%"dK_8
-s8UXI1&s31rrRrdd/O%FYPg3Yp](8mrA"BPrVm(C1@>,Am",-k"?b98s-3L<!(Qnd!a[WVrr2tR
-r\=aXs8RP>BJM>Hr;Qgj11C1^!-8&o!,2<1!CkZ<rrLS?qu6]C:&FqloeL<6s+13rs*t~>
-!Zh<Nr%\CPs8SOkoD\fMr\=IJrr2tQr\=IQrr2tJr\=IXr;Qgi11L7_!-.un!,;B2!BaK`rrIJk
-rr3,5NrT,br\=J%rr3+%10(eqrVljiqu6Xfr\=V=s8Q6jrr3:mYlF_b1,=WJ\,QC/dUqP=rrDoo
-1'=ZYs%<7i"+JGnmJSdB])VfmrA"Jks8V!U1'FgqhuD@-1'>l&l!XJi"'k6gV>W.MZMa_%"dK_8
-s8UXI1&s31rrRrdd/O%FYPg3Yp](8mrA"BPrVm(C1@>,Am",-k"?b98s-3L<!(Qnd!a[WVrr2tR
-r\=aXs8RP>BJM>Hr;Qgj11C1^!-8&o!,2<1!CkZ<rrLS?qu6]C:&FqloeL<6s+13rs*t~>
-!Zh<Nr%\CPs8SOkoD\fMr\=IJrr2tQr\=IQrr2tJr\=IXr;Qgi11L7_!-.un!,;B2!BaK`rrIJk
-rr3,5NrT,br\=J%rr3+%10(eqrVljiqu6Xfr\=V=s8Q6jrr3:mYlF_b1,=WJ\,QC/dUqP=rrDoo
-1'=ZYs%<7i"+JGnmJSdB])VfmrA"Jks8V!U1'FgqhuD@-1'>l&l!XJi"'k6gV>W.MZMa_%"dK_8
-s8UXI1&s31rrRrdd/O%FYPg3Yp](8mrA"BPrVm(C1@>,Am",-k"?b98s-3L<!(Qnd!a[WVrr2tR
-r\=aXs8RP>BJM>Hr;Qgj11C1^!-8&o!,2<1!CkZ<rrLS?qu6]C:&FqloeL<6s+13rs*t~>
-!$/$<"ip05s0lUqrrL'0a8Z1p62gfa/+NT<!F<J3rrGj@kPkRUIK'6Imk*c'!IgX(rrMb1r;Qe0
-r;6Ko@tFZ2s2G"g~>
-!$/$<"ip05s0lUqrrL'0a8Z1p62gfa/+NT<!F<J3rrGj@kPkRUIK'6Imk*c'!IgX(rrMb1r;Qe0
-r;6Ko@tFZ2s2G"g~>
-!$/$<"ip05s0lUqrrL'0a8Z1p62gfa/+NT<!F<J3rrGj@kPkRUIK'6Imk*c'!IgX(rrMb1r;Qe0
-r;6Ko@tFZ2s2G"g~>
-!$/$<"db13PDH-0rrMD.rK@8'p\t0oa*QJ3rrTu\jQHODaFF2Q!Ki-#rrIS?JcC<$SH"*~>
-!$/$<"db13PDH-0rrMD.rK@8'p\t0oa*QJ3rrTu\jQHODaFF2Q!Ki-#rrIS?JcC<$SH"*~>
-!$/$<"db13PDH-0rrMD.rK@8'p\t0oa*QJ3rrTu\jQHODaFF2Q!Ki-#rrIS?JcC<$SH"*~>
-!$/!;".k@+Wh04jiVeT5li$ha_US2W!P7(JrrC%;M#`Y#rrL$cJcC<$SH"*~>
-!$/!;".k@+Wh04jiVeT5li$ha_US2W!P7(JrrC%;M#`Y#rrL$cJcC<$SH"*~>
-!$/!;".k@+Wh04jiVeT5li$ha_US2W!P7(JrrC%;M#`Y#rrL$cJcC<$SH"*~>
-!$2";!d\!iJc>iPBN]t=s+13$s,R,0~>
-!$2";!d\!iJc>iPBN]t=s+13$s,R,0~>
-!$2";!d\!iJc>iPBN]t=s+13$s,R,0~>
-!$2%<"*pi_bhN-ufQmJr!GFXFrrGGskl1[N](l:-aMX^)JcC<$JcCf2J,~>
-!$2%<"*pi_bhN-ufQmJr!GFXFrrGGskl1[N](l:-aMX^)JcC<$JcCf2J,~>
-!$2%<"*pi_bhN-ufQmJr!GFXFrrGGskl1[N](l:-aMX^)JcC<$JcCf2J,~>
-!$2%<!DgtnrrL>?rr3#^i7%],i9'8'!I1I7rrKi?JcC<$JcCf2J,~>
-!$2%<!DgtnrrL>?rr3#^i7%],i9'8'!I1I7rrKi?JcC<$JcCf2J,~>
-!$2%<!DgtnrrL>?rr3#^i7%],i9'8'!I1I7rrKi?JcC<$JcCf2J,~>
-!$2%<!b/kArr2uhroFFJs8V`^mcEQnrr2ufroF.Drr2ueroF.Err3>ojlP[L;#gR`jlQI@"n;9O
-jlPk.rrqcNjluO/q#:fjq>^Kimf3=RqW?o$n,E=gkiM+-rrD9^jT+iMrrD6]jT+lNrs.]Jjm[Mk
-s8W&Z!;-9j!rK6?JcC<$JcCf2J,~>
-!$2%<!b/kArr2uhroFFJs8V`^mcEQnrr2ufroF.Drr2ueroF.Err3>ojlP[L;#gR`jlQI@"n;9O
-jlPk.rrqcNjluO/q#:fjq>^Kimf3=RqW?o$n,E=gkiM+-rrD9^jT+iMrrD6]jT+lNrs.]Jjm[Mk
-s8W&Z!;-9j!rK6?JcC<$JcCf2J,~>
-!$2%<!b/kArr2uhroFFJs8V`^mcEQnrr2ufroF.Drr2ueroF.Err3>ojlP[L;#gR`jlQI@"n;9O
-jlPk.rrqcNjluO/q#:fjq>^Kimf3=RqW?o$n,E=gkiM+-rrD9^jT+iMrrD6]jT+lNrs.]Jjm[Mk
-s8W&Z!;-9j!rK6?JcC<$JcCf2J,~>
-!$2(=#N*U%n,NFQJc7S:6.5e!BkoXd7b%J#GQ'N(9%Et'ErJ!-:Y5X,D)XC@TMY[gHoD</rsik&
-;`?XAh>c;<2`FX*MYR2b;p,.?^Kpm>8u4d32f[pYs&:a0rVloJ8,bFMHKbCW6N/nPJ*R'\4Z><@
-?D[\J3W:rBM=(?Cj'9[bJcC<$JcCi3J,~>
-!$2(=#N*U%n,NFQJc7S:6.5e!BkoXd7b%J#GQ'N(9%Et'ErJ!-:Y5X,D)XC@TMY[gHoD</rsik&
-;`?XAh>c;<2`FX*MYR2b;p,.?^Kpm>8u4d32f[pYs&:a0rVloJ8,bFMHKbCW6N/nPJ*R'\4Z><@
-?D[\J3W:rBM=(?Cj'9[bJcC<$JcCi3J,~>
-!$2(=#N*U%n,NFQJc7S:6.5e!BkoXd7b%J#GQ'N(9%Et'ErJ!-:Y5X,D)XC@TMY[gHoD</rsik&
-;`?XAh>c;<2`FX*MYR2b;p,.?^Kpm>8u4d32f[pYs&:a0rVloJ8,bFMHKbCW6N/nPJ*R'\4Z><@
-?D[\J3W:rBM=(?Cj'9[bJcC<$JcCi3J,~>
-!$2(=!c7q^rr3"kIfB?UmOnO*/AhGeju<=#NrK%]k^NPcQi@!keO]^gTE"r]6W!a]!$2%<%;\)^
-s8T]>s'rV>s3OI6rshuMs8Ti>s8P\[p&G&[KDtlOkqi;<!BK3>rrfR8s"Wm>rsXFJs![O>s0sGQ
-ruh:>rrI&?rr3&6!.0:sJcC<$OT0h~>
-!$2(=!c7q^rr3"kIfB?UmOnO*/AhGeju<=#NrK%]k^NPcQi@!keO]^gTE"r]6W!a]!$2%<%;\)^
-s8T]>s'rV>s3OI6rshuMs8Ti>s8P\[p&G&[KDtlOkqi;<!BK3>rrfR8s"Wm>rsXFJs![O>s0sGQ
-ruh:>rrI&?rr3&6!.0:sJcC<$OT0h~>
-!$2(=!c7q^rr3"kIfB?UmOnO*/AhGeju<=#NrK%]k^NPcQi@!keO]^gTE"r]6W!a]!$2%<%;\)^
-s8T]>s'rV>s3OI6rshuMs8Ti>s8P\[p&G&[KDtlOkqi;<!BK3>rrfR8s"Wm>rsXFJs![O>s0sGQ
-ruh:>rrI&?rr3&6!.0:sJcC<$OT0h~>
-!$2(=#Hi'&pAb/b7fJDNKeECkLAq2Uju<=#Nr/hWKpVf="P$'CI@pN=!R+C=rr=)<rrHr?rr389
-@K0iJs8UG>p\tOub5_LV?2spsdf07IR=kM=!U2E=rrG.?qu6[Om/I"fJ=QWfo`"jnGbtE_NW+qC
-5-=kbmtYnkJcC<$JcCi3J,~>
-!$2(=#Hi'&pAb/b7fJDNKeECkLAq2Uju<=#Nr/hWKpVf="P$'CI@pN=!R+C=rr=)<rrHr?rr389
-@K0iJs8UG>p\tOub5_LV?2spsdf07IR=kM=!U2E=rrG.?qu6[Om/I"fJ=QWfo`"jnGbtE_NW+qC
-5-=kbmtYnkJcC<$JcCi3J,~>
-!$2(=#Hi'&pAb/b7fJDNKeECkLAq2Uju<=#Nr/hWKpVf="P$'CI@pN=!R+C=rr=)<rrHr?rr389
-@K0iJs8UG>p\tOub5_LV?2spsdf07IR=kM=!U2E=rrG.?qu6[Om/I"fJ=QWfo`"jnGbtE_NW+qC
-5-=kbmtYnkJcC<$JcCi3J,~>
-!$2%<#+^SDs8S]\rJguSs-AE=rrhICs,N-:rrIh?rr3,O8H4+1rr3#C;#UCo*W?!=Cp<p=#eOOF
-\p8:8G-L`@#uf"Hs1_k>s%:`=rrJO?rr3#`1]@=S3TL#:!AWs?rrdkBs![O=rrdSCrud="NWn2;
-s6k`>JcC<$JcCf2J,~>
-!$2%<#+^SDs8S]\rJguSs-AE=rrhICs,N-:rrIh?rr3,O8H4+1rr3#C;#UCo*W?!=Cp<p=#eOOF
-\p8:8G-L`@#uf"Hs1_k>s%:`=rrJO?rr3#`1]@=S3TL#:!AWs?rrdkBs![O=rrdSCrud="NWn2;
-s6k`>JcC<$JcCf2J,~>
-!$2%<#+^SDs8S]\rJguSs-AE=rrhICs,N-:rrIh?rr3,O8H4+1rr3#C;#UCo*W?!=Cp<p=#eOOF
-\p8:8G-L`@#uf"Hs1_k>s%:`=rrJO?rr3#`1]@=S3TL#:!AWs?rrdkBs![O=rrdSCrud="NWn2;
-s6k`>JcC<$JcCf2J,~>
-!$2%<!Dgu>rrJa@qu6\_LAq2Uju<=#NrK%]k^NPcQi@!keO]^gTE"r]6W!a]!$2%<!Go">rs-/E
-s-JqMX1J3.!EOLFrs;WHs8Ti>s8P^>rr3"eKDtlOkqi;<!BK3>rrfR8s"Wm>rsXFJs![O>s0sGQ
-ruh:9rrKi?JcC<$JcCf2J,~>
-!$2%<!Dgu>rrJa@qu6\_LAq2Uju<=#NrK%]k^NPcQi@!keO]^gTE"r]6W!a]!$2%<!Go">rs-/E
-s-JqMX1J3.!EOLFrs;WHs8Ti>s8P^>rr3"eKDtlOkqi;<!BK3>rrfR8s"Wm>rsXFJs![O>s0sGQ
-ruh:9rrKi?JcC<$JcCf2J,~>
-!$2%<!Dgu>rrJa@qu6\_LAq2Uju<=#NrK%]k^NPcQi@!keO]^gTE"r]6W!a]!$2%<!Go">rs-/E
-s-JqMX1J3.!EOLFrs;WHs8Ti>s8P^>rr3"eKDtlOkqi;<!BK3>rrfR8s"Wm>rsXFJs![O>s0sGQ
-ruh:9rrKi?JcC<$JcCf2J,~>
-!$2%<!Dgu>rrMD9r\jsKs8SC>rr3,`2ui#ar\jsPec4`Or\kNefDjlJ2`F*s;#gQC2[23Qs8Qo>
-rr3,[email protected]\jgur;Qd"2u`g`g/U'j>EbER9%*_=%%2bJs&:`]2i[k;e49Ks"FB;3dR*pl%"IRB
-coj<HF'b^CcT1t`!3#kr!PVlks+13$s,[21~>
-!$2%<!Dgu>rrMD9r\jsKs8SC>rr3,`2ui#ar\jsPec4`Or\kNefDjlJ2`F*s;#gQC2[23Qs8Qo>
-rr3,[email protected]\jgur;Qd"2u`g`g/U'j>EbER9%*_=%%2bJs&:`]2i[k;e49Ks"FB;3dR*pl%"IRB
-coj<HF'b^CcT1t`!3#kr!PVlks+13$s,[21~>
-!$2%<!Dgu>rrMD9r\jsKs8SC>rr3,`2ui#ar\jsPec4`Or\kNefDjlJ2`F*s;#gQC2[23Qs8Qo>
-rr3,[email protected]\jgur;Qd"2u`g`g/U'j>EbER9%*_=%%2bJs&:`]2i[k;e49Ks"FB;3dR*pl%"IRB
-coj<HF'b^CcT1t`!3#kr!PVlks+13$s,[21~>
-!$2%<#44f!56(ZRroF:Fs8V`^rr3-!lMpnRroF.Drr2ueroF.Err38mjlP\%mJm4SroF:Ks8VT_
-rr3,rn,IL3roF0ZH2[aDc8Y_%#jUO5lh0fJm/$_]"SD9bs60ID!:^!f!9jFD!:g'g!9a@C!:p-h
-#Nk.0nF?5Ps8D$`o`+qH*Dc*Ss+13$s,[21~>
-!$2%<#44f!56(ZRroF:Fs8V`^rr3-!lMpnRroF.Drr2ueroF.Err38mjlP\%mJm4SroF:Ks8VT_
-rr3,rn,IL3roF0ZH2[aDc8Y_%#jUO5lh0fJm/$_]"SD9bs60ID!:^!f!9jFD!:g'g!9a@C!:p-h
-#Nk.0nF?5Ps8D$`o`+qH*Dc*Ss+13$s,[21~>
-!$2%<#44f!56(ZRroF:Fs8V`^rr3-!lMpnRroF.Drr2ueroF.Err38mjlP\%mJm4SroF:Ks8VT_
-rr3,rn,IL3roF0ZH2[aDc8Y_%#jUO5lh0fJm/$_]"SD9bs60ID!:^!f!9jFD!:g'g!9a@C!:p-h
-#Nk.0nF?5Ps8D$`o`+qH*Dc*Ss+13$s,[21~>
-!$/lT!I(UDhuT^&rVloB:kAXts+13$s3Udr~>
-!$/lT!I(UDhuT^&rVloB:kAXts+13$s3Udr~>
-!$/lT!I(UDhuT^&rVloB:kAXts+13$s3Udr~>
-!$/iS!-8'$!-\;?!)nIKJcC<$JcF'rJ,~>
-!$/iS!-8'$!-\;?!)nIKJcC<$JcF'rJ,~>
-!$/iS!-8'$!-\;?!)nIKJcC<$JcF'rJ,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-"!.FAao7+sNW/qY`R48V"0^kcRDo1.QN,gOJcC<$JcC<$iW"E~>
-"!.FAao7+sNW/qY`R48V"0^kcRDo1.QN,gOJcC<$JcC<$iW"E~>
-"!.FAao7+sNW/qY`R48V"0^kcRDo1.QN,gOJcC<$JcC<$iW"E~>
-"!.EcIf>N8P(N`6b'V_2rrZ3AqBEoY"!.ENAqBu5s+13$s5F!.~>
-"!.EcIf>N8P(N`6b'V_2rrZ3AqBEoY"!.ENAqBu5s+13$s5F!.~>
-"!.EcIf>N8P(N`6b'V_2rrZ3AqBEoY"!.ENAqBu5s+13$s5F!.~>
-"!.E>FoMCApEon>!mbW@o`#"land4#rrX;A[q:3kJcC<$JcF^/J,~>
-"!.E>FoMCApEon>!mbW@o`#"land4#rrX;A[q:3kJcC<$JcF^/J,~>
-"!.E>FoMCApEon>!mbW@o`#"land4#rrX;A[q:3kJcC<$JcF^/J,~>
-"!.F0jSo/[8C[V<!o$B@p&>9Qo`!>>s.-4irrh.os-Btirrgnos,aejrs6qrs,"Pks57Vjrr?j6
-1&u7krrYqM13WZs!+#RZ!.FhG"4R;?iIV#[s+13$s5F!.~>
-"!.F0jSo/[8C[V<!o$B@p&>9Qo`!>>s.-4irrh.os-Btirrgnos,aejrs6qrs,"Pks57Vjrr?j6
-1&u7krrYqM13WZs!+#RZ!.FhG"4R;?iIV#[s+13$s5F!.~>
-"!.F0jSo/[8C[V<!o$B@p&>9Qo`!>>s.-4irrh.os-Btirrgnos,aejrs6qrs,"Pks57Vjrr?j6
-1&u7krrYqM13WZs!+#RZ!.FhG"4R;?iIV#[s+13$s5F!.~>
-!$2%<!r>IAqu6]a0CSoAKpVf="P$'CI@pN='[0DRFK#6>hA08oCp<s>fgPl?E3K9+!NL>Brs'\0
-[oNJ.@D2[*!M"jps+13$s+14(s*t~>
-!$2%<!r>IAqu6]a0CSoAKpVf="P$'CI@pN='[0DRFK#6>hA08oCp<s>fgPl?E3K9+!NL>Brs'\0
-[oNJ.@D2[*!M"jps+13$s+14(s*t~>
-!$2%<!r>IAqu6]a0CSoAKpVf="P$'CI@pN='[0DRFK#6>hA08oCp<s>fgPl?E3K9+!NL>Brs'\0
-[oNJ.@D2[*!M"jps+13$s+14(s*t~>
-!$2(=!pX(@qYpTT4R`:NKpVf="P$'CI>RsX'X(@5FK#5r5/^V(Cp<s>fgPl?A%DU=!OHM>rs'\E
-aAr9?;m$&R!K28Ts+13$s+14(s*t~>
-!$2(=!pX(@qYpTT4R`:NKpVf="P$'CI>RsX'X(@5FK#5r5/^V(Cp<s>fgPl?A%DU=!OHM>rs'\E
-aAr9?;m$&R!K28Ts+13$s+14(s*t~>
-!$2(=!pX(@qYpTT4R`:NKpVf="P$'CI>RsX'X(@5FK#5r5/^V(Cp<s>fgPl?A%DU=!OHM>rs'\E
-aAr9?;m$&R!K28Ts+13$s+14(s*t~>
-"WdXCiHE09rrUPJp@&"^KpVf="P$'CI4>.]'JrYdFK!D[s28(?Cp<s>fgPl?A%DU=%'s[Js34F>
-aAr9?;`+G=!1\W?JcC<$JcFI(J,~>
-"WdXCiHE09rrUPJp@&"^KpVf="P$'CI4>.]'JrYdFK!D[s28(?Cp<s>fgPl?A%DU=%'s[Js34F>
-aAr9?;`+G=!1\W?JcC<$JcFI(J,~>
-"WdXCiHE09rrUPJp@&"^KpVf="P$'CI4>.]'JrYdFK!D[s28(?Cp<s>fgPl?A%DU=%'s[Js34F>
-aAr9?;`+G=!1\W?JcC<$JcFI(J,~>
-"<IO"K"LmZ!lf6Amf*TIQiI*^L.M>mTDnj)bY\=]C2NA<`**+VYlFaV70!9s\c2U;ZYBI>52ZC]
-<WE(tb45K5pS#?Qs+13$s+146s*t~>
-"<IO"K"LmZ!lf6Amf*TIQiI*^L.M>mTDnj)bY\=]C2NA<`**+VYlFaV70!9s\c2U;ZYBI>52ZC]
-<WE(tb45K5pS#?Qs+13$s+146s*t~>
-"<IO"K"LmZ!lf6Amf*TIQiI*^L.M>mTDnj)bY\=]C2NA<`**+VYlFaV70!9s\c2U;ZYBI>52ZC]
-<WE(tb45K5pS#?Qs+13$s+146s*t~>
-"!.E>4oL$;QN.!%J(j;i$,D(EKS*o.s*^O=rtN[Rs)_,ss8U#?s(knmKQ&0Bs0%"QKFEF;s0*Ve
-KP)jJs/(DIKE/:MrrVEb;1\aus+13$s60K5~>
-"!.E>4oL$;QN.!%J(j;i$,D(EKS*o.s*^O=rtN[Rs)_,ss8U#?s(knmKQ&0Bs0%"QKFEF;s0*Ve
-KP)jJs/(DIKE/:MrrVEb;1\aus+13$s60K5~>
-"!.E>4oL$;QN.!%J(j;i$,D(EKS*o.s*^O=rtN[Rs)_,ss8U#?s(knmKQ&0Bs0%"QKFEF;s0*Ve
-KP)jJs/(DIKE/:MrrVEb;1\aus+13$s60K5~>
-!Zh<rr0RVbs8U<pli.7-R$aGp8H6ibrr3,d\GsV)rr3)`]`5qKQiqA:s8TJ*Qisnus''RDQiq#A
-s8T8$QiOknrrVn]\Ujd3s+13$s60K5~>
-!Zh<rr0RVbs8U<pli.7-R$aGp8H6ibrr3,d\GsV)rr3)`]`5qKQiqA:s8TJ*Qisnus''RDQiq#A
-s8T8$QiOknrrVn]\Ujd3s+13$s60K5~>
-!Zh<rr0RVbs8U<pli.7-R$aGp8H6ibrr3,d\GsV)rr3)`]`5qKQiqA:s8TJ*Qisnus''RDQiq#A
-s8T8$QiOknrrVn]\Ujd3s+13$s60K5~>
-!$1"t!NEL+rrLY@li.!t@JKj'cgC`3!Tqsas+13$s+13us*t~>
-!$1"t!NEL+rrLY@li.!t@JKj'cgC`3!Tqsas+13$s+13us*t~>
-!$1"t!NEL+rrLY@li.!t@JKj'cgC`3!Tqsas+13$s+13us*t~>
-!$1"t!U4S&/HJH"li."Wj+75]s+13$s2+ed~>
-!$1"t!U4S&/HJH"li."Wj+75]s+13$s2+ed~>
-!$1"t!U4S&/HJH"li."Wj+75]s+13$s2+ed~>
-!$2(="8MHXoB-&Qp&=C[nU^_$rr`#do(.G4JcDABJ,~>
-!$2(="8MHXoB-&Qp&=C[nU^_$rr`#do(.G4JcDABJ,~>
-!$2(="8MHXoB-&Qp&=C[nU^_$rr`#do(.G4JcDABJ,~>
-!$2(=")T&-1&V%PiV<?N"6A%arr2otkl0-5g\h'Ph>HmE!8@>M!oDM`r;QiRf%p?*!9F(/!9j.V
-!WCjOrrUg'j8ArWec=e0rr`5Nf&cQ(!VYROrr`)Jf'<87!<)lI!:]mc!U0(HrrMTRr;Qlif%0?h
-rr_fBf(/e>!:^!=!;Q6e!U0(Ors%i@f(]4Eo_d8?g&D!Ol2K9+rrM*Rr;Qu_f%0j#s6]a8!oX+E
-r72)2s8RBo.2IL7JcDABJ,~>
-!$2(=")T&-1&V%PiV<?N"6A%arr2otkl0-5g\h'Ph>HmE!8@>M!oDM`r;QiRf%p?*!9F(/!9j.V
-!WCjOrrUg'j8ArWec=e0rr`5Nf&cQ(!VYROrr`)Jf'<87!<)lI!:]mc!U0(HrrMTRr;Qlif%0?h
-rr_fBf(/e>!:^!=!;Q6e!U0(Ors%i@f(]4Eo_d8?g&D!Ol2K9+rrM*Rr;Qu_f%0j#s6]a8!oX+E
-r72)2s8RBo.2IL7JcDABJ,~>
-!$2(=")T&-1&V%PiV<?N"6A%arr2otkl0-5g\h'Ph>HmE!8@>M!oDM`r;QiRf%p?*!9F(/!9j.V
-!WCjOrrUg'j8ArWec=e0rr`5Nf&cQ(!VYROrr`)Jf'<87!<)lI!:]mc!U0(HrrMTRr;Qlif%0?h
-rr_fBf(/e>!:^!=!;Q6e!U0(Ors%i@f(]4Eo_d8?g&D!Ol2K9+rrM*Rr;Qu_f%0j#s6]a8!oX+E
-r72)2s8RBo.2IL7JcDABJ,~>
-!$2(=!H#(<rrU\+ec#LRg2BGM^An5kH2^86<m(FA!mMnWo`"s6(&\(7c<Nh@bPqMIbZRD>cN!oK
-2>ouERJ-X]ZRbtR"N*i$CY/Rc"MdJrDV>$h"M.&lEnpBg!r.jWrVm0%WCB@+j8].frC-gJmJ[%d
-i)?WKrrVP,JGoK[ns2a7ORE/Kmug.0Pk"eRm>h08!9!SN!oR"WrVm,bK18>*qZ"e;7KaM,s5A>(
-7KEG]rrU_-eG]CPg2KMN^&S,8rC-lP56%S[7KGS@r;Qa;JcC<$TDsE~>
-!$2(=!H#(<rrU\+ec#LRg2BGM^An5kH2^86<m(FA!mMnWo`"s6(&\(7c<Nh@bPqMIbZRD>cN!oK
-2>ouERJ-X]ZRbtR"N*i$CY/Rc"MdJrDV>$h"M.&lEnpBg!r.jWrVm0%WCB@+j8].frC-gJmJ[%d
-i)?WKrrVP,JGoK[ns2a7ORE/Kmug.0Pk"eRm>h08!9!SN!oR"WrVm,bK18>*qZ"e;7KaM,s5A>(
-7KEG]rrU_-eG]CPg2KMN^&S,8rC-lP56%S[7KGS@r;Qa;JcC<$TDsE~>
-!$2(=!H#(<rrU\+ec#LRg2BGM^An5kH2^86<m(FA!mMnWo`"s6(&\(7c<Nh@bPqMIbZRD>cN!oK
-2>ouERJ-X]ZRbtR"N*i$CY/Rc"MdJrDV>$h"M.&lEnpBg!r.jWrVm0%WCB@+j8].frC-gJmJ[%d
-i)?WKrrVP,JGoK[ns2a7ORE/Kmug.0Pk"eRm>h08!9!SN!oR"WrVm,bK18>*qZ"e;7KaM,s5A>(
-7KEG]rrU_-eG]CPg2KMN^&S,8rC-lP56%S[7KGS@r;Qa;JcC<$TDsE~>
-!$2(=!H#(=rr^Pl*7b&g$.aRGs8Ql>s,N-=rs.@Es8U#Z'(>Mn!krU^rVmJLFlEAaEl.jnF6<M^
-FN+8a_=IU-X^NaYrt`"Xqu=rhdf6Ufs8U/hec2gjs8Tudg%YLJQVCKYrs5BFs8TH[ir:%trrHH?
-rr3)XK.X(srr__K4b3P3')7TQs8SOJoCS*2s8S@Gp@4-5oD\pMK.O&%rs%YBXT/<NSGW<iX)\0u
-KX^RQ"4)95eGfIPf7(a>s(nt<rrW1aM>[ATqNHs;rr='js+13Bs*t~>
-!$2(=!H#(=rr^Pl*7b&g$.aRGs8Ql>s,N-=rs.@Es8U#Z'(>Mn!krU^rVmJLFlEAaEl.jnF6<M^
-FN+8a_=IU-X^NaYrt`"Xqu=rhdf6Ufs8U/hec2gjs8Tudg%YLJQVCKYrs5BFs8TH[ir:%trrHH?
-rr3)XK.X(srr__K4b3P3')7TQs8SOJoCS*2s8S@Gp@4-5oD\pMK.O&%rs%YBXT/<NSGW<iX)\0u
-KX^RQ"4)95eGfIPf7(a>s(nt<rrW1aM>[ATqNHs;rr='js+13Bs*t~>
-!$2(=!H#(=rr^Pl*7b&g$.aRGs8Ql>s,N-=rs.@Es8U#Z'(>Mn!krU^rVmJLFlEAaEl.jnF6<M^
-FN+8a_=IU-X^NaYrt`"Xqu=rhdf6Ufs8U/hec2gjs8Tudg%YLJQVCKYrs5BFs8TH[ir:%trrHH?
-rr3)XK.X(srr__K4b3P3')7TQs8SOJoCS*2s8S@Gp@4-5oD\pMK.O&%rs%YBXT/<NSGW<iX)\0u
-KX^RQ"4)95eGfIPf7(a>s(nt<rrW1aM>[ATqNHs;rr='js+13Bs*t~>
-!$2(=!H#(>rrgYtbt$=`rrJF?rr3,`2uenurr35Z5QATNg+Dderr]f^iZ8!t!Go">rt)eNs0@.>
-s6"m>s'*=#It+Hlrr]'Il7;i5!CGQ?rsY$Js.+]?s3cD>s"Wm>rrIY?q#:GWNQ5&trr=)<rrZoB
-ruM(<#[Y7Fs5ea>F/es7"T!VCSUg_>!UMN=rsLsInURY>s/:J?gHkH2"QY'BEiT-=!Q&(>rr=):
-rra_Bs06D3rrgYtbt-@`rrJI?rr3#^2Z3RUq]Yk:!V7c;rr='js+13Bs*t~>
-!$2(=!H#(>rrgYtbt$=`rrJF?rr3,`2uenurr35Z5QATNg+Dderr]f^iZ8!t!Go">rt)eNs0@.>
-s6"m>s'*=#It+Hlrr]'Il7;i5!CGQ?rsY$Js.+]?s3cD>s"Wm>rrIY?q#:GWNQ5&trr=)<rrZoB
-ruM(<#[Y7Fs5ea>F/es7"T!VCSUg_>!UMN=rsLsInURY>s/:J?gHkH2"QY'BEiT-=!Q&(>rr=):
-rra_Bs06D3rrgYtbt-@`rrJI?rr3#^2Z3RUq]Yk:!V7c;rr='js+13Bs*t~>
-!$2(=!H#(>rrgYtbt$=`rrJF?rr3,`2uenurr35Z5QATNg+Dderr]f^iZ8!t!Go">rt)eNs0@.>
-s6"m>s'*=#It+Hlrr]'Il7;i5!CGQ?rsY$Js.+]?s3cD>s"Wm>rrIY?q#:GWNQ5&trr=)<rrZoB
-ruM(<#[Y7Fs5ea>F/es7"T!VCSUg_>!UMN=rsLsInURY>s/:J?gHkH2"QY'BEiT-=!Q&(>rr=):
-rra_Bs06D3rrgYtbt-@`rrJI?rr3#^2Z3RUq]Yk:!V7c;rr='js+13Bs*t~>
-!$2(=!H#(>rrh'#s$tW=rrJF?rr3Mk2uenus8W!s5QB*^s"3^5rr^F#ruM(<!Go">rt2kOs8TTE
-@Vr^Vs'&*]SXkV9q#:H,mdVh+rrGI@rr3ChMuWgT@UaQ)s8Oh?rr3"LSG<*dWW'q<rVlj<rVlt4
-[f7BIrs>hR^Am_@]`3&Pq#:KoXT+iArr3#c0`D"[4Q-8(M.0qOli5^*`Vs<HjS8`Xlb3==WrE#!
-_H[!=!$2";#)nfDs06C@raGm,q#:KNc2U>arr3"cL&V)Qk;N8<!HY:<rrI&?qu6X:JcC<$TDsE~>
-!$2(=!H#(>rrh'#s$tW=rrJF?rr3Mk2uenus8W!s5QB*^s"3^5rr^F#ruM(<!Go">rt2kOs8TTE
-@Vr^Vs'&*]SXkV9q#:H,mdVh+rrGI@rr3ChMuWgT@UaQ)s8Oh?rr3"LSG<*dWW'q<rVlj<rVlt4
-[f7BIrs>hR^Am_@]`3&Pq#:KoXT+iArr3#c0`D"[4Q-8(M.0qOli5^*`Vs<HjS8`Xlb3==WrE#!
-_H[!=!$2";#)nfDs06C@raGm,q#:KNc2U>arr3"cL&V)Qk;N8<!HY:<rrI&?qu6X:JcC<$TDsE~>
-!$2(=!H#(>rrh'#s$tW=rrJF?rr3Mk2uenus8W!s5QB*^s"3^5rr^F#ruM(<!Go">rt2kOs8TTE
-@Vr^Vs'&*]SXkV9q#:H,mdVh+rrGI@rr3ChMuWgT@UaQ)s8Oh?rr3"LSG<*dWW'q<rVlj<rVlt4
-[f7BIrs>hR^Am_@]`3&Pq#:KoXT+iArr3#c0`D"[4Q-8(M.0qOli5^*`Vs<HjS8`Xlb3==WrE#!
-_H[!=!$2";#)nfDs06C@raGm,q#:KNc2U>arr3"cL&V)Qk;N8<!HY:<rrI&?qu6X:JcC<$TDsE~>
-!$2(=!H#(;rrGX?rr3"bLAq2Zju<=uGst.lTg/MU!A3d3rr=)<rrHr?rr3SB@K6@PVn/[Ps8UQZ
-pAb/mEq]M6nLOS<!CGQ?rsY$Js8Q96\riK^s"Wm>rrIY?pAY06<W2pt*W?!?B=@iLr^@-E7DAe$
-aT)9]WV-8lSUg_>!UMN=rsV$Js42%u\n]pugCeK)\cGt,pAY/6WrE#!_H[!=!$2";#"7,Ds03St
-rji)5p&>%`eGfIKQ\GG=!TuB=rr=)9rr=)9rr='js+13Bs*t~>
-!$2(=!H#(;rrGX?rr3"bLAq2Zju<=uGst.lTg/MU!A3d3rr=)<rrHr?rr3SB@K6@PVn/[Ps8UQZ
-pAb/mEq]M6nLOS<!CGQ?rsY$Js8Q96\riK^s"Wm>rrIY?pAY06<W2pt*W?!?B=@iLr^@-E7DAe$
-aT)9]WV-8lSUg_>!UMN=rsV$Js42%u\n]pugCeK)\cGt,pAY/6WrE#!_H[!=!$2";#"7,Ds03St
-rji)5p&>%`eGfIKQ\GG=!TuB=rr=)9rr=)9rr='js+13Bs*t~>
-!$2(=!H#(;rrGX?rr3"bLAq2Zju<=uGst.lTg/MU!A3d3rr=)<rrHr?rr3SB@K6@PVn/[Ps8UQZ
-pAb/mEq]M6nLOS<!CGQ?rsY$Js8Q96\riK^s"Wm>rrIY?pAY06<W2pt*W?!?B=@iLr^@-E7DAe$
-aT)9]WV-8lSUg_>!UMN=rsV$Js42%u\n]pugCeK)\cGt,pAY/6WrE#!_H[!=!$2";#"7,Ds03St
-rji)5p&>%`eGfIKQ\GG=!TuB=rr=)9rr=)9rr='js+13Bs*t~>
-!$2(=!H#(;rrGX?rr3"bLAq2Zju<>?l.=P>h*:l<!A3d3rr=)<rrHr?rr3;:@K1_Qq>^5bJc#HJ
-WcIh5!V%]=rrGI@rr3ChMuQnts8VVDV>i::rr3"LSG)s`a&W*<!$2%<")#(BrVkCOls@F+$N;FT
-&f]0jrrJ[@rr3#c0`D"[4Q,F!jT#8@9^LLmk5PA]/+N?5!HP4>rrKu@rVlj<rVm+KW;6JnZ!6So
-rr=)4rrG[?rr3"cL&V)Qk;N;=!E[;<rrGp?qYpO9JcC<$TDsE~>
-!$2(=!H#(;rrGX?rr3"bLAq2Zju<>?l.=P>h*:l<!A3d3rr=)<rrHr?rr3;:@K1_Qq>^5bJc#HJ
-WcIh5!V%]=rrGI@rr3ChMuQnts8VVDV>i::rr3"LSG)s`a&W*<!$2%<")#(BrVkCOls@F+$N;FT
-&f]0jrrJ[@rr3#c0`D"[4Q,F!jT#8@9^LLmk5PA]/+N?5!HP4>rrKu@rVlj<rVm+KW;6JnZ!6So
-rr=)4rrG[?rr3"cL&V)Qk;N;=!E[;<rrGp?qYpO9JcC<$TDsE~>
-!$2(=!H#(;rrGX?rr3"bLAq2Zju<>?l.=P>h*:l<!A3d3rr=)<rrHr?rr3;:@K1_Qq>^5bJc#HJ
-WcIh5!V%]=rrGI@rr3ChMuQnts8VVDV>i::rr3"LSG)s`a&W*<!$2%<")#(BrVkCOls@F+$N;FT
-&f]0jrrJ[@rr3#c0`D"[4Q,F!jT#8@9^LLmk5PA]/+N?5!HP4>rrKu@rVlj<rVm+KW;6JnZ!6So
-rr=)4rrG[?rr3"cL&V)Qk;N;=!E[;<rrGp?qYpO9JcC<$TDsE~>
-!$2(=!H#(;rrGX?rr31nL&(cKfL5W:!ROO=rrF_?qu6]dn,*+b*W?!MG,kK?r3L5>DR'->r2b#?
-o_\Xf!NL2=rrMNXr;Qff/,fJ`:X9"?q2^a>8(IY>q1kI>5McA>pjf.=rrW,cp&+gja&W*<"t]9D
-s7^9?r;QlmA&J?FoE&p)r;Q]tq<dtTrrJ[@rr3St47iLPoL@j%6hC?Xo02Ho62gfa/+NW=!qu$Y
-r;Qe<WrE#&`aJN?s7%Z>rrVn+_#F?7Z#'C=!$2%<!qYgXr;QdgeGfIPSqQq>s4Kd=rrVdXkPY>]
-o/c@:rr='js+13Bs*t~>
-!$2(=!H#(;rrGX?rr31nL&(cKfL5W:!ROO=rrF_?qu6]dn,*+b*W?!MG,kK?r3L5>DR'->r2b#?
-o_\Xf!NL2=rrMNXr;Qff/,fJ`:X9"?q2^a>8(IY>q1kI>5McA>pjf.=rrW,cp&+gja&W*<"t]9D
-s7^9?r;QlmA&J?FoE&p)r;Q]tq<dtTrrJ[@rr3St47iLPoL@j%6hC?Xo02Ho62gfa/+NW=!qu$Y
-r;Qe<WrE#&`aJN?s7%Z>rrVn+_#F?7Z#'C=!$2%<!qYgXr;QdgeGfIPSqQq>s4Kd=rrVdXkPY>]
-o/c@:rr='js+13Bs*t~>
-!$2(=!H#(;rrGX?rr31nL&(cKfL5W:!ROO=rrF_?qu6]dn,*+b*W?!MG,kK?r3L5>DR'->r2b#?
-o_\Xf!NL2=rrMNXr;Qff/,fJ`:X9"?q2^a>8(IY>q1kI>5McA>pjf.=rrW,cp&+gja&W*<"t]9D
-s7^9?r;QlmA&J?FoE&p)r;Q]tq<dtTrrJ[@rr3St47iLPoL@j%6hC?Xo02Ho62gfa/+NW=!qu$Y
-r;Qe<WrE#&`aJN?s7%Z>rrVn+_#F?7Z#'C=!$2%<!qYgXr;QdgeGfIPSqQq>s4Kd=rrVdXkPY>]
-o/c@:rr='js+13Bs*t~>
-!$2(=!H#(>rseACd5nGXg&M)7QI4)Lrr3GhdF$63s8V?2d3Z]XhYmHT,o6L[%Hc'c(t$ais8R#B
-dC<ffrs3;IdBd]is*:UCd/f_qrr3&r!'pP`%GoLO,LOp&s8Pd:d@H*mrrbg=d?p!orrbd<d?9go
-rrULHCB"5Ef$U6^dF%I`qF/fZJueqOr;P(EIBrbM!HY7=ruS!:PlLd^dF!JXdF%ahf3m"RB?pPW
-d:L_Q@b(M<=T-VJ9(W&^'70_os8Vc>d9V[XdJs6SHdU58nG`FgJ"HW=!P`^Sd/ZZ7rt8-.l2UeO
-dEt%YdFnR"P*XMC7fE>f<64t:!DLl9rr='js+13Bs*t~>
-!$2(=!H#(>rseACd5nGXg&M)7QI4)Lrr3GhdF$63s8V?2d3Z]XhYmHT,o6L[%Hc'c(t$ais8R#B
-dC<ffrs3;IdBd]is*:UCd/f_qrr3&r!'pP`%GoLO,LOp&s8Pd:d@H*mrrbg=d?p!orrbd<d?9go
-rrULHCB"5Ef$U6^dF%I`qF/fZJueqOr;P(EIBrbM!HY7=ruS!:PlLd^dF!JXdF%ahf3m"RB?pPW
-d:L_Q@b(M<=T-VJ9(W&^'70_os8Vc>d9V[XdJs6SHdU58nG`FgJ"HW=!P`^Sd/ZZ7rt8-.l2UeO
-dEt%YdFnR"P*XMC7fE>f<64t:!DLl9rr='js+13Bs*t~>
-!$2(=!H#(>rseACd5nGXg&M)7QI4)Lrr3GhdF$63s8V?2d3Z]XhYmHT,o6L[%Hc'c(t$ais8R#B
-dC<ffrs3;IdBd]is*:UCd/f_qrr3&r!'pP`%GoLO,LOp&s8Pd:d@H*mrrbg=d?p!orrbd<d?9go
-rrULHCB"5Ef$U6^dF%I`qF/fZJueqOr;P(EIBrbM!HY7=ruS!:PlLd^dF!JXdF%ahf3m"RB?pPW
-d:L_Q@b(M<=T-VJ9(W&^'70_os8Vc>d9V[XdJs6SHdU58nG`FgJ"HW=!P`^Sd/ZZ7rt8-.l2UeO
-dEt%YdFnR"P*XMC7fE>f<64t:!DLl9rr='js+13Bs*t~>
-!$2(=#&Sap[f?B>r(@$+rr3(Z92#3^rr\``92GQe!3,lh!.OnH!G*,IrrAVf9)skKrrR(2B)MZ1
-BM31?rr@9B9)sbGrrW'`5lUc`JG`%?W;ceu:eQK?rr`6n98`]J"8GM^OSo+[h)/sHrr?O+9*WB8
-s5lsIUAk/mp&7SaW;?MpSAY=*"i)ONs8Vlk9*XGVs2[i+_#=98_FmPArr2uGrC[.KrVm%q*5DOR
-gAFSD:&b.pX%Q+BrVlnp]);R.Zi*Msrr)j#KFd>Is1J8&!,MT6"-#rHr;HWrLY2M(!J0,*rr^WT
-Zl=SrJcDABJ,~>
-!$2(=#&Sap[f?B>r(@$+rr3(Z92#3^rr\``92GQe!3,lh!.OnH!G*,IrrAVf9)skKrrR(2B)MZ1
-BM31?rr@9B9)sbGrrW'`5lUc`JG`%?W;ceu:eQK?rr`6n98`]J"8GM^OSo+[h)/sHrr?O+9*WB8
-s5lsIUAk/mp&7SaW;?MpSAY=*"i)ONs8Vlk9*XGVs2[i+_#=98_FmPArr2uGrC[.KrVm%q*5DOR
-gAFSD:&b.pX%Q+BrVlnp]);R.Zi*Msrr)j#KFd>Is1J8&!,MT6"-#rHr;HWrLY2M(!J0,*rr^WT
-Zl=SrJcDABJ,~>
-!$2(=#&Sap[f?B>r(@$+rr3(Z92#3^rr\``92GQe!3,lh!.OnH!G*,IrrAVf9)skKrrR(2B)MZ1
-BM31?rr@9B9)sbGrrW'`5lUc`JG`%?W;ceu:eQK?rr`6n98`]J"8GM^OSo+[h)/sHrr?O+9*WB8
-s5lsIUAk/mp&7SaW;?MpSAY=*"i)ONs8Vlk9*XGVs2[i+_#=98_FmPArr2uGrC[.KrVm%q*5DOR
-gAFSD:&b.pX%Q+BrVlnp]);R.Zi*Msrr)j#KFd>Is1J8&!,MT6"-#rHr;HWrLY2M(!J0,*rr^WT
-Zl=SrJcDABJ,~>
-!$2(="/omHD;5'j*S^Spgd'Wo!O?IprrIq?g]%:[^YAbh1[3cr"/0CAFFjICs.B=A~>
-!$2(="/omHD;5'j*S^Spgd'Wo!O?IprrIq?g]%:[^YAbh1[3cr"/0CAFFjICs.B=A~>
-!$2(="/omHD;5'j*S^Spgd'Wo!O?IprrIq?g]%:[^YAbh1[3cr"/0CAFFjICs.B=A~>
-!$0Vi!KE/qrrW+FUtktOk'abprrUPsbhW4"\q/eprrT!Kon!-os+14Fs*t~>
-!$0Vi!KE/qrrW+FUtktOk'abprrUPsbhW4"\q/eprrT!Kon!-os+14Fs*t~>
-!$0Vi!KE/qrrW+FUtktOk'abprrUPsbhW4"\q/eprrT!Kon!-os+14Fs*t~>
-!$0Vi!O2LWrrN)%g]%<B^>&YghTjmU!RKTVrrKn$JcC<$JcGKEJ,~>
-!$0Vi!O2LWrrN)%g]%<B^>&YghTjmU!RKTVrrKn$JcC<$JcGKEJ,~>
-!$0Vi!O2LWrrN)%g]%<B^>&YghTjmU!RKTVrrKn$JcC<$JcGKEJ,~>
-!$.X1!SDh6rrC7A5QK%#rrJ>#p&>&uU\t,l_>Z\"ec#LKV6GONJcC<$hZ&*~>
-!$.X1!SDh6rrC7A5QK%#rrJ>#p&>&uU\t,l_>Z\"ec#LKV6GONJcC<$hZ&*~>
-!$.X1!SDh6rrC7A5QK%#rrJ>#p&>&uU\t,l_>Z\"ec#LKV6GONJcC<$hZ&*~>
-!Zh<Ir$)>4s8S:^o)Ac,,O4Up!^%].ec,^;8E]sO"TCUbZAJS\"Z/[Js,sDOrs&<E>Q=_N_"[j3
-dV8`9[J'V'\lIP@p@\FeS;d+>rrC+<,66HsrrV_<Y5SA'o\A4na8Q#>mVojjs+13$s53j,~>
-!Zh<Ir$)>4s8S:^o)Ac,,O4Up!^%].ec,^;8E]sO"TCUbZAJS\"Z/[Js,sDOrs&<E>Q=_N_"[j3
-dV8`9[J'V'\lIP@p@\FeS;d+>rrC+<,66HsrrV_<Y5SA'o\A4na8Q#>mVojjs+13$s53j,~>
-!Zh<Ir$)>4s8S:^o)Ac,,O4Up!^%].ec,^;8E]sO"TCUbZAJS\"Z/[Js,sDOrs&<E>Q=_N_"[j3
-dV8`9[J'V'\lIP@p@\FeS;d+>rrC+<,66HsrrV_<Y5SA'o\A4na8Q#>mVojjs+13$s53j,~>
-!Zh=>rV6]S3WK-WF0PQ6rrW)nrp9Xf5Ml4O?/GS],PqE@f1,]<&cNmPVK`(?2WiUik^]N0s6V]9
-rrs_D_.`%J]_DF/b>J:\WV6>m\mk:2!r%S@rr3#S7/co^0_,/B!f!3?qu6[sa8Gr=GH(Ijs+13$
-s5<p-~>
-!Zh=>rV6]S3WK-WF0PQ6rrW)nrp9Xf5Ml4O?/GS],PqE@f1,]<&cNmPVK`(?2WiUik^]N0s6V]9
-rrs_D_.`%J]_DF/b>J:\WV6>m\mk:2!r%S@rr3#S7/co^0_,/B!f!3?qu6[sa8Gr=GH(Ijs+13$
-s5<p-~>
-!Zh=>rV6]S3WK-WF0PQ6rrW)nrp9Xf5Ml4O?/GS],PqE@f1,]<&cNmPVK`(?2WiUik^]N0s6V]9
-rrs_D_.`%J]_DF/b>J:\WV6>m\mk:2!r%S@rr3#S7/co^0_,/B!f!3?qu6[sa8Gr=GH(Ijs+13$
-s5<p-~>
-!$2";!S0d=rrR#CrV$6nilfOArVllVrlY;kr;QfHd/<nK3o^1dHN4$"rlYl+s8V$Is3AgBs8Us!
-bPB?;rr2uLrlYT(s8Ufr(X("[rVlj<qu7B09`MVcs8Q9ls2[$bs8UT^-HjTqrr2uBrlY`7s8Pal
-s0OVbs8UL?rlY<.rr3,OFoRN7pAY0)@f?<-qpkZF"k`YNs/C)<rrM+mrr3&R:%\Da!F<J;rrH-?
-qu6[kd"24Js+14.s*t~>
-!$2";!S0d=rrR#CrV$6nilfOArVllVrlY;kr;QfHd/<nK3o^1dHN4$"rlYl+s8V$Is3AgBs8Us!
-bPB?;rr2uLrlYT(s8Ufr(X("[rVlj<qu7B09`MVcs8Q9ls2[$bs8UT^-HjTqrr2uBrlY`7s8Pal
-s0OVbs8UL?rlY<.rr3,OFoRN7pAY0)@f?<-qpkZF"k`YNs/C)<rrM+mrr3&R:%\Da!F<J;rrH-?
-qu6[kd"24Js+14.s*t~>
-!$2";!S0d=rrR#CrV$6nilfOArVllVrlY;kr;QfHd/<nK3o^1dHN4$"rlYl+s8V$Is3AgBs8Us!
-bPB?;rr2uLrlYT(s8Ufr(X("[rVlj<qu7B09`MVcs8Q9ls2[$bs8UT^-HjTqrr2uBrlY`7s8Pal
-s0OVbs8UL?rlY<.rr3,OFoRN7pAY0)@f?<-qpkZF"k`YNs/C)<rrM+mrr3&R:%\Da!F<J;rrH-?
-qu6[kd"24Js+14.s*t~>
-!$2%<!luR\qu6\6YP.tuSPTp\rr3#PGQ(D>@)`*E!@8NZrrG1?rVloGD>m?GC!H[BQ*41aD:&;e
-4]%qNE7=jeFoG2CF4L;C:^KrpQMpg`*UNe4CeG:8:p'ct\P`?&!J]_2rrF"/r_NWSlgOiS\mkX<
-!UMN=rrkOCs8T'>q>UNBCZ53k!F<J;rrH-?qu6[kd"24Js+14.s*t~>
-!$2%<!luR\qu6\6YP.tuSPTp\rr3#PGQ(D>@)`*E!@8NZrrG1?rVloGD>m?GC!H[BQ*41aD:&;e
-4]%qNE7=jeFoG2CF4L;C:^KrpQMpg`*UNe4CeG:8:p'ct\P`?&!J]_2rrF"/r_NWSlgOiS\mkX<
-!UMN=rrkOCs8T'>q>UNBCZ53k!F<J;rrH-?qu6[kd"24Js+14.s*t~>
-!$2%<!luR\qu6\6YP.tuSPTp\rr3#PGQ(D>@)`*E!@8NZrrG1?rVloGD>m?GC!H[BQ*41aD:&;e
-4]%qNE7=jeFoG2CF4L;C:^KrpQMpg`*UNe4CeG:8:p'ct\P`?&!J]_2rrF"/r_NWSlgOiS\mkX<
-!UMN=rrkOCs8T'>q>UNBCZ53k!F<J;rrH-?qu6[kd"24Js+14.s*t~>
-!$2%<".O.FUAOrj*VB@42Wk#=!JQm>rrLY@rVlnMHN*pI`0)9pTDnikCp<p=&\DKOs$g8gs0HG>
->J^=[s/L,:rrJj?rr2s=qYpO9li."Q0`:qO+T;<>!Nj`DrrEjhrr3"*^@2(&\mkX<$hSPIs8TTP
-mJm3cF8Gn<b'_b:rrHE?qu6[sa8>l;:!eIkJcC<$i;\<~>
-!$2%<".O.FUAOrj*VB@42Wk#=!JQm>rrLY@rVlnMHN*pI`0)9pTDnikCp<p=&\DKOs$g8gs0HG>
->J^=[s/L,:rrJj?rr2s=qYpO9li."Q0`:qO+T;<>!Nj`DrrEjhrr3"*^@2(&\mkX<$hSPIs8TTP
-mJm3cF8Gn<b'_b:rrHE?qu6[sa8>l;:!eIkJcC<$i;\<~>
-!$2%<".O.FUAOrj*VB@42Wk#=!JQm>rrLY@rVlnMHN*pI`0)9pTDnikCp<p=&\DKOs$g8gs0HG>
->J^=[s/L,:rrJj?rr2s=qYpO9li."Q0`:qO+T;<>!Nj`DrrEjhrr3"*^@2(&\mkX<$hSPIs8TTP
-mJm3cF8Gn<b'_b:rrHE?qu6[sa8>l;:!eIkJcC<$i;\<~>
-!$1t:!V[r=rrJ%?o`"qMk5PA]KpVf=!S'a9rrg)o++'CSrrHr?rr3\E@K6?sf)Pd*])Q!NruM->
-ErZ0&rcJ66HN*pE*W#d9*UE_+m4eJ<!1Ee.!5nR2!$2%<!FEM/rrK]?r;QrH:B1>t_uBZ:WH7t:
-!mH/@qYpS%^\e$3<QG":!DUpls+13$s5<p-~>
-!$1t:!V[r=rrJ%?o`"qMk5PA]KpVf=!S'a9rrg)o++'CSrrHr?rr3\E@K6?sf)Pd*])Q!NruM->
-ErZ0&rcJ66HN*pE*W#d9*UE_+m4eJ<!1Ee.!5nR2!$2%<!FEM/rrK]?r;QrH:B1>t_uBZ:WH7t:
-!mH/@qYpS%^\e$3<QG":!DUpls+13$s5<p-~>
-!$1t:!V[r=rrJ%?o`"qMk5PA]KpVf=!S'a9rrg)o++'CSrrHr?rr3\E@K6?sf)Pd*])Q!NruM->
-ErZ0&rcJ66HN*pE*W#d9*UE_+m4eJ<!1Ee.!5nR2!$2%<!FEM/rrK]?r;QrH:B1>t_uBZ:WH7t:
-!mH/@qYpS%^\e$3<QG":!DUpls+13$s5<p-~>
-!$1t:!V[r>rrRqDqt0mh2Wk#=!JQm>[email protected]/lXCp<p="hS4Cs$kT;rs;oGruM->ErV/d
-rhfd3HN*pE*W#d9*UE_+m4eG;!3#mp!IDl_rr=)<rrHH?n,EF"@f660mZ3s:MsC<A!NC/<rrU\m
-deWnD?,-::!EI2;rrGj@JcC<$JcF[.J,~>
-!$1t:!V[r>rrRqDqt0mh2Wk#=!JQm>[email protected]/lXCp<p="hS4Cs$kT;rs;oGruM->ErV/d
-rhfd3HN*pE*W#d9*UE_+m4eG;!3#mp!IDl_rr=)<rrHH?n,EF"@f660mZ3s:MsC<A!NC/<rrU\m
-deWnD?,-::!EI2;rrGj@JcC<$JcF[.J,~>
-!$1t:!V[r>rrRqDqt0mh2Wk#=!JQm>[email protected]/lXCp<p="hS4Cs$kT;rs;oGruM->ErV/d
-rhfd3HN*pE*W#d9*UE_+m4eG;!3#mp!IDl_rr=)<rrHH?n,EF"@f660mZ3s:MsC<A!NC/<rrU\m
-deWnD?,-::!EI2;rrGj@JcC<$JcF[.J,~>
-"!.ESQ2^dapEon>!f3H@oD\hLk5PA]KpVf=!S'a>rrH1pr;QdYir/lXCp<p="hS4Cs$kT;rsi8L
-ruM->ErT(\s8U@jHN*pI*WQ/ET`4rl\mt+,#jj>Gs-L=s;uQ^q!H5+8rr=)<rrHH?pAY3*40AJ]
-!P2b;rr]NAGGY9<!pbT@rr3&[?J>5T!h#5@qu6[sa8Gr=N19J;rrRp:iIV#[s+146s*t~>
-"!.ESQ2^dapEon>!f3H@oD\hLk5PA]KpVf=!S'a>rrH1pr;QdYir/lXCp<p="hS4Cs$kT;rsi8L
-ruM->ErT(\s8U@jHN*pI*WQ/ET`4rl\mt+,#jj>Gs-L=s;uQ^q!H5+8rr=)<rrHH?pAY3*40AJ]
-!P2b;rr]NAGGY9<!pbT@rr3&[?J>5T!h#5@qu6[sa8Gr=N19J;rrRp:iIV#[s+146s*t~>
-"!.ESQ2^dapEon>!f3H@oD\hLk5PA]KpVf=!S'a>rrH1pr;QdYir/lXCp<p="hS4Cs$kT;rsi8L
-ruM->ErT(\s8U@jHN*pI*WQ/ET`4rl\mt+,#jj>Gs-L=s;uQ^q!H5+8rr=)<rrHH?pAY3*40AJ]
-!P2b;rr]NAGGY9<!pbT@rr3&[?J>5T!h#5@qu6[sa8Gr=N19J;rrRp:iIV#[s+146s*t~>
-"!.F7L]/>!-0>1,OHfM3rs4/s"rf])s7("+*W\IhrVlmE(B"153o^,<!Ua.j*X,I.s8PR>r;R72
-_>iTrWcJ.*7ii^IO*^g*"P=b:D".H(!U2E,rs8S9*Zg(.s5bC&*W_5mq#:=7rVln)^@qR.V#ZbY
-rrK]?qu6clO,!<)rrJ(@rr3#R#lG_DoD\ajH_UB:!EI2<rrHl?qu6_+!8)l&JcC<$kl6/~>
-"!.F7L]/>!-0>1,OHfM3rs4/s"rf])s7("+*W\IhrVlmE(B"153o^,<!Ua.j*X,I.s8PR>r;R72
-_>iTrWcJ.*7ii^IO*^g*"P=b:D".H(!U2E,rs8S9*Zg(.s5bC&*W_5mq#:=7rVln)^@qR.V#ZbY
-rrK]?qu6clO,!<)rrJ(@rr3#R#lG_DoD\ajH_UB:!EI2<rrHl?qu6_+!8)l&JcC<$kl6/~>
-"!.F7L]/>!-0>1,OHfM3rs4/s"rf])s7("+*W\IhrVlmE(B"153o^,<!Ua.j*X,I.s8PR>r;R72
-_>iTrWcJ.*7ii^IO*^g*"P=b:D".H(!U2E,rs8S9*Zg(.s5bC&*W_5mq#:=7rVln)^@qR.V#ZbY
-rrK]?qu6clO,!<)rrJ(@rr3#R#lG_DoD\ajH_UB:!EI2<rrHl?qu6_+!8)l&JcC<$kl6/~>
-!Zh=@r;Q]q!<2Qhr;Q]qr;QWos8Mrr!<2lqr;Q]q!<2lq!<2or!ri6"rVcitrr)lrrqucsct2PC
-rr2osr;QHj!<2rs!<2Wj!Jcp<rrg.X*?E#qs8W)qrrW1K\,QF)rr2ouUltZU"L]<k*6nH^!L9>S
-s8W(Ls+13$s6'E4~>
-!Zh=@r;Q]q!<2Qhr;Q]qr;QWos8Mrr!<2lqr;Q]q!<2lq!<2or!ri6"rVcitrr)lrrqucsct2PC
-rr2osr;QHj!<2rs!<2Wj!Jcp<rrg.X*?E#qs8W)qrrW1K\,QF)rr2ouUltZU"L]<k*6nH^!L9>S
-s8W(Ls+13$s6'E4~>
-!Zh=@r;Q]q!<2Qhr;Q]qr;QWos8Mrr!<2lqr;Q]q!<2lq!<2or!ri6"rVcitrr)lrrqucsct2PC
-rr2osr;QHj!<2rs!<2Wj!Jcp<rrg.X*?E#qs8W)qrrW1K\,QF)rr2ouUltZU"L]<k*6nH^!L9>S
-s8W(Ls+13$s6'E4~>
-!$-XjhZ!ZCKWKb)JcC<$W;hA~>
-!$-XjhZ!ZCKWKb)JcC<$W;hA~>
-!$-XjhZ!ZCKWKb)JcC<$W;hA~>
-!$-XjhZ!VoV1JYts+13Js*t~>
-!$-XjhZ!VoV1JYts+13Js*t~>
-!$-XjhZ!VoV1JYts+13Js*t~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-"!.EGKDtlRpH/DRMZ3VYn3d5LP5bIij\#Q@RfEEb3<0$WGlA]a6N$i_#?;`a8,rVfC&T+R;>l(G
-JcC<$JcE=]J,~>
-"!.EGKDtlRpH/DRMZ3VYn3d5LP5bIij\#Q@RfEEb3<0$WGlA]a6N$i_#?;`a8,rVfC&T+R;>l(G
-JcC<$JcE=]J,~>
-"!.EGKDtlRpH/DRMZ3VYn3d5LP5bIij\#Q@RfEEb3<0$WGlA]a6N$i_#?;`a8,rVfC&T+R;>l(G
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4IfB?]mOnO*LB%;6+?0=\NrT.U,6.[sQi@!ceO]]>#=@//1]RJsW;cet`*%Zk
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4IfB?]mOnO*LB%;6+?0=\NrT.U,6.[sQi@!ceO]]>#=@//1]RJsW;cet`*%Zk
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4IfB?]mOnO*LB%;6+?0=\NrT.U,6.[sQi@!ceO]]>#=@//1]RJsW;cet`*%Zk
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4?iIkU[4_KFLB#Xsj#@!uNrT.U,6.[sQi@!ceO]]>#=@//1]RJsJ,[7bPZ`S;
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4?iIkU[4_KFLB#Xsj#@!uNrT.U,6.[sQi@!ceO]]>#=@//1]RJsJ,[7bPZ`S;
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4?iIkU[4_KFLB#Xsj#@!uNrT.U,6.[sQi@!ceO]]>#=@//1]RJsJ,[7bPZ`S;
-JcC<$JcE=]J,~>
-"!.E>FoMCDpEop4/cJof<%e3:L;e#pju<=#NrT.U,6.[sQi@!neO]`?`bsu(1]RJs4T/F`P_&jc
-s+13$s185\~>
-"!.E>FoMCDpEop4/cJof<%e3:L;e#pju<=#NrT.U,6.[sQi@!neO]`?`bsu(1]RJs4T/F`P_&jc
-s+13$s185\~>
-"!.E>FoMCDpEop4/cJof<%e3:L;e#pju<=#NrT.U,6.[sQi@!neO]`?`bsu(1]RJs4T/F`P_&jc
-s+13$s185\~>
-"!.E>FoMCDN@+[tIfB?]mOnO*7t'7oju<=#NrT.U,6.[sQi@!neO]`?@(lU)1]RJsW.Fu"s+13$
-s0_lW~>
-"!.E>FoMCDN@+[tIfB?]mOnO*7t'7oju<=#NrT.U,6.[sQi@!neO]`?@(lU)1]RJsW.Fu"s+13$
-s0_lW~>
-"!.E>FoMCDN@+[tIfB?]mOnO*7t'7oju<=#NrT.U,6.[sQi@!neO]`?@(lU)1]RJsW.Fu"s+13$
-s0_lW~>
-"!.EqJc9EfN$eRsIfB?]mOnO*:>,[Iju<=#4DS_H%ZgY6I/[miEjG_O-r4Vf'q,*@H2_RZNIh+\
-s+13$s1//[~>
-"!.EqJc9EfN$eRsIfB?]mOnO*:>,[Iju<=#4DS_H%ZgY6I/[miEjG_O-r4Vf'q,*@H2_RZNIh+\
-s+13$s1//[~>
-"!.EqJc9EfN$eRsIfB?]mOnO*:>,[Iju<=#4DS_H%ZgY6I/[miEjG_O-r4Vf'q,*@H2_RZNIh+\
-s+13$s1//[~>
-"!.FAg]"G\n0\1pfDbdQqS3'fgA_*SpVQscrNQKo5QCc2rilU?s8RLcrilTd;#gR>rilI@JcC<$
-JcC<$\c70~>
-"!.FAg]"G\n0\1pfDbdQqS3'fgA_*SpVQscrNQKo5QCc2rilU?s8RLcrilTd;#gR>rilI@JcC<$
-JcC<$\c70~>
-"!.FAg]"G\n0\1pfDbdQqS3'fgA_*SpVQscrNQKo5QCc2rilU?s8RLcrilTd;#gR>rilI@JcC<$
-JcC<$\c70~>
-"!.EOOT,7\pEo5+!Sp!8rrM9Lrr3#lh1>TWs+13$s0DZT~>
-"!.EOOT,7\pEo5+!Sp!8rrM9Lrr3#lh1>TWs+13$s0DZT~>
-"!.EOOT,7\pEo5+!Sp!8rrM9Lrr3#lh1>TWs+13$s0DZT~>
-"!.F:N;agu,jt!u!W;G<s+13$s+13Es*t~>
-"!.F:N;agu,jt!u!W;G<s+13$s+13Es*t~>
-"!.F:N;agu,jt!u!W;G<s+13$s+13Es*t~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$1k7!Tr3hs+13$s+130s*t~>
-!$1k7!Tr3hs+13$s+130s*t~>
-!$1k7!Tr3hs+13$s+130s*t~>
-!$1k7!M=gls+13$s+130s*t~>
-!$1k7!M=gls+13$s+130s*t~>
-!$1k7!M=gls+13$s+130s*t~>
-!$1k7!M=gls+13$s+130s*t~>
-!$1k7!M=gls+13$s+130s*t~>
-!$1k7!M=gls+13$s+130s*t~>
-"!.FA\c-1DC]FF,IfB?Jon%bpJcC<$JcCo5J,~>
-"!.FA\c-1DC]FF,IfB?Jon%bpJcC<$JcCo5J,~>
-"!.FA\c-1DC]FF,IfB?Jon%bpJcC<$JcCo5J,~>
-"!.EWHiCG[ZXj*.IfKF\:r@kaJcC<$JcCo5J,~>
-"!.EWHiCG[ZXj*.IfKF\:r@kaJcC<$JcCo5J,~>
-"!.EWHiCG[ZXj*.IfKF\:r@kaJcC<$JcCo5J,~>
-"!.E>FoMCHpEop4IX`oYeq*jPs+13$s,m>3~>
-"!.E>FoMCHpEop4IX`oYeq*jPs+13$s,m>3~>
-"!.E>FoMCHpEop4IX`oYeq*jPs+13$s,m>3~>
-"!.E>FoMCGpEop4%[H&MJcC<$JcC<$OT0h~>
-"!.E>FoMCGpEop4%[H&MJcC<$JcC<$OT0h~>
-"!.E>FoMCGpEop4%[H&MJcC<$JcC<$OT0h~>
-"!.E>FoMCHpEop4IXWfXf7EsQs+13$s,m>3~>
-"!.E>FoMCHpEop4IXWfXf7EsQs+13$s,m>3~>
-"!.E>FoMCHpEop4IXWfXf7EsQs+13$s,m>3~>
-"!.EWHiCJ\Zt'-.IfKF[:W.haJcC<$JcCo5J,~>
-"!.EWHiCJ\Zt'-.IfKF[:W.haJcC<$JcCo5J,~>
-"!.EWHiCJ\Zt'-.IfKF[:W.haJcC<$JcCo5J,~>
-"!.FA\Gg"ACB+=QZ2Xb(omhVnJcC<$JcCo5J,~>
-"!.FA\Gg"ACB+=QZ2Xb(omhVnJcC<$JcCo5J,~>
-"!.FA\Gg"ACB+=QZ2Xb(omhVnJcC<$JcCo5J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$1>(!5\M"!/Q4+JcC<$JcDMFJ,~>
-!$1>(!5\M"!/Q4+JcC<$JcDMFJ,~>
-!$1>(!5\M"!/Q4+JcC<$JcDMFJ,~>
-!$1>(!NTW+fE%aPJcC<$JcC<$U]5i~>
-!$1>(!NTW+fE%aPJcC<$JcC<$U]5i~>
-!$1>(!NTW+fE%aPJcC<$JcC<$U]5i~>
-!$2";!UqE7rrS:OqY'piX)\(;!Phrks+13$s+13Fs*t~>
-!$2";!UqE7rrS:OqY'piX)\(;!Phrks+13$s+13Fs*t~>
-!$2";!UqE7rrS:OqY'piX)\(;!Phrks+13$s+13Fs*t~>
-!$2%<!o?]]rVlqMU\FN_!NU5<rrKo?JcC<$JcC<$U]5i~>
-!$2%<!o?]]rVlqMU\FN_!NU5<rrKo?JcC<$JcC<$U]5i~>
-!$2%<!o?]]rVlqMU\FN_!NU5<rrKo?JcC<$JcC<$U]5i~>
-!$2(="4M)A*W5p=I\Q`7rrK0?r;Qf5>_2p+s+13$s.fUE~>
-!$2(="4M)A*W5p=I\Q`7rrK0?r;Qf5>_2p+s+13$s.fUE~>
-!$2(="4M)A*W5p=I\Q`7rrK0?r;Qf5>_2p+s+13$s.fUE~>
-#9EjEc[=+>*W,j;JsuK7!NU5<rrKo?JcC<$JcC<$U]5i~>
-#9EjEc[=+>*W,j;JsuK7!NU5<rrKo?JcC<$JcC<$U]5i~>
-#9EjEc[=+>*W,j;JsuK7!NU5<rrKo?JcC<$JcC<$U]5i~>
-#9EilJ'@rm*W#d9*VfX8X)\(;!Phrks+13$s+13Fs*t~>
-#9EilJ'@rm*W#d9*VfX8X)\(;!Phrks+13$s+13Fs*t~>
-#9EilJ'@rm*W#d9*VfX8X)\(;!Phrks+13$s+13Fs*t~>
-"!.E>.fNZR$Zu=H!Ht@8rrK0?r;Qf5>_2p+s+13$s.fUE~>
-"!.E>.fNZR$Zu=H!Ht@8rrK0?r;Qf5>_2p+s+13$s.fUE~>
-"!.E>.fNZR$Zu=H!Ht@8rrK0?r;Qf5>_2p+s+13$s.fUE~>
-!Zh=*rP/FLao25@FK>?7rrK0?r;Qf5>_2p+s+13$s.fUE~>
-!Zh=*rP/FLao25@FK>?7rrK0?r;Qf5>_2p+s+13$s.fUE~>
-!Zh=*rP/FLao25@FK>?7rrK0?r;Qf5>_2p+s+13$s.fUE~>
-!$1t:!$2%<!dUd@p\t8pEW#h;^g)HjJcC<$JcDMFJ,~>
-!$1t:!$2%<!dUd@p\t8pEW#h;^g)HjJcC<$JcDMFJ,~>
-!$1t:!$2%<!dUd@p\t8pEW#h;^g)HjJcC<$JcDMFJ,~>
-!$1t:!&FQR!g'2VpAY/oEW#h;^g)HjJcC<$JcDMFJ,~>
-!$1t:!&FQR!g'2VpAY/oEW#h;^g)HjJcC<$JcDMFJ,~>
-!$1t:!&FQR!g'2VpAY/oEW#h;^g)HjJcC<$JcDMFJ,~>
-!$1>(!NU5<rrKo?JcC<$JcC<$U]5i~>
-!$1>(!NU5<rrKo?JcC<$JcC<$U]5i~>
-!$1>(!NU5<rrKo?JcC<$JcC<$U]5i~>
-!$1>(!NSrmXT=#YJcC<$JcC<$U]5i~>
-!$1>(!NSrmXT=#YJcC<$JcC<$U]5i~>
-!$1>(!NSrmXT=#YJcC<$JcC<$U]5i~>
-!$1>(!71L[!2G,FJcC<$JcDMFJ,~>
-!$1>(!71L[!2G,FJcC<$JcDMFJ,~>
-!$1>(!71L[!2G,FJcC<$JcDMFJ,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-!$-XjJcC<$JcC?%J,~>
-%%EndData
-showpage
-%%Trailer
-end
-%%EOF
diff --git a/lib/stdlib/doc/src/ushell2.gif b/lib/stdlib/doc/src/ushell2.gif
deleted file mode 100644
index 273cf2078a..0000000000
--- a/lib/stdlib/doc/src/ushell2.gif
+++ /dev/null
diff --git a/lib/stdlib/doc/src/ushell2.ps b/lib/stdlib/doc/src/ushell2.ps
deleted file mode 100644
index e6db3c2be2..0000000000
--- a/lib/stdlib/doc/src/ushell2.ps
+++ /dev/null
@@ -1,404 +0,0 @@
-%!PS-Adobe-3.0
-%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
-%%Title: ushell2.ps
-%%CreationDate: Mon Mar 16 09:52:14 2009
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%Pages: 1
-%%BoundingBox: 14 14 468 74
-%%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 59.527559055118118 translate
-453.54330708661422 -59.527559055118118 scale
-% Image geometry
-640 84 8
-% Transformation matrix
-[ 640 0 0 84 0 0 ]
-% Strings to hold RGB-samples per scanline
-/rstr 640 string def
-/gstr 640 string def
-/bstr 640 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:        18704 ASCII Bytes
-colorimage
-J`MCCJ`MCCJ`M=~>
-J`MCCJ`MCCJ`M=~>
-J`MCCJ`MCCJ`M=~>
-!)nG7JO+iQJO+lRJ,~>
-!)nG7JO+iQJO+lRJ,~>
-!)nG7JO+iQJO+lRJ,~>
-!D=/Y=b0_,=b0_.=b$~>
-!D=/Y=b0_,=b0_.=b$~>
-!D=/Y=b0_,=b0_.=b$~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M>rrKOJQ2^i3JcC<$JcFU,J,~>
-!D>M>rrKOJQ2^i3JcC<$JcFU,J,~>
-!D>M>rrKOJQ2^i3JcC<$JcFU,J,~>
-"%t`UXo(ooJ,'$ES](+!!dROKr;Qh<:2'>#!I!f.rr]@2s).a0!581-!+,Ru!6ss3!kNp@p\t9X
-H-uWnOA=s3rrK.0nG`Jtr;QbGr_<HIrVlo/@tFZ2s+14-s*t~>
-"%t`UXo(ooJ,'$ES](+!!dROKr;Qh<:2'>#!I!f.rr]@2s).a0!581-!+,Ru!6ss3!kNp@p\t9X
-H-uWnOA=s3rrK.0nG`Jtr;QbGr_<HIrVlo/@tFZ2s+14-s*t~>
-"%t`UXo(ooJ,'$ES](+!!dROKr;Qh<:2'>#!I!f.rr]@2s).a0!581-!+,Ru!6ss3!kNp@p\t9X
-H-uWnOA=s3rrK.0nG`Jtr;QbGr_<HIrVlo/@tFZ2s+14-s*t~>
-"A:iVM0T!F!8RAL!HP42rrUp#*W5p=fZ5E4rrG1@rr3+VQ2`JQrQbK2q#:?CrQbLB\*j7sS:L>5
-!T-**rrJOjli.%FchRG<!HlihrrIe?nc&Yn]MJP,!J%!FcN0Vnrr3#u++aHCs+14-s*t~>
-"A:iVM0T!F!8RAL!HP42rrUp#*W5p=fZ5E4rrG1@rr3+VQ2`JQrQbK2q#:?CrQbLB\*j7sS:L>5
-!T-**rrJOjli.%FchRG<!HlihrrIe?nc&Yn]MJP,!J%!FcN0Vnrr3#u++aHCs+14-s*t~>
-"A:iVM0T!F!8RAL!HP42rrUp#*W5p=fZ5E4rrG1@rr3+VQ2`JQrQbK2q#:?CrQbLB\*j7sS:L>5
-!T-**rrJOjli.%FchRG<!HlihrrIe?nc&Yn]MJP,!J%!FcN0Vnrr3#u++aHCs+14-s*t~>
-"A:iVM3Rl:!;QQc#kn;uEiSm+o_8@b!;HKb!;HEk!$;%;!V[r6rs;$Hs8VtORf>#.rq$3eoD\lN
-QMU(M!l&CArVllrrU^6ks5-$;rq$<ks8W#qoFLs$rV6Ego^r._r:GB$o^qnX!W2]krs&2ss8)B[
-rVlg+qXdY#o_/=bKUDN+o_/%Z$2J#IrQSC<s'rY>rrMrfrVloH97d+os+14.s*t~>
-"A:iVM3Rl:!;QQc#kn;uEiSm+o_8@b!;HKb!;HEk!$;%;!V[r6rs;$Hs8VtORf>#.rq$3eoD\lN
-QMU(M!l&CArVllrrU^6ks5-$;rq$<ks8W#qoFLs$rV6Ego^r._r:GB$o^qnX!W2]krs&2ss8)B[
-rVlg+qXdY#o_/=bKUDN+o_/%Z$2J#IrQSC<s'rY>rrMrfrVloH97d+os+14.s*t~>
-"A:iVM3Rl:!;QQc#kn;uEiSm+o_8@b!;HKb!;HEk!$;%;!V[r6rs;$Hs8VtORf>#.rq$3eoD\lN
-QMU(M!l&CArVllrrU^6ks5-$;rq$<ks8W#qoFLs$rV6Ego^r._r:GB$o^qnX!W2]krs&2ss8)B[
-rVlg+qXdY#o_/=bKUDN+o_/%Z$2J#IrQSC<s'rY>rrMrfrVloH97d+os+14.s*t~>
-#>7/YM1+"-g&D!PlY?DI$r#a^Efa$E-rf=.k?@j5!F+acrr=,;rrMj@o`#1<s8Sp?s8O^er[7f!
-nFce_n:I\.rrK]@r;QcHr?qfQqqj5tr[7lYrV35f-kO2nd:1^L-n*1:a!_W=-n+farrK!?rr35q
-.KBF2-jn]-rsk_N%3R&fs8Rb&=stdhj7rWTKtI?a"NGcfA%MI8!T6+ls+13$s5<p-~>
-#>7/YM1+"-g&D!PlY?DI$r#a^Efa$E-rf=.k?@j5!F+acrr=,;rrMj@o`#1<s8Sp?s8O^er[7f!
-nFce_n:I\.rrK]@r;QcHr?qfQqqj5tr[7lYrV35f-kO2nd:1^L-n*1:a!_W=-n+farrK!?rr35q
-.KBF2-jn]-rsk_N%3R&fs8Rb&=stdhj7rWTKtI?a"NGcfA%MI8!T6+ls+13$s5<p-~>
-#>7/YM1+"-g&D!PlY?DI$r#a^Efa$E-rf=.k?@j5!F+acrr=,;rrMj@o`#1<s8Sp?s8O^er[7f!
-nFce_n:I\.rrK]@r;QcHr?qfQqqj5tr[7lYrV35f-kO2nd:1^L-n*1:a!_W=-n+farrK!?rr35q
-.KBF2-jn]-rsk_N%3R&fs8Rb&=stdhj7rWTKtI?a"NGcfA%MI8!T6+ls+13$s5<p-~>
-#>7/YM'th_:B(7oI@pN=%,$43E\H&Es1hq?B=@g>!OQP=rr=,;rrMj@o`#1<s8Sp?s8Qb.rr3"H
-U%SEdTmZ8-!P2e8rrb=Bh[t\DrrXkBdn0N<#U90GWZSDDruV1>!J6g6rs#?Ds3C3-.K08I6JDA;
-!EI5>rs"-+b5_Li9CVrcA%M^:\[g>jrrM%@JcC<$JcF[.J,~>
-#>7/YM'th_:B(7oI@pN=%,$43E\H&Es1hq?B=@g>!OQP=rr=,;rrMj@o`#1<s8Sp?s8Qb.rr3"H
-U%SEdTmZ8-!P2e8rrb=Bh[t\DrrXkBdn0N<#U90GWZSDDruV1>!J6g6rs#?Ds3C3-.K08I6JDA;
-!EI5>rs"-+b5_Li9CVrcA%M^:\[g>jrrM%@JcC<$JcF[.J,~>
-#>7/YM'th_:B(7oI@pN=%,$43E\H&Es1hq?B=@g>!OQP=rr=,;rrMj@o`#1<s8Sp?s8Qb.rr3"H
-U%SEdTmZ8-!P2e8rrb=Bh[t\DrrXkBdn0N<#U90GWZSDDruV1>!J6g6rs#?Ds3C3-.K08I6JDA;
-!EI5>rs"-+b5_Li9CVrcA%M^:\[g>jrrM%@JcC<$JcF[.J,~>
-"A:iVM3Ro;!O.@YS-6(rs)P.=rrg,Cs(?9LS,mM@rVlj=qu6]k-M7<@Ff=JZXSVqtI%g96!p59A
-mJd3uA,Q?,li!=U,37WFrVlsOnC'u-rraPCs/L,=rr@3@rrI_@p&>5nG5k:_oI9b=!CGN<rrH-@
-rVlnOR/[*ddS'*0#%P7Eo4(4*rVloV4b<Was+14.s*t~>
-"A:iVM3Ro;!O.@YS-6(rs)P.=rrg,Cs(?9LS,mM@rVlj=qu6]k-M7<@Ff=JZXSVqtI%g96!p59A
-mJd3uA,Q?,li!=U,37WFrVlsOnC'u-rraPCs/L,=rr@3@rrI_@p&>5nG5k:_oI9b=!CGN<rrH-@
-rVlnOR/[*ddS'*0#%P7Eo4(4*rVloV4b<Was+14.s*t~>
-"A:iVM3Ro;!O.@YS-6(rs)P.=rrg,Cs(?9LS,mM@rVlj=qu6]k-M7<@Ff=JZXSVqtI%g96!p59A
-mJd3uA,Q?,li!=U,37WFrVlsOnC'u-rraPCs/L,=rr@3@rrI_@p&>5nG5k:_oI9b=!CGN<rrH-@
-rVlnOR/[*ddS'*0#%P7Eo4(4*rVloV4b<Was+14.s*t~>
-"A:iVM3Rl:!3lHR"G!EMEiT-="Me=CB3bCd!4;_)!$;%;!V[r5rr`6B_HQd8!IUU7rrKi?m/I*t
-A,ZE.oRHgj"!$CZ55kK`/b%4\rVm!Equ<[:qYpSJS+ZdcVKVu6ch&[brrGI?r;QdtaSl,>KUDc=
-!RaX1rrHW@rr3#'D#OA7i&uYkJcC<$i;\<~>
-"A:iVM3Rl:!3lHR"G!EMEiT-="Me=CB3bCd!4;_)!$;%;!V[r5rr`6B_HQd8!IUU7rrKi?m/I*t
-A,ZE.oRHgj"!$CZ55kK`/b%4\rVm!Equ<[:qYpSJS+ZdcVKVu6ch&[brrGI?r;QdtaSl,>KUDc=
-!RaX1rrHW@rr3#'D#OA7i&uYkJcC<$i;\<~>
-"A:iVM3Rl:!3lHR"G!EMEiT-="Me=CB3bCd!4;_)!$;%;!V[r5rr`6B_HQd8!IUU7rrKi?m/I*t
-A,ZE.oRHgj"!$CZ55kK`/b%4\rVm!Equ<[:qYpSJS+ZdcVKVu6ch&[brrGI?r;QdtaSl,>KUDc=
-!RaX1rrHW@rr3#'D#OA7i&uYkJcC<$i;\<~>
-"A:iVM3Ro;!O'H@rrgMCs)P.=rrg,Cs(Ae8rr=,;rrMj@o`#$m+2V4\rrITArr3"HU&P&nhI3>\
-rrVG(_X.:(jbC#[email protected]($+6gRf<<h/b%4\rVm!Equ<[:qYp\MS,`M0q#:PqG,("4kUHK1
-!CGN<rs)QFs6>F?KUDc=!RaX1rrHW@rr3#'D#XG9rb/]js+13$s5<p-~>
-"A:iVM3Ro;!O'H@rrgMCs)P.=rrg,Cs(Ae8rr=,;rrMj@o`#$m+2V4\rrITArr3"HU&P&nhI3>\
-rrVG(_X.:(jbC#[email protected]($+6gRf<<h/b%4\rVm!Equ<[:qYp\MS,`M0q#:PqG,("4kUHK1
-!CGN<rs)QFs6>F?KUDc=!RaX1rrHW@rr3#'D#XG9rb/]js+13$s5<p-~>
-"A:iVM3Ro;!O'H@rrgMCs)P.=rrg,Cs(Ae8rr=,;rrMj@o`#$m+2V4\rrITArr3"HU&P&nhI3>\
-rrVG(_X.:(jbC#[email protected]($+6gRf<<h/b%4\rVm!Equ<[:qYp\MS,`M0q#:PqG,("4kUHK1
-!CGN<rs)QFs6>F?KUDc=!RaX1rrHW@rr3#'D#XG9rb/]js+13$s5<p-~>
-"A:iVM'r6h"*ae$E;i3->g`RlWrE#$^g6ulB)Y-tHN*pIEC1"!K)YcQBL)tmMtR)OX^KZXrrL26
-r^-^;k5PA^aT->ZrrLn@lMgmTJH#QLq5"!W"d:Fsh_(&j6Na7`oU5YF"K_V&WcIt9"Q"/d6bE-n%
-HrJ%lcE#Es8S]Y&NNhhrs-tX6W;80KUDc=!RaX1rrL\]r^-^"f`(mOrZ?^kJcC<$huA3~>
-"A:iVM'r6h"*ae$E;i3->g`RlWrE#$^g6ulB)Y-tHN*pIEC1"!K)YcQBL)tmMtR)OX^KZXrrL26
-r^-^;k5PA^aT->ZrrLn@lMgmTJH#QLq5"!W"d:Fsh_(&j6Na7`oU5YF"K_V&WcIt9"Q"/d6bE-n%
-HrJ%lcE#Es8S]Y&NNhhrs-tX6W;80KUDc=!RaX1rrL\]r^-^"f`(mOrZ?^kJcC<$huA3~>
-"A:iVM'r6h"*ae$E;i3->g`RlWrE#$^g6ulB)Y-tHN*pIEC1"!K)YcQBL)tmMtR)OX^KZXrrL26
-r^-^;k5PA^aT->ZrrLn@lMgmTJH#QLq5"!W"d:Fsh_(&j6Na7`oU5YF"K_V&WcIt9"Q"/d6bE-n%
-HrJ%lcE#Es8S]Y&NNhhrs-tX6W;80KUDc=!RaX1rrL\]r^-^"f`(mOrZ?^kJcC<$huA3~>
-"%t`Umek`?jT#8Drn.G5s8VBUrr3,pkPtSCrn.;4rr2uYrn.;6rr2uWrn.;8p&>'hir&fVh#>t,
-mJ[%dpY"j1rrMuVlMgqTJ#rYL!;QQH"nL[MqW%/Gf`V$Ls7H9C"T&/uoBQ/O"6eFkrV-<pmdL2U
-hZ!NTm/GZ<h>I9Win<2gs6]=TrrMoUn,ECKrn.;5rVlm_hLY]Xs+14-s*t~>
-"%t`Umek`?jT#8Drn.G5s8VBUrr3,pkPtSCrn.;4rr2uYrn.;6rr2uWrn.;8p&>'hir&fVh#>t,
-mJ[%dpY"j1rrMuVlMgqTJ#rYL!;QQH"nL[MqW%/Gf`V$Ls7H9C"T&/uoBQ/O"6eFkrV-<pmdL2U
-hZ!NTm/GZ<h>I9Win<2gs6]=TrrMoUn,ECKrn.;5rVlm_hLY]Xs+14-s*t~>
-"%t`Umek`?jT#8Drn.G5s8VBUrr3,pkPtSCrn.;4rr2uYrn.;6rr2uWrn.;8p&>'hir&fVh#>t,
-mJ[%dpY"j1rrMuVlMgqTJ#rYL!;QQH"nL[MqW%/Gf`V$Ls7H9C"T&/uoBQ/O"6eFkrV-<pmdL2U
-hZ!NTm/GZ<h>I9Win<2gs6]=TrrMoUn,ECKrn.;5rVlm_hLY]Xs+14-s*t~>
-!D>M>rrN#pQ2^jZJcC<$JcFU,J,~>
-!D>M>rrN#pQ2^jZJcC<$JcFU,J,~>
-!D>M>rrN#pQ2^jZJcC<$JcFU,J,~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>NQrrK"krVlo0ipm$KT)JZh\GVHh_h%i=s+13$s/Z0M~>
-!D>NQrrK"krVlo0ipm$KT)JZh\GVHh_h%i=s+13$s/Z0M~>
-!D>NQrrK"krVlo0ipm$KT)JZh\GVHh_h%i=s+13$s/Z0M~>
-!D>NRrrSc-mJ[%d[sIB4rsbK>%<J'>s0[duMN!M0JcC<$JcC<$X8d\~>
-!D>NRrrSc-mJ[%d[sIB4rsbK>%<J'>s0[duMN!M0JcC<$JcC<$X8d\~>
-!D>NRrrSc-mJ[%d[sIB4rsbK>%<J'>s0[duMN!M0JcC<$JcC<$X8d\~>
-#>7/Ys.,5omJQtc^LI'5rsP9XW>)=oS,`M<TDjEAJcC<$JcD\KJ,~>
-#>7/Ys.,5omJQtc^LI'5rsP9XW>)=oS,`M<TDjEAJcC<$JcD\KJ,~>
-#>7/Ys.,5omJQtc^LI'5rsP9XW>)=oS,`M<TDjEAJcC<$JcD\KJ,~>
-#>7/YUPnOomJHnacVF36$>6gI*rkZbs8P:?JcC<$JcC<$VuM8~>
-#>7/YUPnOomJHnacVF36$>6gI*rkZbs8P:?JcC<$JcC<$VuM8~>
-#>7/YUPnOomJHnacVF36$>6gI*rkZbs8P:?JcC<$JcC<$VuM8~>
-#>7/YoCW&:mJ?h`dn0<6"RfFC*W>s:"6h]b:P&Oss+13$s/H$K~>
-#>7/YoCW&:mJ?h`dn0<6"RfFC*W>s:"6h]b:P&Oss+13$s/H$K~>
-#>7/YoCW&:mJ?h`dn0<6"RfFC*W>s:"6h]b:P&Oss+13$s/H$K~>
-!D>NQrrFh@qYpTB:A+Vm7Kc'As8V@[j+75]s+13$s/5mI~>
-!D>NQrrFh@qYpTB:A+Vm7Kc'As8V@[j+75]s+13$s/5mI~>
-!D>NQrrFh@qYpTB:A+Vm7Kc'As8V@[j+75]s+13$s/5mI~>
-!D>NQrrFh@qu6]>;Y0nm*o1A]s'3Bks+13$s+13Is*t~>
-!D>NQrrFh@qu6]>;Y0nm*o1A]s'3Bks+13$s+13Is*t~>
-!D>NQrrFh@qu6]>;Y0nm*o1A]s'3Bks+13$s+13Is*t~>
-!D>NQrrFh@r;Qi1B);6$$-D</*riT\s'3D9rrW+o]Rg*6s+13$s0;TS~>
-!D>NQrrFh@r;Qi1B);6$$-D</*riT\s'3D9rrW+o]Rg*6s+13$s0;TS~>
-!D>NQrrFh@r;Qi1B);6$$-D</*riT\s'3D9rrW+o]Rg*6s+13$s0;TS~>
-%SJn`a+f<dI>4^#s0R1?p&>?%JqahkK!>9SKDpT*YPnJ&pAdU4s+13$s+13Ts*t~>
-%SJn`a+f<dI>4^#s0R1?p&>?%JqahkK!>9SKDpT*YPnJ&pAdU4s+13$s+13Ts*t~>
-%SJn`a+f<dI>4^#s0R1?p&>?%JqahkK!>9SKDpT*YPnJ&pAdU4s+13$s+13Ts*t~>
-"%t`UcMWt2ZiC'>jR`BS[$D;i[Jp1+Yl9phLTURU!rS@iJcC<$JcC<$Z2]=~>
-"%t`UcMWt2ZiC'>jR`BS[$D;i[Jp1+Yl9phLTURU!rS@iJcC<$JcC<$Z2]=~>
-"%t`UcMWt2ZiC'>jR`BS[$D;i[Jp1+Yl9phLTURU!rS@iJcC<$JcC<$Z2]=~>
-!D>N9rrBb-rrK*@JcC<$JcC<$X8d\~>
-!D>N9rrBb-rrK*@JcC<$JcC<$X8d\~>
-!D>N9rrBb-rrK*@JcC<$JcC<$X8d\~>
-!D>N1rr_L<A`eRDJcC<$JcDeNJ,~>
-!D>N1rr_L<A`eRDJcC<$JcDeNJ,~>
-!D>N1rr_L<A`eRDJcC<$JcDeNJ,~>
-!D>N1rrW/foR[$ns+13$s/Q*L~>
-!D>N1rrW/foR[$ns+13$s/Q*L~>
-!D>N1rrW/foR[$ns+13$s/Q*L~>
-"A:iVs5s=1"5EkUl29$2ir8rZh:1/0s+13$s+13<s*t~>
-"A:iVs5s=1"5EkUl29$2ir8rZh:1/0s+13$s+13<s*t~>
-"A:iVs5s=1"5EkUl29$2ir8rZh:1/0s+13$s+13<s*t~>
-"A:iVh08ih"Bs"KI4bCg#D<'VcX9:FaasJCs+13$s-it<~>
-"A:iVh08ih"Bs"KI4bCg#D<'VcX9:FaasJCs+13$s-it<~>
-"A:iVh08ih"Bs"KI4bCg#D<'VcX9:FaasJCs+13$s-it<~>
-"A:iVM3S#>"P-'BI@pE:#01rEs6Fa?JcC<$JcC<$S,\!~>
-"A:iVM3S#>"P-'BI@pE:#01rEs6Fa?JcC<$JcC<$S,\!~>
-"A:iVM3S#>"P-'BI@pE:#01rEs6Fa?JcC<$JcC<$S,\!~>
-"A:iVM3S#>&_9GOI@m*XH^=^3]7/f?mX;?ks+13$s+13>s*t~>
-"A:iVM3S#>&_9GOI@m*XH^=^3]7/f?mX;?ks+13$s+13>s*t~>
-"A:iVM3S#>&_9GOI@m*XH^=^3]7/f?mX;?ks+13$s+13>s*t~>
-(eZsjM3S&?peOBZI63OaTp(Z>s1iGWB=NNmJcC<$JcD2=J,~>
-(eZsjM3S&?peOBZI63OaTp(Z>s1iGWB=NNmJcC<$JcD2=J,~>
-(eZsjM3S&?peOBZI63OaTp(Z>s1iGWB=NNmJcC<$JcD2=J,~>
-(eZsjiH7CN7\E6NhS8LYs3"=?s+$lZY&JslJcC<$JcD2=J,~>
-(eZsjiH7CN7\E6NhS8LYs3"=?s+$lZY&JslJcC<$JcD2=J,~>
-(eZsjiH7CN7\E6NhS8LYs3"=?s+$lZY&JslJcC<$JcD2=J,~>
-#tmA[s6JIqhUY0nrs?kHs+R*>s8&m>JcC<$JcC<$S,\!~>
-#tmA[s6JIqhUY0nrs?kHs+R*>s8&m>JcC<$JcC<$S,\!~>
-#tmA[s6JIqhUY0nrs?kHs+R*>s8&m>JcC<$JcC<$S,\!~>
-!D>NPrrrDA=TA!drr3;J;ZD6@qZ$K"Ck;V;s+13$s-s%=~>
-!D>NPrrrDA=TA!drr3;J;ZD6@qZ$K"Ck;V;s+13$s-s%=~>
-!D>NPrrrDA=TA!drr3;J;ZD6@qZ$K"Ck;V;s+13$s-s%=~>
-$qi\^s5;#@_cHg;R?IQk#ci.Ks*1Qc[V16lJcC<$JcD2=J,~>
-$qi\^s5;#@_cHg;R?IQk#ci.Ks*1Qc[V16lJcC<$JcD2=J,~>
-$qi\^s5;#@_cHg;R?IQk#ci.Ks*1Qc[V16lJcC<$JcD2=J,~>
-#>7/Ys-lqc>Q+R%Pl=S]G5_FBGZ/@.s+13$s+13<s*t~>
-#>7/Ys-lqc>Q+R%Pl=S]G5_FBGZ/@.s+13$s+13<s*t~>
-#>7/Ys-lqc>Q+R%Pl=S]G5_FBGZ/@.s+13$s+13<s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-"A:iVrHeGa#!r.ds)PpSp&>3n>ok%TqqqDSq^h^f!K[21s+13$s+13ns*t~>
-"A:iVrHeGa#!r.ds)PpSp&>3n>ok%TqqqDSq^h^f!K[21s+13$s+13ns*t~>
-"A:iVrHeGa#!r.ds)PpSp&>3n>ok%TqqqDSq^h^f!K[21s+13$s+13ns*t~>
-"A:iVM3S#>!S0a>rrQHBrq??qB=@j?dS&Kt!DCl?rrJ._JcC<$JcC<$bQ!(~>
-"A:iVM3S#>!S0a>rrQHBrq??qB=@j?dS&Kt!DCl?rrJ._JcC<$JcC<$bQ!(~>
-"A:iVM3S#>!S0a>rrQHBrq??qB=@j?dS&Kt!DCl?rrJ._JcC<$JcC<$bQ!(~>
-#tmA[Vm$.#r2Oo<rrHB@pAYG3[f?BU9E5%Cn,E=fl.l:<!64s:$./AAbQ$Y^s8U+<^B!*hrr<u:
-^B!3krrBk6^B!;Fs+13$s+13us*t~>
-#tmA[Vm$.#r2Oo<rrHB@pAYG3[f?BU9E5%Cn,E=fl.l:<!64s:$./AAbQ$Y^s8U+<^B!*hrr<u:
-^B!3krrBk6^B!;Fs+13$s+13us*t~>
-#tmA[Vm$.#r2Oo<rrHB@pAYG3[f?BU9E5%Cn,E=fl.l:<!64s:$./AAbQ$Y^s8U+<^B!*hrr<u:
-^B!3krrBk6^B!;Fs+13$s+13us*t~>
-!D>NPrrJs@qu6\1[.jS,B60c?KhMIG>f$F>!NC2?rr=,<rs;-HlS8F'MZ:+rra#_Uf`/6dra#_X
-h#FNara#VXi.:oZs+13$s3q!u~>
-!D>NPrrJs@qu6\1[.jS,B60c?KhMIG>f$F>!NC2?rr=,<rs;-HlS8F'MZ:+rra#_Uf`/6dra#_X
-h#FNara#VXi.:oZs+13$s3q!u~>
-!D>NPrrJs@qu6\1[.jS,B60c?KhMIG>f$F>!NC2?rr=,<rs;-HlS8F'MZ:+rra#_Uf`/6dra#_X
-h#FNara#VXi.:oZs+13$s3q!u~>
-!D>NQrrJU@qYpT[2#%"[B39M-AkW1(X+Kg?jFOf>rr=,<rs;-HlS8F'MZ5`trr3+VQ2`K)rr3+K
-U&QA5rr3#-e:IXNs+13$s3q!u~>
-!D>NQrrJU@qYpT[2#%"[B39M-AkW1(X+Kg?jFOf>rr=,<rs;-HlS8F'MZ5`trr3+VQ2`K)rr3+K
-U&QA5rr3#-e:IXNs+13$s3q!u~>
-!D>NQrrJU@qYpT[2#%"[B39M-AkW1(X+Kg?jFOf>rr=,<rs;-HlS8F'MZ5`trr3+VQ2`K)rr3+K
-U&QA5rr3#-e:IXNs+13$s3q!u~>
-!D>NRrrSFGq"k!kDm&j7"_Y:Ds3aR>rrbOCs2S1=rr=,<rs;-HlS8F'MZ5`trr3+VQ2`K)rr34N
-U&V$'AnJ&os+13$s+13ts*t~>
-!D>NRrrSFGq"k!kDm&j7"_Y:Ds3aR>rrbOCs2S1=rr=,<rs;-HlS8F'MZ5`trr3+VQ2`K)rr34N
-U&V$'AnJ&os+13$s+13ts*t~>
-!D>NRrrSFGq"k!kDm&j7"_Y:Ds3aR>rrbOCs2S1=rr=,<rs;-HlS8F'MZ5`trr3+VQ2`K)rr34N
-U&V$'AnJ&os+13$s+13ts*t~>
-#"q&Xs-8l>qYpS+](Z.-B=@j?dS'T>"NXX/@F+oP!$;(<#t<M41&mGps#T3>rre+Bs"<a=rs*qF
-s'i@E\(?32JcC<$JcF-tJ,~>
-#"q&Xs-8l>qYpS+](Z.-B=@j?dS'T>"NXX/@F+oP!$;(<#t<M41&mGps#T3>rre+Bs"<a=rs*qF
-s'i@E\(?32JcC<$JcF-tJ,~>
-#"q&Xs-8l>qYpS+](Z.-B=@j?dS'T>"NXX/@F+oP!$;(<#t<M41&mGps#T3>rre+Bs"<a=rs*qF
-s'i@E\(?32JcC<$JcF-tJ,~>
-"\UrWSW34:rrQZBrq??qB=@j?dS'Q=![-G]r;R9Ks2TNes$bT+1&mGps#T3>rre+Bs"<a=rrd_C
-s!.@=rrItfrr3&A/!>J`JcC<$JcFF'J,~>
-"\UrWSW34:rrQZBrq??qB=@j?dS'Q=![-G]r;R9Ks2TNes$bT+1&mGps#T3>rre+Bs"<a=rrd_C
-s!.@=rrItfrr3&A/!>J`JcC<$JcFF'J,~>
-"\UrWSW34:rrQZBrq??qB=@j?dS'Q=![-G]r;R9Ks2TNes$bT+1&mGps#T3>rre+Bs"<a=rrd_C
-s!.@=rrItfrr3&A/!>J`JcC<$JcFF'J,~>
-"A:iVO;Rp;"^M*-EkD;Crrr.#*Zd]BrVlrj2YI"J&*t?<p](9d4rX\IGkqC42?"X"Jbf?</H-[n
-MYdAE,5rVaPl(I[!l>M%JcC<$JcC<$g&HR~>
-"A:iVO;Rp;"^M*-EkD;Crrr.#*Zd]BrVlrj2YI"J&*t?<p](9d4rX\IGkqC42?"X"Jbf?</H-[n
-MYdAE,5rVaPl(I[!l>M%JcC<$JcC<$g&HR~>
-"A:iVO;Rp;"^M*-EkD;Crrr.#*Zd]BrVlrj2YI"J&*t?<p](9d4rX\IGkqC42?"X"Jbf?</H-[n
-MYdAE,5rVaPl(I[!l>M%JcC<$JcC<$g&HR~>
-!D>N"rrMF?JcC<$JcC<$\Gq'~>
-!D>N"rrMF?JcC<$JcC<$\Gq'~>
-!D>N"rrMF?JcC<$JcC<$\Gq'~>
-!D>N"rrMF?JcC<$JcC<$\Gq'~>
-!D>N"rrMF?JcC<$JcC<$\Gq'~>
-!D>N"rrMF?JcC<$JcC<$\Gq'~>
-!D>N"rrM_GJcC<$JcC<$\Gq'~>
-!D>N"rrM_GJcC<$JcC<$\Gq'~>
-!D>N"rrM_GJcC<$JcC<$\Gq'~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>NQrrIH;oD\f.li.!"FSu.?F^'4jrrR%AK'!"7oNPOlmf*=XI"D<Ks+13$s7QDB~>
-!D>NQrrIH;oD\f.li.!"FSu.?F^'4jrrR%AK'!"7oNPOlmf*=XI"D<Ks+13$s7QDB~>
-!D>NQrrIH;oD\f.li.!"FSu.?F^'4jrrR%AK'!"7oNPOlmf*=XI"D<Ks+13$s7QDB~>
-#tmA[V69hPmGN'ZrrHa>li."*b5D8@bH`l#rrU9A4lu\Gqn\)'mf*=Q1YMd/Qb7nLJcC<$TDsE~>
-#tmA[V69hPmGN'ZrrHa>li."*b5D8@bH`l#rrU9A4lu\Gqn\)'mf*=Q1YMd/Qb7nLJcC<$TDsE~>
-#tmA[V69hPmGN'ZrrHa>li."*b5D8@bH`l#rrU9A4lu\Gqn\)'mf*=Q1YMd/Qb7nLJcC<$TDsE~>
-#tmA[n8Punj$2c%rrQrD)WUhulS8;:!T6-$rrKH@mf*=Q1YMd/G,BijJcC<$TDsE~>
-#tmA[n8Punj$2c%rrQrD)WUhulS8;:!T6-$rrKH@mf*=Q1YMd/G,BijJcC<$TDsE~>
-#tmA[n8Punj$2c%rrQrD)WUhulS8;:!T6-$rrKH@mf*=Q1YMd/G,BijJcC<$TDsE~>
-#YR8Zs6a"o,j+k$"+miX*r>m;&MNhW!_OI]qu6]_1&LtOi'%&=!U2-6*XdYos6(XJ*d)V6s8)[8
-!L<EYrrKH@pAY0m`Vgh\YP[T:VZ%V=\GZBJr>l?_rRb34I3'HPs8TJ)*WsmkpmV.&$f1io*Y&i)
-*rl96M#JG%-KtK-K&fcM0C",gJcC<$ZN#F~>
-#YR8Zs6a"o,j+k$"+miX*r>m;&MNhW!_OI]qu6]_1&LtOi'%&=!U2-6*XdYos6(XJ*d)V6s8)[8
-!L<EYrrKH@pAY0m`Vgh\YP[T:VZ%V=\GZBJr>l?_rRb34I3'HPs8TJ)*WsmkpmV.&$f1io*Y&i)
-*rl96M#JG%-KtK-K&fcM0C",gJcC<$ZN#F~>
-#YR8Zs6a"o,j+k$"+miX*r>m;&MNhW!_OI]qu6]_1&LtOi'%&=!U2-6*XdYos6(XJ*d)V6s8)[8
-!L<EYrrKH@pAY0m`Vgh\YP[T:VZ%V=\GZBJr>l?_rRb34I3'HPs8TJ)*WsmkpmV.&$f1io*Y&i)
-*rl96M#JG%-KtK-K&fcM0C",gJcC<$ZN#F~>
-#tmA[j`JBojA4A"rr=,:rrGJko`"sd-N!fDlS8;:!T6->rrFb?rr37OU&QA5s8S+>qYpS-\,QC.
-ZYK46!VIi=rrd2tl3hh8rrG+?qu6sSnGfp5T`>$9qtpBq*rio]rVljnrr3"BVZ$MqVKVt=$1o\H
-s*Z-8s6):js+13$s0DZT~>
-#tmA[j`JBojA4A"rr=,:rrGJko`"sd-N!fDlS8;:!T6->rrFb?rr37OU&QA5s8S+>qYpS-\,QC.
-ZYK46!VIi=rrd2tl3hh8rrG+?qu6sSnGfp5T`>$9qtpBq*rio]rVljnrr3"BVZ$MqVKVt=$1o\H
-s*Z-8s6):js+13$s0DZT~>
-#tmA[j`JBojA4A"rr=,:rrGJko`"sd-N!fDlS8;:!T6->rrFb?rr37OU&QA5s8S+>qYpS-\,QC.
-ZYK46!VIi=rrd2tl3hh8rrG+?qu6sSnGfp5T`>$9qtpBq*rio]rVljnrr3"BVZ$MqVKVt=$1o\H
-s*Z-8s6):js+13$s0DZT~>
-#tmA[Z+0ffmGruorr=,+rrMj@qu6]_1&LtOi'%&=!A9uCW=)Uts!.@>s,N->s8Dnq!CO?qrrKH@
-pAY0d-i<oEl8/D="$#BAlM[[b*q93<BE%o5D#F=nrM]l7s1Mh9rrI;?rVlnq:B%4!U+--BI@pQ>
-n9BNaJcC<$ZN#F~>
-#tmA[Z+0ffmGruorr=,+rrMj@qu6]_1&LtOi'%&=!A9uCW=)Uts!.@>s,N->s8Dnq!CO?qrrKH@
-pAY0d-i<oEl8/D="$#BAlM[[b*q93<BE%o5D#F=nrM]l7s1Mh9rrI;?rVlnq:B%4!U+--BI@pQ>
-n9BNaJcC<$ZN#F~>
-#tmA[Z+0ffmGruorr=,+rrMj@qu6]_1&LtOi'%&=!A9uCW=)Uts!.@>s,N->s8Dnq!CO?qrrKH@
-pAY0d-i<oEl8/D="$#BAlM[[b*q93<BE%o5D#F=nrM]l7s1Mh9rrI;?rVlnq:B%4!U+--BI@pQ>
-n9BNaJcC<$ZN#F~>
-!D>NQrrJ/QoD\e3li."[-N!fDlS8;:!T6->rrF`grGr=hs+cMkN.JhFs-EV)!A:k\rrKH@pAY0d
--i<oEl8/D="$#B2LAc/r'_).2BDhc1k(N\S!tkRH@/9g'G,G6<!N%dREs.C#s*^Mjs+13$s/uBP~>
-!D>NQrrJ/QoD\e3li."[-N!fDlS8;:!T6->rrF`grGr=hs+cMkN.JhFs-EV)!A:k\rrKH@pAY0d
--i<oEl8/D="$#B2LAc/r'_).2BDhc1k(N\S!tkRH@/9g'G,G6<!N%dREs.C#s*^Mjs+13$s/uBP~>
-!D>NQrrJ/QoD\e3li."[-N!fDlS8;:!T6->rrF`grGr=hs+cMkN.JhFs-EV)!A:k\rrKH@pAY0d
--i<oEl8/D="$#B2LAc/r'_).2BDhc1k(N\S!tkRH@/9g'G,G6<!N%dREs.C#s*^Mjs+13$s/uBP~>
-!D>NArr=,:rrI;!o`"sd-N!fDlS8;:!T6->rrFb?qu6eNOHG[Brr2s>rr3&1/@YWY!OHP7rrMd?
-rVltal0:)'rrY7Ah`h&>"dftms0cS<rrL2@rr3+[&c]OPrVlkIrr34HVZ6[Gs/'u9rrIP?JcC<$
-JcDnQJ,~>
-!D>NArr=,:rrI;!o`"sd-N!fDlS8;:!T6->rrFb?qu6eNOHG[Brr2s>rr3&1/@YWY!OHP7rrMd?
-rVltal0:)'rrY7Ah`h&>"dftms0cS<rrL2@rr3+[&c]OPrVlkIrr34HVZ6[Gs/'u9rrIP?JcC<$
-JcDnQJ,~>
-!D>NArr=,:rrI;!o`"sd-N!fDlS8;:!T6->rrFb?qu6eNOHG[Brr2s>rr3&1/@YWY!OHP7rrMd?
-rVltal0:)'rrY7Ah`h&>"dftms0cS<rrL2@rr3+[&c]OPrVlkIrr34HVZ6[Gs/'u9rrIP?JcC<$
-JcDnQJ,~>
-!D>NDrs#)m;$g)sOT#1[%P@AR"ER<H;3V"Z"Dg[A;4IRb#\6F=;54*j]iY21"KMM%\l8T*"1%t,
-[/No/IRUaGo2.Lk;8N&-!W8Vh;$3-Ul8/D="$#B7R/TqdP99;o[V,O<!Uc$J;$<@(s6>O@;#mj"
-rs.%n;,Ok'j+I>.!*K7#!I^Sks+13$s/uBP~>
-!D>NDrs#)m;$g)sOT#1[%P@AR"ER<H;3V"Z"Dg[A;4IRb#\6F=;54*j]iY21"KMM%\l8T*"1%t,
-[/No/IRUaGo2.Lk;8N&-!W8Vh;$3-Ul8/D="$#B7R/TqdP99;o[V,O<!Uc$J;$<@(s6>O@;#mj"
-rs.%n;,Ok'j+I>.!*K7#!I^Sks+13$s/uBP~>
-!D>NDrs#)m;$g)sOT#1[%P@AR"ER<H;3V"Z"Dg[A;4IRb#\6F=;54*j]iY21"KMM%\l8T*"1%t,
-[/No/IRUaGo2.Lk;8N&-!W8Vh;$3-Ul8/D="$#B7R/TqdP99;o[V,O<!Uc$J;$<@(s6>O@;#mj"
-rs.%n;,Ok'j+I>.!*K7#!I^Sks+13$s/uBP~>
-!D>NDrrD*WbQ-Q!rrLHrp&>$CrlbB"rr2uJrlbB%rr2uHrlbB'rr2uErlbN-s8Pm:rlbIg^&S*2
-bQR%cnc/OcbQ.&)rrDflbQID8qpt`G"5!DLoDZr;nC@I:nDX9E!:Kj1"SL4Cs6T^.!<)lr!oD/F
-rr2u]rlbAfrr3#\m",1fs+13Qs*t~>
-!D>NDrrD*WbQ-Q!rrLHrp&>$CrlbB"rr2uJrlbB%rr2uHrlbB'rr2uErlbN-s8Pm:rlbIg^&S*2
-bQR%cnc/OcbQ.&)rrDflbQID8qpt`G"5!DLoDZr;nC@I:nDX9E!:Kj1"SL4Cs6T^.!<)lr!oD/F
-rr2u]rlbAfrr3#\m",1fs+13Qs*t~>
-!D>NDrrD*WbQ-Q!rrLHrp&>$CrlbB"rr2uJrlbB%rr2uHrlbB'rr2uErlbN-s8Pm:rlbIg^&S*2
-bQR%cnc/OcbQ.&)rrDflbQID8qpt`G"5!DLoDZr;nC@I:nDX9E!:Kj1"SL4Cs6T^.!<)lr!oD/F
-rr2u]rlbAfrr3#\m",1fs+13Qs*t~>
-!D>MarrFV?rq?G6YCZ_)s+13$s3q!u~>
-!D>MarrFV?rq?G6YCZ_)s+13$s3q!u~>
-!D>MarrFV?rq?G6YCZ_)s+13$s3q!u~>
-!D>M`rr=PJ-30Zhs+13$s+13us*t~>
-!D>M`rr=PJ-30Zhs+13$s+13us*t~>
-!D>M`rr=PJ-30Zhs+13$s+13us*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-"A:iVs2Y,1!3Z>$!Q4&Ns+13$s+132s*t~>
-"A:iVs2Y,1!3Z>$!Q4&Ns+13$s+132s*t~>
-"A:iVs2Y,1!3Z>$!Q4&Ns+13$s+132s*t~>
-"A:iV`..c8#(NHKs0$t?JcC<$JcC<$OT0h~>
-"A:iV`..c8#(NHKs0$t?JcC<$JcC<$OT0h~>
-"A:iV`..c8#(NHKs0$t?JcC<$JcC<$OT0h~>
-"A:iVM3S#>!S0a>rrTTDqgncus+13$s,m>3~>
-"A:iVM3S#>!S0a>rrTTDqgncus+13$s,m>3~>
-"A:iVM3S#>!S0a>rrTTDqgncus+13$s,m>3~>
-#tmA[hr=\9pK5Z<rrL#?JcC<$JcC<$OoKq~>
-#tmA[hr=\9pK5Z<rrL#?JcC<$JcC<$OoKq~>
-#tmA[hr=\9pK5Z<rrL#?JcC<$JcC<$OoKq~>
-!D>NPrrG@?qu6]<<.Y(#s+13$s-!D4~>
-!D>NPrrG@?qu6]<<.Y(#s+13$s-!D4~>
-!D>NPrrG@?qu6]<<.Y(#s+13$s-!D4~>
-!D>NRrrVaZjneuXg-^GkJcC<$JcCo5J,~>
-!D>NRrrVaZjneuXg-^GkJcC<$JcCo5J,~>
-!D>NRrrVaZjneuXg-^GkJcC<$JcCo5J,~>
-#"q&Xs5RM>qYpTI7tL\ks+13$s,m>3~>
-#"q&Xs5RM>qYpTI7tL\ks+13$s,m>3~>
-#"q&Xs5RM>qYpTI7tL\ks+13$s,m>3~>
-"\UrWgN^j:rrU/EqLSZts+13$s,m>3~>
-"\UrWgN^j:rrU/EqLSZts+13$s,m>3~>
-"\UrWgN^j:rrU/EqLSZts+13$s,m>3~>
-"A:iVM,sS>"gS+-]QWRks+13$s+133s*t~>
-"A:iVM,sS>"gS+-]QWRks+13$s+133s*t~>
-"A:iVM,sS>"gS+-]QWRks+13$s+133s*t~>
-"%t`UaS^ktWrN+,i.:oZs+13$s,[21~>
-"%t`UaS^ktWrN+,i.:oZs+13$s,[21~>
-"%t`UaS^ktWrN+,i.:oZs+13$s,[21~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-!D>M*s+13$s+13&s*t~>
-%%EndData
-showpage
-%%Trailer
-end
-%%EOF
diff --git a/lib/stdlib/doc/src/ushell3.gif b/lib/stdlib/doc/src/ushell3.gif
deleted file mode 100644
index 2141268b91..0000000000
--- a/lib/stdlib/doc/src/ushell3.gif
+++ /dev/null
diff --git a/lib/stdlib/doc/src/ushell3.ps b/lib/stdlib/doc/src/ushell3.ps
deleted file mode 100644
index dd64eeab5c..0000000000
--- a/lib/stdlib/doc/src/ushell3.ps
+++ /dev/null
@@ -1,662 +0,0 @@
-%!PS-Adobe-3.0
-%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
-%%Title: ushell3.ps
-%%CreationDate: Mon Mar 16 12:15:17 2009
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%Pages: 1
-%%BoundingBox: 14 14 468 78
-%%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 63.070866141732289 translate
-453.54330708661422 -63.070866141732289 scale
-% Image geometry
-640 89 8
-% Transformation matrix
-[ 640 0 0 89 0 0 ]
-% Strings to hold RGB-samples per scanline
-/rstr 640 string def
-/gstr 640 string def
-/bstr 640 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:        37475 ASCII Bytes
-colorimage
-!1\W%J`VIEJ`VLFJ,~>
-!1\W%J`VIEJ`VLFJ,~>
-!1\W%J`VIEJ`VLFJ,~>
-!T[+/6@hIS6@hIU6@]~>
-!T[+/6@hIS6@hIU6@]~>
-!T[+/6@hIS6@hIU6@]~>
-!ouWfJQ.2"JQ.2"KN*I~>
-!ouWfJQ.2"JQ.2"KN*I~>
-!ouWfJQ.2"JQ.2"KN*I~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLQ2^m!`0L?'S`PG&JcC<$i;\<~>
-!ouXLQ2^m!`0L?'S`PG&JcC<$i;\<~>
-!ouXLQ2^m!`0L?'S`PG&JcC<$i;\<~>
-"QVjNs.9-i!1*E[!L)+*rrR=EF8Z%>Dc_2VrrI?7rr3)%^&N-N<rg/5rr?^0<rgP6rrU,eg\:^K
-o6/O]!ioDNpAY05U[\9aJa!(4!2BHo!,VW6!lAR@JcC<$JcF^/J,~>
-"QVjNs.9-i!1*E[!L)+*rrR=EF8Z%>Dc_2VrrI?7rr3)%^&N-N<rg/5rr?^0<rgP6rrU,eg\:^K
-o6/O]!ioDNpAY05U[\9aJa!(4!2BHo!,VW6!lAR@JcC<$JcF^/J,~>
-"QVjNs.9-i!1*E[!L)+*rrR=EF8Z%>Dc_2VrrI?7rr3)%^&N-N<rg/5rr?^0<rgP6rrU,eg\:^K
-o6/O]!ioDNpAY05U[\9aJa!(4!2BHo!,VW6!lAR@JcC<$JcF^/J,~>
-"lqsOs)!Pi_uSNdrrHB@o)Ad;\gmXX!mS).p&>%Ili-neJXl`h]D]YJlM1AZb5K6Z:po`k!N()7
-rrML@l2LdgT^2UZil(<`rrJFsrVlntF7K88K;)-<s8T'RrkniDCAn/50C=>jJcC<$iW"E~>
-"lqsOs)!Pi_uSNdrrHB@o)Ad;\gmXX!mS).p&>%Ili-neJXl`h]D]YJlM1AZb5K6Z:po`k!N()7
-rrML@l2LdgT^2UZil(<`rrJFsrVlntF7K88K;)-<s8T'RrkniDCAn/50C=>jJcC<$iW"E~>
-"lqsOs)!Pi_uSNdrrHB@o)Ad;\gmXX!mS).p&>%Ili-neJXl`h]D]YJlM1AZb5K6Z:po`k!N()7
-rrML@l2LdgT^2UZil(<`rrJFsrVlntF7K88K;)-<s8T'RrkniDCAn/50C=>jJcC<$iW"E~>
-"lqsOs)#"3rrHB@nc&X\.f95Hkqi#4!AWp>rrdnCs!dR.rrSCIp@&"_b$si5rrML@l2LdPK]E(5
-GGY9<!NC/2rs4ONpZ4C7s,`6>rrN#\rVlo\2M(mZs+14/s*t~>
-"lqsOs)#"3rrHB@nc&X\.f95Hkqi#4!AWp>rrdnCs!dR.rrSCIp@&"_b$si5rrML@l2LdPK]E(5
-GGY9<!NC/2rs4ONpZ4C7s,`6>rrN#\rVlo\2M(mZs+14/s*t~>
-"lqsOs)#"3rrHB@nc&X\.f95Hkqi#4!AWp>rrdnCs!dR.rrSCIp@&"_b$si5rrML@l2LdPK]E(5
-GGY9<!NC/2rs4ONpZ4C7s,`6>rrN#\rVlo\2M(mZs+14/s*t~>
-#in9Rs)"@hjludE!Us(f*"5s=s'2Za*#r;Ts6`DV*!'XArr3#i.f95Hkqi#4$2ktGs.=c>s!c4l
-*!(ffp&>*eKVIo7!Q/(<rrCjQ*!EJBm4518*!<VHr42bG&A7u":Z[6L*5hd.*"`Z#*8gPk!Q/1@
-rrsVGs/-hF]Dhg?\f;.l*$"qWWG$>m*$OSArs>H^rr<#^9E1*5p\t46JcC<$JcF^/J,~>
-#in9Rs)"@hjludE!Us(f*"5s=s'2Za*#r;Ts6`DV*!'XArr3#i.f95Hkqi#4$2ktGs.=c>s!c4l
-*!(ffp&>*eKVIo7!Q/(<rrCjQ*!EJBm4518*!<VHr42bG&A7u":Z[6L*5hd.*"`Z#*8gPk!Q/1@
-rrsVGs/-hF]Dhg?\f;.l*$"qWWG$>m*$OSArs>H^rr<#^9E1*5p\t46JcC<$JcF^/J,~>
-#in9Rs)"@hjludE!Us(f*"5s=s'2Za*#r;Ts6`DV*!'XArr3#i.f95Hkqi#4$2ktGs.=c>s!c4l
-*!(ffp&>*eKVIo7!Q/(<rrCjQ*!EJBm4518*!<VHr42bG&A7u":Z[6L*5hd.*"`Z#*8gPk!Q/1@
-rrsVGs/-hF]Dhg?\f;.l*$"qWWG$>m*$OSArs>H^rr<#^9E1*5p\t46JcC<$JcF^/J,~>
-#in9Rs(s&?2H0VT!G&_>rsZf$s'-u6s8T->s&7&=rrJm@rr3#i.f95Hkqhu3#T`sFSpp_><^Zld
-!I1F5rrJj?mJd4)=nhq!7G$o6ErQ(@4l><[rVm<akl8@2QiI(:nGiNVK_>?L_HQutn,FF,rrHT?
-r;QeAV>^DuW>MT6s7dl/rs"REs8UEef)5OJ*J+6As+14/s*t~>
-#in9Rs(s&?2H0VT!G&_>rsZf$s'-u6s8T->s&7&=rrJm@rr3#i.f95Hkqhu3#T`sFSpp_><^Zld
-!I1F5rrJj?mJd4)=nhq!7G$o6ErQ(@4l><[rVm<akl8@2QiI(:nGiNVK_>?L_HQutn,FF,rrHT?
-r;QeAV>^DuW>MT6s7dl/rs"REs8UEef)5OJ*J+6As+14/s*t~>
-#in9Rs(s&?2H0VT!G&_>rsZf$s'-u6s8T->s&7&=rrJm@rr3#i.f95Hkqhu3#T`sFSpp_><^Zld
-!I1F5rrJj?mJd4)=nhq!7G$o6ErQ(@4l><[rVm<akl8@2QiI(:nGiNVK_>?L_HQutn,FF,rrHT?
-r;QeAV>^DuW>MT6s7dl/rs"REs8UEef)5OJ*J+6As+14/s*t~>
-"lqsOs)#";rrJFMriH=Cs8Q??rr3,%EW8soriH3>HN*pFngaP:!U2E4rrciCl&)D8rrIA?pAY3[
-N2>qA!Q/(<rrDWgXTL6.m4eM="$PQ&3;rj[2<b(S?N0s.E:s82R=t85#/XRDCU3s\rVln-]);R/
-GGY9<!NC/>rrMm?nG`]SNW9#h7m6eM!$-XjJcC<$iW"E~>
-"lqsOs)#";rrJFMriH=Cs8Q??rr3,%EW8soriH3>HN*pFngaP:!U2E4rrciCl&)D8rrIA?pAY3[
-N2>qA!Q/(<rrDWgXTL6.m4eM="$PQ&3;rj[2<b(S?N0s.E:s82R=t85#/XRDCU3s\rVln-]);R/
-GGY9<!NC/>rrMm?nG`]SNW9#h7m6eM!$-XjJcC<$iW"E~>
-"lqsOs)#";rrJFMriH=Cs8Q??rr3,%EW8soriH3>HN*pFngaP:!U2E4rrciCl&)D8rrIA?pAY3[
-N2>qA!Q/(<rrDWgXTL6.m4eM="$PQ&3;rj[2<b(S?N0s.E:s82R=t85#/XRDCU3s\rVln-]);R/
-GGY9<!NC/>rrMm?nG`]SNW9#h7m6eM!$-XjJcC<$iW"E~>
-"lqsOs)#":rrAAaD?P3us'3D>rrfBBs&2tsD?.$BrrM[?qu6]]1\C\Lp*RC[q>UJ?V"Xfh^Kp4+
-!Q/(=rrN"UrGD]YfBk9jrrYFAj>d,<"?#EC^0^[9!L\W6rs$>Ds(eq?*W?!=@_2L;!I(C=rrK*?
-rr3#o,k1g7OH'8>!T-'<rr='js+13$s5F!.~>
-"lqsOs)#":rrAAaD?P3us'3D>rrfBBs&2tsD?.$BrrM[?qu6]]1\C\Lp*RC[q>UJ?V"Xfh^Kp4+
-!Q/(=rrN"UrGD]YfBk9jrrYFAj>d,<"?#EC^0^[9!L\W6rs$>Ds(eq?*W?!=@_2L;!I(C=rrK*?
-rr3#o,k1g7OH'8>!T-'<rr='js+13$s5F!.~>
-"lqsOs)#":rrAAaD?P3us'3D>rrfBBs&2tsD?.$BrrM[?qu6]]1\C\Lp*RC[q>UJ?V"Xfh^Kp4+
-!Q/(=rrN"UrGD]YfBk9jrrYFAj>d,<"?#EC^0^[9!L\W6rs$>Ds(eq?*W?!=@_2L;!I(C=rrK*?
-rr3#o,k1g7OH'8>!T-'<rr='js+13$s5F!.~>
-"lqsOs)#";rrK1Rrr3,.C&_GSrr3,%EW8tZq>UKd.f95Hkqhu3"84(R@K-9-Mu!AP!I1F>rrV/%
-Zi0n*m!?)+rrV55[Jp1,odBb="fictm1u>nrrYFAj>d,<"?#EC^0^[9"dt&Ds,$[Lrs$>D^O^an
-*W?!=@_2L;#C!$Es+UKPF8l1?pa#A/!K`<?rrM"?rVlnZNIh+\s+14/s*t~>
-"lqsOs)#";rrK1Rrr3,.C&_GSrr3,%EW8tZq>UKd.f95Hkqhu3"84(R@K-9-Mu!AP!I1F>rrV/%
-Zi0n*m!?)+rrV55[Jp1,odBb="fictm1u>nrrYFAj>d,<"?#EC^0^[9"dt&Ds,$[Lrs$>D^O^an
-*W?!=@_2L;#C!$Es+UKPF8l1?pa#A/!K`<?rrM"?rVlnZNIh+\s+14/s*t~>
-"lqsOs)#";rrK1Rrr3,.C&_GSrr3,%EW8tZq>UKd.f95Hkqhu3"84(R@K-9-Mu!AP!I1F>rrV/%
-Zi0n*m!?)+rrV55[Jp1,odBb="fictm1u>nrrYFAj>d,<"?#EC^0^[9"dt&Ds,$[Lrs$>D^O^an
-*W?!=@_2L;#C!$Es+UKPF8l1?pa#A/!K`<?rrM"?rVlnZNIh+\s+14/s*t~>
-"lqsOs(spt=Tb&ka`%/]"E;N`>f$F>"KQPB_eK*Q!1!Q`"F!iV=e#Ej"E@<P=ePKg"8nU*aSu2?
-ZsEZ6!J95.rrU7AErH"=gd(0)!N()?rrN%dr`KD\/_BA3O8`8aPP"R6rE08hp]%s6qYp`RIT]gC
-rV?I'lAL)E_.]YEs1_\\6!=!^rs-kl=]qs.WH8(=!Vdr0rrLc"r`K83]D_a10C=>jJcC<$iW"E~>
-"lqsOs(spt=Tb&ka`%/]"E;N`>f$F>"KQPB_eK*Q!1!Q`"F!iV=e#Ej"E@<P=ePKg"8nU*aSu2?
-ZsEZ6!J95.rrU7AErH"=gd(0)!N()?rrN%dr`KD\/_BA3O8`8aPP"R6rE08hp]%s6qYp`RIT]gC
-rV?I'lAL)E_.]YEs1_\\6!=!^rs-kl=]qs.WH8(=!Vdr0rrLc"r`K83]D_a10C=>jJcC<$iW"E~>
-"lqsOs(spt=Tb&ka`%/]"E;N`>f$F>"KQPB_eK*Q!1!Q`"F!iV=e#Ej"E@<P=ePKg"8nU*aSu2?
-ZsEZ6!J95.rrU7AErH"=gd(0)!N()?rrN%dr`KD\/_BA3O8`8aPP"R6rE08hp]%s6qYp`RIT]gC
-rV?I'lAL)E_.]YEs1_\\6!=!^rs-kl=]qs.WH8(=!Vdr0rrLc"r`K83]D_a10C=>jJcC<$iW"E~>
-"QVjNs4mOh"53_Se,I2eeGoR$nG`FjleVU@ci1c]f`(mNc2PQ[gA_*PbPo?Yh"C[Jp<rm=!6+rS
-!93tW!qO4arVlomdH^`5l@c>>rrDcl_?K,Np&!#$rk\d,s8VZg_?BH0s7"\:rr_/q_Y3a(#jL4G
-s3:H@s6'?t!<)lr#1p`/s8VB?rr3#tb4#?1h>Y7kb5M>AGH(Ijs+13$s5F!.~>
-"QVjNs4mOh"53_Se,I2eeGoR$nG`FjleVU@ci1c]f`(mNc2PQ[gA_*PbPo?Yh"C[Jp<rm=!6+rS
-!93tW!qO4arVlomdH^`5l@c>>rrDcl_?K,Np&!#$rk\d,s8VZg_?BH0s7"\:rr_/q_Y3a(#jL4G
-s3:H@s6'?t!<)lr#1p`/s8VB?rr3#tb4#?1h>Y7kb5M>AGH(Ijs+13$s5F!.~>
-"QVjNs4mOh"53_Se,I2eeGoR$nG`FjleVU@ci1c]f`(mNc2PQ[gA_*PbPo?Yh"C[Jp<rm=!6+rS
-!93tW!qO4arVlomdH^`5l@c>>rrDcl_?K,Np&!#$rk\d,s8VZg_?BH0s7"\:rr_/q_Y3a(#jL4G
-s3:H@s6'?t!<)lr#1p`/s8VB?rr3#tb4#?1h>Y7kb5M>AGH(Ijs+13$s5F!.~>
-!ouXLQ2^mSnWj+TkkTf0JcC<$i;\<~>
-!ouXLQ2^mSnWj+TkkTf0JcC<$i;\<~>
-!ouXLQ2^mSnWj+TkkTf0JcC<$i;\<~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcG]K!TNR]rr_0&bgEm!"4YQ=h#.0PdXhFLs/5mI~>
-!ouXLJcG]K!TNR]rr_0&bgEm!"4YQ=h#.0PdXhFLs/5mI~>
-!ouXLJcG]K!TNR]rr_0&bgEm!"4YQ=h#.0PdXhFLs/5mI~>
-!ouXLrVll.r;Qf;o()e]\@V&,!kGPPr;QirYf6S@!PSC#rr_SkYi""2!o&"@rVm>df)Ne\s8V;e
-g&M)arUBgji3;2?s1.k'"4H?3\b5t)>rthhrVluBmf'fsrr^ZQYd<0c!6"l@!6Y!7"1eHrci3qH
-Bhpuir;Qe$_L_`<s/>sJ~>
-!ouXLrVll.r;Qf;o()e]\@V&,!kGPPr;QirYf6S@!PSC#rr_SkYi""2!o&"@rVm>df)Ne\s8V;e
-g&M)arUBgji3;2?s1.k'"4H?3\b5t)>rthhrVluBmf'fsrr^ZQYd<0c!6"l@!6Y!7"1eHrci3qH
-Bhpuir;Qe$_L_`<s/>sJ~>
-!ouXLrVll.r;Qf;o()e]\@V&,!kGPPr;QirYf6S@!PSC#rr_SkYi""2!o&"@rVm>df)Ne\s8V;e
-g&M)arUBgji3;2?s1.k'"4H?3\b5t)>rthhrVluBmf'fsrr^ZQYd<0c!6"l@!6Y!7"1eHrci3qH
-Bhpuir;Qe$_L_`<s/>sJ~>
-!ouXLrr3"u(&\(5P`>P2rrICpm/I-7?T\2c!r?\qrVlmIoCDnbn;;!sKAbYe!T1]hrrJ(?r;RA&
-HiH[ds6YVXJCjfHq>^KAch7;Bie2*#ir:%mrr[/AruLe4!F<J;rsMiIr#l%>c$X;BD5H.i!P<LR
-CB8[tpAY48s0uV;rrLA?r;QfW3e@<^s/>sJ~>
-!ouXLrr3"u(&\(5P`>P2rrICpm/I-7?T\2c!r?\qrVlmIoCDnbn;;!sKAbYe!T1]hrrJ(?r;RA&
-HiH[ds6YVXJCjfHq>^KAch7;Bie2*#ir:%mrr[/AruLe4!F<J;rsMiIr#l%>c$X;BD5H.i!P<LR
-CB8[tpAY48s0uV;rrLA?r;QfW3e@<^s/>sJ~>
-!ouXLrr3"u(&\(5P`>P2rrICpm/I-7?T\2c!r?\qrVlmIoCDnbn;;!sKAbYe!T1]hrrJ(?r;RA&
-HiH[ds6YVXJCjfHq>^KAch7;Bie2*#ir:%mrr[/AruLe4!F<J;rsMiIr#l%>c$X;BD5H.i!P<LR
-CB8[tpAY48s0uV;rrLA?r;QfW3e@<^s/>sJ~>
-#NS0Qs8SgH'Dqe1RtBDp!T?-5rrFS?o)AmK5l^js[GUubZ>0::!n)SAr;RA&HiH[ds3jR>_1$W_
-r;ZeYN:m2T\mk]II!C_Grr[/AruLe4!F<J;rsMiIr#l%>LR%o>oI8\t#.&^Es8U`apAY48s0uV;
-rrLA?r;QigKVj>#JcD_LJ,~>
-#NS0Qs8SgH'Dqe1RtBDp!T?-5rrFS?o)AmK5l^js[GUubZ>0::!n)SAr;RA&HiH[ds3jR>_1$W_
-r;ZeYN:m2T\mk]II!C_Grr[/AruLe4!F<J;rsMiIr#l%>LR%o>oI8\t#.&^Es8U`apAY48s0uV;
-rrLA?r;QigKVj>#JcD_LJ,~>
-#NS0Qs8SgH'Dqe1RtBDp!T?-5rrFS?o)AmK5l^js[GUubZ>0::!n)SAr;RA&HiH[ds3jR>_1$W_
-r;ZeYN:m2T\mk]II!C_Grr[/AruLe4!F<J;rsMiIr#l%>LR%o>oI8\t#.&^Es8U`apAY48s0uV;
-rrLA?r;QigKVj>#JcD_LJ,~>
-#NS0Qs.PG>*W#d:UNuP4!e+Bor;QbBr`fGnp&>'O48f*[Bj?GlrrFS4r`fH/rVlrS>c%E!#M_TE
-s2a:$pAJ50_Z0XSs3"YPaT)6E>a;X#c2[h+rEKWWs79J\-<sg.rr3#!F8PtRh9c29n,Mjis8U'5
-o)IQO1br<@mf3=+rEKd&s5qB%s1G-(s3748r`fI&rr3)Dir?1SrrHE?qu72Dli+*fs+cm>s7@c?
-s/j-:rrM&<rr3"Nm/?qjU<NXUs4*P;s,-e\!/pjV"@#[e>`o$c!.XuQ!1*T`"0V[da8Gr<btn6:
-!QA,ks+13Ls*t~>
-#NS0Qs.PG>*W#d:UNuP4!e+Bor;QbBr`fGnp&>'O48f*[Bj?GlrrFS4r`fH/rVlrS>c%E!#M_TE
-s2a:$pAJ50_Z0XSs3"YPaT)6E>a;X#c2[h+rEKWWs79J\-<sg.rr3#!F8PtRh9c29n,Mjis8U'5
-o)IQO1br<@mf3=+rEKd&s5qB%s1G-(s3748r`fI&rr3)Dir?1SrrHE?qu72Dli+*fs+cm>s7@c?
-s/j-:rrM&<rr3"Nm/?qjU<NXUs4*P;s,-e\!/pjV"@#[e>`o$c!.XuQ!1*T`"0V[da8Gr<btn6:
-!QA,ks+13Ls*t~>
-#NS0Qs.PG>*W#d:UNuP4!e+Bor;QbBr`fGnp&>'O48f*[Bj?GlrrFS4r`fH/rVlrS>c%E!#M_TE
-s2a:$pAJ50_Z0XSs3"YPaT)6E>a;X#c2[h+rEKWWs79J\-<sg.rr3#!F8PtRh9c29n,Mjis8U'5
-o)IQO1br<@mf3=+rEKd&s5qB%s1G-(s3748r`fI&rr3)Dir?1SrrHE?qu72Dli+*fs+cm>s7@c?
-s/j-:rrM&<rr3"Nm/?qjU<NXUs4*P;s,-e\!/pjV"@#[e>`o$c!.XuQ!1*T`"0V[da8Gr<btn6:
-!QA,ks+13Ls*t~>
-#NS0Qs4Zf=*W#d;ql"c5rrUHX,5qNBGcC\W!KEfHrrM(?r;Qi:U."t[!@^M;^B&_orr3&@!-8&<
-!Sfs<rr>sq^CtP2s0b1+^V=R6rYN>5HbX4Is7Q?*#\)ch^P5S"^[V7&!NL5.rsA82Ch^Z!q#AcZ
-rP&>0q#:E#)he4*!*/Ie!F<J5rs=H,5X7I]s8RS?rr3#E:B(7o4Q68=$#ZsH*WNf[s,<HH^BC!c
-s+R-F^BBjes*pjD^B'Ldp&>';:](.m`E.WjJcD_LJ,~>
-#NS0Qs4Zf=*W#d;ql"c5rrUHX,5qNBGcC\W!KEfHrrM(?r;Qi:U."t[!@^M;^B&_orr3&@!-8&<
-!Sfs<rr>sq^CtP2s0b1+^V=R6rYN>5HbX4Is7Q?*#\)ch^P5S"^[V7&!NL5.rsA82Ch^Z!q#AcZ
-rP&>0q#:E#)he4*!*/Ie!F<J5rs=H,5X7I]s8RS?rr3#E:B(7o4Q68=$#ZsH*WNf[s,<HH^BC!c
-s+R-F^BBjes*pjD^B'Ldp&>';:](.m`E.WjJcD_LJ,~>
-#NS0Qs4Zf=*W#d;ql"c5rrUHX,5qNBGcC\W!KEfHrrM(?r;Qi:U."t[!@^M;^B&_orr3&@!-8&<
-!Sfs<rr>sq^CtP2s0b1+^V=R6rYN>5HbX4Is7Q?*#\)ch^P5S"^[V7&!NL5.rsA82Ch^Z!q#AcZ
-rP&>0q#:E#)he4*!*/Ie!F<J5rs=H,5X7I]s8RS?rr3#E:B(7o4Q68=$#ZsH*WNf[s,<HH^BC!c
-s+R-F^BBjes*pjD^B'Ldp&>';:](.m`E.WjJcD_LJ,~>
-!ouXLrVlj<q>UKC9D/;cqBGn<!DCl?rrJR?pAY0P48]$YfgPf=!@cOtrrIA?rr3&og["k="?7J0
-,`Vg'!$2%<&RW6Okq)#ts&R/=+9/3^s%^l:rrkjCs8TB>qu6\sF6ii,OGs/<!Q&%=rrCsOrrTH1
-mf*4d*U`q.?,-(4%YoShgX7PNs6XR>s6`D>rr3!]iVic_DQj'\s1Me>A[h[="LVqC?,6I>"KZSB
-<65(=!V5UMrrLA?qu6]9=+UC&s/H$K~>
-!ouXLrVlj<q>UKC9D/;cqBGn<!DCl?rrJR?pAY0P48]$YfgPf=!@cOtrrIA?rr3&og["k="?7J0
-,`Vg'!$2%<&RW6Okq)#ts&R/=+9/3^s%^l:rrkjCs8TB>qu6\sF6ii,OGs/<!Q&%=rrCsOrrTH1
-mf*4d*U`q.?,-(4%YoShgX7PNs6XR>s6`D>rr3!]iVic_DQj'\s1Me>A[h[="LVqC?,6I>"KZSB
-<65(=!V5UMrrLA?qu6]9=+UC&s/H$K~>
-!ouXLrVlj<q>UKC9D/;cqBGn<!DCl?rrJR?pAY0P48]$YfgPf=!@cOtrrIA?rr3&og["k="?7J0
-,`Vg'!$2%<&RW6Okq)#ts&R/=+9/3^s%^l:rrkjCs8TB>qu6\sF6ii,OGs/<!Q&%=rrCsOrrTH1
-mf*4d*U`q.?,-(4%YoShgX7PNs6XR>s6`D>rr3!]iVic_DQj'\s1Me>A[h[="LVqC?,6I>"KZSB
-<65(=!V5UMrrLA?qu6]9=+UC&s/H$K~>
-!ouXLrVlj<qYpWR7/HTV!W"#=rrGd@rr3"fK(f3FiB-r:!SKm>rrFS?rr3"DV"jrmpsqY'qu6Tq
-*W?!@?bQL(1]IC^qYgC8s/(#?:<rj^r>YtHfDklVCA\#3WcRM+!K`9=rrN(ur>Ygmq#:B"C]485
-*U`q.?,-(4"c&BCs7@c>rrd5Er7aR:rrG7@rVm1AYQ#XC]jLeN\,QC1[:oSG_#F?=XDn4+7iWLI
-oD\j9:](.m`E.WjJcD_LJ,~>
-!ouXLrVlj<qYpWR7/HTV!W"#=rrGd@rr3"fK(f3FiB-r:!SKm>rrFS?rr3"DV"jrmpsqY'qu6Tq
-*W?!@?bQL(1]IC^qYgC8s/(#?:<rj^r>YtHfDklVCA\#3WcRM+!K`9=rrN(ur>Ygmq#:B"C]485
-*U`q.?,-(4"c&BCs7@c>rrd5Er7aR:rrG7@rVm1AYQ#XC]jLeN\,QC1[:oSG_#F?=XDn4+7iWLI
-oD\j9:](.m`E.WjJcD_LJ,~>
-!ouXLrVlj<qYpWR7/HTV!W"#=rrGd@rr3"fK(f3FiB-r:!SKm>rrFS?rr3"DV"jrmpsqY'qu6Tq
-*W?!@?bQL(1]IC^qYgC8s/(#?:<rj^r>YtHfDklVCA\#3WcRM+!K`9=rrN(ur>Ygmq#:B"C]485
-*U`q.?,-(4"c&BCs7@c>rrd5Er7aR:rrG7@rVm1AYQ#XC]jLeN\,QC1[:oSG_#F?=XDn4+7iWLI
-oD\j9:](.m`E.WjJcD_LJ,~>
-!ouXLrVlj<qu6]J7e?W\qBGn<!DCl?rrJR?pAY0P48]$YfgPf=!@c+hrrIA?rr3&lcfG')!Sfs<
-rr=)<rrc]Bs62?;rsAZHs/(#?:<rM[rr3Mf37n31Z>0F>gA1dK\p3N,rs+XEs8UUKoAKTI!$1k7
-!O6G=rr=)4rrV!%r;HWr?,-(4"c&BCs7@c=rrPU@*W5pJ4Q6.is8Qu?ruM-Q?iO]Hrr3,/B`DAR
-rr3,&E;rnYrr3#ejn8WSbtn9;!rAp@r;Qincf'HTJcE"TJ,~>
-!ouXLrVlj<qu6]J7e?W\qBGn<!DCl?rrJR?pAY0P48]$YfgPf=!@c+hrrIA?rr3&lcfG')!Sfs<
-rr=)<rrc]Bs62?;rsAZHs/(#?:<rM[rr3Mf37n31Z>0F>gA1dK\p3N,rs+XEs8UUKoAKTI!$1k7
-!O6G=rr=)4rrV!%r;HWr?,-(4"c&BCs7@c=rrPU@*W5pJ4Q6.is8Qu?ruM-Q?iO]Hrr3,/B`DAR
-rr3,&E;rnYrr3#ejn8WSbtn9;!rAp@r;Qincf'HTJcE"TJ,~>
-!ouXLrVlj<qu6]J7e?W\qBGn<!DCl?rrJR?pAY0P48]$YfgPf=!@c+hrrIA?rr3&lcfG')!Sfs<
-rr=)<rrc]Bs62?;rsAZHs/(#?:<rM[rr3Mf37n31Z>0F>gA1dK\p3N,rs+XEs8UUKoAKTI!$1k7
-!O6G=rr=)4rrV!%r;HWr?,-(4"c&BCs7@c=rrPU@*W5pJ4Q6.is8Qu?ruM-Q?iO]Hrr3,/B`DAR
-rr3,&E;rnYrr3#ejn8WSbtn9;!rAp@r;Qincf'HTJcE"TJ,~>
-&*-#Ys3n9Z'XG$js8U/Gp@S@j_ljo_cN!oqT`24tMQ$:L"M:6SZI]$T#e?<UZIo3W.8^#L!I_`^
-rrU7AErH"=gd(f;!+#Q/"EMoikqi8;$2u%H_4Ua&cM1ZDZ3k[gfDklmGI"Mcl2L\`N0*E+#I/ug
-Z<@4XE;d'B>PS4!Z"s=<!$1b4!_EC^rVln(^\.U1X,+'eY%dk7!dpbLr;R:NVPeS:s-]%U'XF*e
-s-&cJZN$0ks,EHGZ36;Zs+m3EZ2ouZp&>';:]14ni]?u:!nmW^JcC<$Z2]=~>
-&*-#Ys3n9Z'XG$js8U/Gp@S@j_ljo_cN!oqT`24tMQ$:L"M:6SZI]$T#e?<UZIo3W.8^#L!I_`^
-rrU7AErH"=gd(f;!+#Q/"EMoikqi8;$2u%H_4Ua&cM1ZDZ3k[gfDklmGI"Mcl2L\`N0*E+#I/ug
-Z<@4XE;d'B>PS4!Z"s=<!$1b4!_EC^rVln(^\.U1X,+'eY%dk7!dpbLr;R:NVPeS:s-]%U'XF*e
-s-&cJZN$0ks,EHGZ36;Zs+m3EZ2ouZp&>';:]14ni]?u:!nmW^JcC<$Z2]=~>
-&*-#Ys3n9Z'XG$js8U/Gp@S@j_ljo_cN!oqT`24tMQ$:L"M:6SZI]$T#e?<UZIo3W.8^#L!I_`^
-rrU7AErH"=gd(f;!+#Q/"EMoikqi8;$2u%H_4Ua&cM1ZDZ3k[gfDklmGI"Mcl2L\`N0*E+#I/ug
-Z<@4XE;d'B>PS4!Z"s=<!$1b4!_EC^rVln(^\.U1X,+'eY%dk7!dpbLr;R:NVPeS:s-]%U'XF*e
-s-&cJZN$0ks,EHGZ36;Zs+m3EZ2ouZp&>';:]14ni]?u:!nmW^JcC<$Z2]=~>
-"QVjNs/Gp1"JPkqP32B9!/UVg!2'8j!/(8b!i5k1qj%?1s8RBDB`P=8rr@0?B`tdBs+0V;B`P[A
-rrV%kXSr/"l]1oC!;HG+"NUQBnq[/C!WIHErr\VIs60Gr!l^>crr3)9Bkc?#rrTfah<b.GXD)D;
-s8U7?B`Rf#rrLNGrVlkDp&>)W'(Pr#"'oo4T_ABfVeKj`qu6\Hq>:0mH?oJh"INm3Boi8n!0dCr
-!0mK_!07%m!1Eid!/^\h!1roa"/_B0:]14nOc0,:!pOEmJcC<$Z2]=~>
-"QVjNs/Gp1"JPkqP32B9!/UVg!2'8j!/(8b!i5k1qj%?1s8RBDB`P=8rr@0?B`tdBs+0V;B`P[A
-rrV%kXSr/"l]1oC!;HG+"NUQBnq[/C!WIHErr\VIs60Gr!l^>crr3)9Bkc?#rrTfah<b.GXD)D;
-s8U7?B`Rf#rrLNGrVlkDp&>)W'(Pr#"'oo4T_ABfVeKj`qu6\Hq>:0mH?oJh"INm3Boi8n!0dCr
-!0mK_!07%m!1Eid!/^\h!1roa"/_B0:]14nOc0,:!pOEmJcC<$Z2]=~>
-"QVjNs/Gp1"JPkqP32B9!/UVg!2'8j!/(8b!i5k1qj%?1s8RBDB`P=8rr@0?B`tdBs+0V;B`P[A
-rrV%kXSr/"l]1oC!;HG+"NUQBnq[/C!WIHErr\VIs60Gr!l^>crr3)9Bkc?#rrTfah<b.GXD)D;
-s8U7?B`Rf#rrLNGrVlkDp&>)W'(Pr#"'oo4T_ABfVeKj`qu6\Hq>:0mH?oJh"INm3Boi8n!0dCr
-!0mK_!07%m!1Eid!/^\h!1roa"/_B0:]14nOc0,:!pOEmJcC<$Z2]=~>
-!ouXLg&D&Xqh5$jXoAF5fYd^i/+NT<"0mQ6OPKj9*SgYsQ\C-or;Qb\JcC<$VuM8~>
-!ouXLg&D&Xqh5$jXoAF5fYd^i/+NT<"0mQ6OPKj9*SgYsQ\C-or;Qb\JcC<$VuM8~>
-!ouXLg&D&Xqh5$jXoAF5fYd^i/+NT<"0mQ6OPKj9*SgYsQ\C-or;Qb\JcC<$VuM8~>
-!ouXLJcEIa!fWE@eGfLhJcC<$JcGNFJ,~>
-!ouXLJcEIa!fWE@eGfLhJcC<$JcGNFJ,~>
-!ouXLJcEIa!fWE@eGfLhJcC<$JcGNFJ,~>
-!ouXLJcEIa!RUJfrrBugs+13$s7lVE~>
-!ouXLJcEIa!RUJfrrBugs+13$s7lVE~>
-!ouXLJcEIa!RUJfrrBugs+13$s7lVE~>
-!ouXLrr3't-73*urrYk?->%i/VuHj>-71q,rrYb<->A&2JcDGDJ,~>
-!ouXLrr3't-73*urrYk?->%i/VuHj>-71q,rrYb<->A&2JcDGDJ,~>
-!ouXLrr3't-73*urrYk?->%i/VuHj>-71q,rrYb<->A&2JcDGDJ,~>
-!ouXLrr3'UiUusDrs(%<p%\ReoM>H+"C_!'=r@2X",R!J62hi)Dt`u+!V%uF*!C]as#M+t*!3#;
-5lDZ''<(^+!:'M&".8rb)Z1QV`W%.\*!$Vlq>UKpc2AUb[/Bt%Y5TCHaoDD<V]6\VqtU0lr3?2?
-"47(m&H*RN*rl,4r>Ygpq#:BkQMhd'mem(cnKn27"SQdS*96en!V^p>*!%tfr;Qr]1&q:ID#PCZ
-7.^HYq"=;#o`#1Qo$gS;s)5IHo)Ae=s1<%Frr_uf`D;'bJcDGDJ,~>
-!ouXLrr3'UiUusDrs(%<p%\ReoM>H+"C_!'=r@2X",R!J62hi)Dt`u+!V%uF*!C]as#M+t*!3#;
-5lDZ''<(^+!:'M&".8rb)Z1QV`W%.\*!$Vlq>UKpc2AUb[/Bt%Y5TCHaoDD<V]6\VqtU0lr3?2?
-"47(m&H*RN*rl,4r>Ygpq#:BkQMhd'mem(cnKn27"SQdS*96en!V^p>*!%tfr;Qr]1&q:ID#PCZ
-7.^HYq"=;#o`#1Qo$gS;s)5IHo)Ae=s1<%Frr_uf`D;'bJcDGDJ,~>
-!ouXLrr3'UiUusDrs(%<p%\ReoM>H+"C_!'=r@2X",R!J62hi)Dt`u+!V%uF*!C]as#M+t*!3#;
-5lDZ''<(^+!:'M&".8rb)Z1QV`W%.\*!$Vlq>UKpc2AUb[/Bt%Y5TCHaoDD<V]6\VqtU0lr3?2?
-"47(m&H*RN*rl,4r>Ygpq#:BkQMhd'mem(cnKn27"SQdS*96en!V^p>*!%tfr;Qr]1&q:ID#PCZ
-7.^HYq"=;#o`#1Qo$gS;s)5IHo)Ae=s1<%Frr_uf`D;'bJcDGDJ,~>
-!ouXLrr3!SlMLS^.eEW=!F3J?rrfBBs&7&:rrGd@rr3"fK)#?H3o^/="Gr?B1$eT6!pk9@q#:=7
-rVlt4[Jq9@rrV=od/!\BodB_<"@^r?ZYfX?#PtQEs8R)Bqt^6mdn0N<"!m]c;>^@o_HQp<!$1k7
-!O6G=rr=)<rsRa\$ig7pJueqO6eV87!K`<?rrM"?rVm)U2_"e,J"HZ>!R=I<rr=)3rrXeBdRsN=
-!C,E2rrX;A\7GO;!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEW=!F3J?rrfBBs&7&:rrGd@rr3"fK)#?H3o^/="Gr?B1$eT6!pk9@q#:=7
-rVlt4[Jq9@rrV=od/!\BodB_<"@^r?ZYfX?#PtQEs8R)Bqt^6mdn0N<"!m]c;>^@o_HQp<!$1k7
-!O6G=rr=)<rsRa\$ig7pJueqO6eV87!K`<?rrM"?rVm)U2_"e,J"HZ>!R=I<rr=)3rrXeBdRsN=
-!C,E2rrX;A\7GO;!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEW=!F3J?rrfBBs&7&:rrGd@rr3"fK)#?H3o^/="Gr?B1$eT6!pk9@q#:=7
-rVlt4[Jq9@rrV=od/!\BodB_<"@^r?ZYfX?#PtQEs8R)Bqt^6mdn0N<"!m]c;>^@o_HQp<!$1k7
-!O6G=rr=)<rsRa\$ig7pJueqO6eV87!K`<?rrM"?rVm)U2_"e,J"HZ>!R=I<rr=)3rrXeBdRsN=
-!C,E2rrX;A\7GO;!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEW=!F3J?rt2;Os&7%P[C+B]s*rr+s6>N>q#:@Uir8r\M3Irokl.sigACmN
-QA>57!$2%<"D>.B*V99<!9="W!oJ@Aq#:Bf-iO&I7G$o\qu6of@a>#Rc!]u8rrLS?rVm!Gq9)Xm
-rj;k&s2%t<rr=)7rrKB?rVlj<rr3DWCt]p0s1Eg>s8TE?q#:AVNW/qYh`^u=#KpH:.KBEtT)S`j
-c;+<;!$1_3").AbJ,]HLGGkH=rrp[9]sY8prVlt,s36](rrLA?JcC<$U&TW~>
-!ouXLrr3!SlMLS^.eEW=!F3J?rt2;Os&7%P[C+B]s*rr+s6>N>q#:@Uir8r\M3Irokl.sigACmN
-QA>57!$2%<"D>.B*V99<!9="W!oJ@Aq#:Bf-iO&I7G$o\qu6of@a>#Rc!]u8rrLS?rVm!Gq9)Xm
-rj;k&s2%t<rr=)7rrKB?rVlj<rr3DWCt]p0s1Eg>s8TE?q#:AVNW/qYh`^u=#KpH:.KBEtT)S`j
-c;+<;!$1_3").AbJ,]HLGGkH=rrp[9]sY8prVlt,s36](rrLA?JcC<$U&TW~>
-!ouXLrr3!SlMLS^.eEW=!F3J?rt2;Os&7%P[C+B]s*rr+s6>N>q#:@Uir8r\M3Irokl.sigACmN
-QA>57!$2%<"D>.B*V99<!9="W!oJ@Aq#:Bf-iO&I7G$o\qu6of@a>#Rc!]u8rrLS?rVm!Gq9)Xm
-rj;k&s2%t<rr=)7rrKB?rVlj<rr3DWCt]p0s1Eg>s8TE?q#:AVNW/qYh`^u=#KpH:.KBEtT)S`j
-c;+<;!$1_3").AbJ,]HLGGkH=rrp[9]sY8prVlt,s36](rrLA?JcC<$U&TW~>
-!ouXLrr3!SlMLS^.eEW=%U?jMs6409s&42YAnH;1rVlreMkg%H#s.)Gs4gM9s"TH2Ac[D5rVlrX
-KX^^U!$2(="jT<>rtpjsAc[YJrr3)X=&duMrrMd?rr3/<.bF&Ai;T,MkPtS<GF=kBht[3Pdn0Q=
-"g\s>b;"YKAcn:t_HQs=!N[(3rrKB?rr38#*WQ/eI*Va4rr3,/Kpe?Lp\u"jNW9%XL->S:_fb#3
-.KBEtT)\ibHqsV>!$1G+!ILR>rruGICM%1'an>Z7btiojJcDGDJ,~>
-!ouXLrr3!SlMLS^.eEW=%U?jMs6409s&42YAnH;1rVlreMkg%H#s.)Gs4gM9s"TH2Ac[D5rVlrX
-KX^^U!$2(="jT<>rtpjsAc[YJrr3)X=&duMrrMd?rr3/<.bF&Ai;T,MkPtS<GF=kBht[3Pdn0Q=
-"g\s>b;"YKAcn:t_HQs=!N[(3rrKB?rr38#*WQ/eI*Va4rr3,/Kpe?Lp\u"jNW9%XL->S:_fb#3
-.KBEtT)\ibHqsV>!$1G+!ILR>rruGICM%1'an>Z7btiojJcDGDJ,~>
-!ouXLrr3!SlMLS^.eEW=%U?jMs6409s&42YAnH;1rVlreMkg%H#s.)Gs4gM9s"TH2Ac[D5rVlrX
-KX^^U!$2(="jT<>rtpjsAc[YJrr3)X=&duMrrMd?rr3/<.bF&Ai;T,MkPtS<GF=kBht[3Pdn0Q=
-"g\s>b;"YKAcn:t_HQs=!N[(3rrKB?rr38#*WQ/eI*Va4rr3,/Kpe?Lp\u"jNW9%XL->S:_fb#3
-.KBEtT)\ibHqsV>!$1G+!ILR>rruGICM%1'an>Z7btiojJcDGDJ,~>
-!ouXLrr3!SlMLS^.eEW=%^1>0I=>7;s/UbCs8Sj?rr3&pI\lc<$(cToI=F_Ms-e`BrrI\@rVlo)
-C%hQ,NrFG1Il4Y6MO4>B!FNP>rrgr*Jq)eUrrMtIrd=s#,M2<!If=p)Idd<rItE9%jS8`Ul@Jq_
-"b@<^jat#ArrX;AiILoU!J(s[rrLf'rd>''*<4K;aoDA]rr3,:J:`B,p\t98J,Xj)E]sH>JD'tp
-.KBF`J,XisBhnU+!$1D*!$2%<##o4*s8Sm?p&>';:P&Oss.TIC~>
-!ouXLrr3!SlMLS^.eEW=%^1>0I=>7;s/UbCs8Sj?rr3&pI\lc<$(cToI=F_Ms-e`BrrI\@rVlo)
-C%hQ,NrFG1Il4Y6MO4>B!FNP>rrgr*Jq)eUrrMtIrd=s#,M2<!If=p)Idd<rItE9%jS8`Ul@Jq_
-"b@<^jat#ArrX;AiILoU!J(s[rrLf'rd>''*<4K;aoDA]rr3,:J:`B,p\t98J,Xj)E]sH>JD'tp
-.KBF`J,XisBhnU+!$1D*!$2%<##o4*s8Sm?p&>';:P&Oss.TIC~>
-!ouXLrr3!SlMLS^.eEW=%^1>0I=>7;s/UbCs8Sj?rr3&pI\lc<$(cToI=F_Ms-e`BrrI\@rVlo)
-C%hQ,NrFG1Il4Y6MO4>B!FNP>rrgr*Jq)eUrrMtIrd=s#,M2<!If=p)Idd<rItE9%jS8`Ul@Jq_
-"b@<^jat#ArrX;AiILoU!J(s[rrLf'rd>''*<4K;aoDA]rr3,:J:`B,p\t98J,Xj)E]sH>JD'tp
-.KBF`J,XisBhnU+!$1D*!$2%<##o4*s8Sm?p&>';:P&Oss.TIC~>
-!ouXLrr3!SlMLS^.eET<"h("oZ`A*CrrJm@rr3":Y4V_tWLf]sM3Ii:!J-d?rrV2$`qKE4rViAi
-c"FH]rrHK?qu6[t`q]Q6nG]!_fgXN[*kVFO#sI26DSQ5O]l*B8rrD*YSc\%"q>:0o*WQ/qrgj/X
-*V]R6f)D6Do,[k1/H0&a$[;WhJ(Xf$TR?M6(!<,>TAMg3LH/dO>n;nos21G"VTqs7rr=)*rrJR?
-rr3!uaSu2?Uj;Y5!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eET<"h("oZ`A*CrrJm@rr3":Y4V_tWLf]sM3Ii:!J-d?rrV2$`qKE4rViAi
-c"FH]rrHK?qu6[t`q]Q6nG]!_fgXN[*kVFO#sI26DSQ5O]l*B8rrD*YSc\%"q>:0o*WQ/qrgj/X
-*V]R6f)D6Do,[k1/H0&a$[;WhJ(Xf$TR?M6(!<,>TAMg3LH/dO>n;nos21G"VTqs7rr=)*rrJR?
-rr3!uaSu2?Uj;Y5!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eET<"h("oZ`A*CrrJm@rr3":Y4V_tWLf]sM3Ii:!J-d?rrV2$`qKE4rViAi
-c"FH]rrHK?qu6[t`q]Q6nG]!_fgXN[*kVFO#sI26DSQ5O]l*B8rrD*YSc\%"q>:0o*WQ/qrgj/X
-*V]R6f)D6Do,[k1/H0&a$[;WhJ(Xf$TR?M6(!<,>TAMg3LH/dO>n;nos21G"VTqs7rr=)*rrJR?
-rr3!uaSu2?Uj;Y5!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEH8!NU5;rro0Ds8Q]>n,EEFPPb@\JXl`>!ROO0rrHc?qu6\(^&.g1<lXb2
-"%Ci/0`D"R4l><[rVlmUkk"fT,l.?;!$1q9!$1Y1!Zh=)rON+H`;cKXrr3#g/G&lDh`_"srji0:
-*mOT^!R=I<rr=)*rs&7lJcGaLaSu2?Uj;Y5!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEH8!NU5;rro0Ds8Q]>n,EEFPPb@\JXl`>!ROO0rrHc?qu6\(^&.g1<lXb2
-"%Ci/0`D"R4l><[rVlmUkk"fT,l.?;!$1q9!$1Y1!Zh=)rON+H`;cKXrr3#g/G&lDh`_"srji0:
-*mOT^!R=I<rr=)*rs&7lJcGaLaSu2?Uj;Y5!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEH8!NU5;rro0Ds8Q]>n,EEFPPb@\JXl`>!ROO0rrHc?qu6\(^&.g1<lXb2
-"%Ci/0`D"R4l><[rVlmUkk"fT,l.?;!$1q9!$1Y1!Zh=)rON+H`;cKXrr3#g/G&lDh`_"srji0:
-*mOT^!R=I<rr=)*rs&7lJcGaLaSu2?Uj;Y5!R4Dks+13Ds*t~>
-!ouXLrr3!SlMLS^.eEK9"jpfCs)6?brro0Ds(Jn>qYpWa.;\k\"grXDs&/:ars"%Es8VR[iqr`W
-cmaeIrre^NoD_,TrrZWAs$?V`!ER5>rrTPVV>C2pI&Hf-0`D"X4l?.@E<#rUZMXY$!gkFQqYp\*
-^AcSurVlj<qu6[obPhGBHR[hJrrGL?qu6sCs8VS?WW2u_h>R?T?RbjKrrW-`i;ETUoI9\;!q&\@
-r;Qa;qu6[Y8Flcaa]&6><65(=!Mk#6rrLA?JcC<$U&TW~>
-!ouXLrr3!SlMLS^.eEK9"jpfCs)6?brro0Ds(Jn>qYpWa.;\k\"grXDs&/:ars"%Es8VR[iqr`W
-cmaeIrre^NoD_,TrrZWAs$?V`!ER5>rrTPVV>C2pI&Hf-0`D"X4l?.@E<#rUZMXY$!gkFQqYp\*
-^AcSurVlj<qu6[obPhGBHR[hJrrGL?qu6sCs8VS?WW2u_h>R?T?RbjKrrW-`i;ETUoI9\;!q&\@
-r;Qa;qu6[Y8Flcaa]&6><65(=!Mk#6rrLA?JcC<$U&TW~>
-!ouXLrr3!SlMLS^.eEK9"jpfCs)6?brro0Ds(Jn>qYpWa.;\k\"grXDs&/:ars"%Es8VR[iqr`W
-cmaeIrre^NoD_,TrrZWAs$?V`!ER5>rrTPVV>C2pI&Hf-0`D"X4l?.@E<#rUZMXY$!gkFQqYp\*
-^AcSurVlj<qu6[obPhGBHR[hJrrGL?qu6sCs8VS?WW2u_h>R?T?RbjKrrW-`i;ETUoI9\;!q&\@
-r;Qa;qu6[Y8Flcaa]&6><65(=!Mk#6rrLA?JcC<$U&TW~>
-!ouXLrr3'Uh!jt7rrXb3nFZ_[#ZMc`9(r;bp.>6'"D[`3<Z:oV!0I3[!p^7krVm-\*#rScs8VaD
-rYu)rqZ$T`48SsYb6i:hrrDop*!Cojs8V9\*!;u6s5<hq!NQ(srrT5,PlC[_h#88rTD\`gb5E:c
-^]"31WuN+^r;HWsM[$WhrrBe4*!EqQs89%u*!>!rs0)DA!QtE?rrQs=fDbdMT`,o2f_YUJ/,oPO
-q/RGpkPY>]9EP%hrrdon*$4bLrrMaLrr3+B*#pR'rr3)nnF.IqrrF>jo)AmkXapFYbPqMBWIagD
-"7krt:P&Oss.TIC~>
-!ouXLrr3'Uh!jt7rrXb3nFZ_[#ZMc`9(r;bp.>6'"D[`3<Z:oV!0I3[!p^7krVm-\*#rScs8VaD
-rYu)rqZ$T`48SsYb6i:hrrDop*!Cojs8V9\*!;u6s5<hq!NQ(srrT5,PlC[_h#88rTD\`gb5E:c
-^]"31WuN+^r;HWsM[$WhrrBe4*!EqQs89%u*!>!rs0)DA!QtE?rrQs=fDbdMT`,o2f_YUJ/,oPO
-q/RGpkPY>]9EP%hrrdon*$4bLrrMaLrr3+B*#pR'rr3)nnF.IqrrF>jo)AmkXapFYbPqMBWIagD
-"7krt:P&Oss.TIC~>
-!ouXLrr3'Uh!jt7rrXb3nFZ_[#ZMc`9(r;bp.>6'"D[`3<Z:oV!0I3[!p^7krVm-\*#rScs8VaD
-rYu)rqZ$T`48SsYb6i:hrrDop*!Cojs8V9\*!;u6s5<hq!NQ(srrT5,PlC[_h#88rTD\`gb5E:c
-^]"31WuN+^r;HWsM[$WhrrBe4*!EqQs89%u*!>!rs0)DA!QtE?rrQs=fDbdMT`,o2f_YUJ/,oPO
-q/RGpkPY>]9EP%hrrdon*$4bLrrMaLrr3+B*#pR'rr3)nnF.IqrrF>jo)AmkXapFYbPqMBWIagD
-"7krt:P&Oss.TIC~>
-!ouXLrr3(#.k>-.rrZ"H.r+/F!R+C#rrK-?j8T.9PiMcEB=?k#!CbW#rrFA?k5PO+.k=!arrMm@
-h>[RM.k>Ifs+13Ds*t~>
-!ouXLrr3(#.k>-.rrZ"H.r+/F!R+C#rrK-?j8T.9PiMcEB=?k#!CbW#rrFA?k5PO+.k=!arrMm@
-h>[RM.k>Ifs+13Ds*t~>
-!ouXLrr3(#.k>-.rrZ"H.r+/F!R+C#rrK-?j8T.9PiMcEB=?k#!CbW#rrFA?k5PO+.k=!arrMm@
-h>[RM.k>Ifs+13Ds*t~>
-!ouXLf)GgITn2;)!q2;?jSo;DK<jS<!o8"AjSo;1B&htP!m4UAh#@Dd@Y+Q1s+14Gs*t~>
-!ouXLf)GgITn2;)!q2;?jSo;DK<jS<!o8"AjSo;1B&htP!m4UAh#@Dd@Y+Q1s+14Gs*t~>
-!ouXLf)GgITn2;)!q2;?jSo;DK<jS<!o8"AjSo;1B&htP!m4UAh#@Dd@Y+Q1s+14Gs*t~>
-!ouXLf)GdAK&ck3h3[1%!QhG'rrKLBj8T.Pe`6Z1MsB's!-NkmJcC<$q#>j~>
-!ouXLf)GdAK&ck3h3[1%!QhG'rrKLBj8T.Pe`6Z1MsB's!-NkmJcC<$q#>j~>
-!ouXLf)GdAK&ck3h3[1%!QhG'rrKLBj8T.Pe`6Z1MsB's!-NkmJcC<$q#>j~>
-!ouXLL&V1cdZa\2NkPGmp\oXB_RKOFg\u[&hYmHTaMn&V!Q<*2s-Nb9~>
-!ouXLL&V1cdZa\2NkPGmp\oXB_RKOFg\u[&hYmHTaMn&V!Q<*2s-Nb9~>
-!ouXLL&V1cdZa\2NkPGmp\oXB_RKOFg\u[&hYmHTaMn&V!Q<*2s-Nb9~>
-"lqsOs8S>_@fVJerrJ2Co)A`3GfB[_Fl<9$^4G)<rrUAR]C#V#c!t8,r;Qi,A'k5T!S*h3rrSHq
-B[m%_G,G3;",$1/N;ih\O(7qad\H:2"b:Cgs2))8rr[EDb,b79"R[8"SC%98#OmHI]"7qAr;L1+
-Xks'Xj8EHfg%PFR`if?(j8]/>S=DXRrVlrKIEMKf!muA@JcD,;J,~>
-"lqsOs8S>_@fVJerrJ2Co)A`3GfB[_Fl<9$^4G)<rrUAR]C#V#c!t8,r;Qi,A'k5T!S*h3rrSHq
-B[m%_G,G3;",$1/N;ih\O(7qad\H:2"b:Cgs2))8rr[EDb,b79"R[8"SC%98#OmHI]"7qAr;L1+
-Xks'Xj8EHfg%PFR`if?(j8]/>S=DXRrVlrKIEMKf!muA@JcD,;J,~>
-"lqsOs8S>_@fVJerrJ2Co)A`3GfB[_Fl<9$^4G)<rrUAR]C#V#c!t8,r;Qi,A'k5T!S*h3rrSHq
-B[m%_G,G3;",$1/N;ih\O(7qad\H:2"b:Cgs2))8rr[EDb,b79"R[8"SC%98#OmHI]"7qAr;L1+
-Xks'Xj8EHfg%PFR`if?(j8]/>S=DXRrVlrKIEMKf!muA@JcD,;J,~>
-"lqsOs-ArL\-AC]s8U8Gp@J:b^VS_*!V0skrr=(trrJC?r;Qi]\DZcS"6d6nWVlbthRMhLrrK]?
-nc&`YPdn,0hZ!V$j8/cV*rc*;$o@/%6N@(IR(-<![:oR>!FYftrs!qIZ=X'*JbK*G*WN'\pAY0]
-0)PYRju37"NrT,`rjVu\[,Crbo3D7(!Ft<errf'Bs%:`;rrHK?r;Qe>W;HSqCpAQkR/_[~>
-"lqsOs-ArL\-AC]s8U8Gp@J:b^VS_*!V0skrr=(trrJC?r;Qi]\DZcS"6d6nWVlbthRMhLrrK]?
-nc&`YPdn,0hZ!V$j8/cV*rc*;$o@/%6N@(IR(-<![:oR>!FYftrs!qIZ=X'*JbK*G*WN'\pAY0]
-0)PYRju37"NrT,`rjVu\[,Crbo3D7(!Ft<errf'Bs%:`;rrHK?r;Qe>W;HSqCpAQkR/_[~>
-"lqsOs-ArL\-AC]s8U8Gp@J:b^VS_*!V0skrr=(trrJC?r;Qi]\DZcS"6d6nWVlbthRMhLrrK]?
-nc&`YPdn,0hZ!V$j8/cV*rc*;$o@/%6N@(IR(-<![:oR>!FYftrs!qIZ=X'*JbK*G*WN'\pAY0]
-0)PYRju37"NrT,`rjVu\[,Crbo3D7(!Ft<errf'Bs%:`;rrHK?r;Qe>W;HSqCpAQkR/_[~>
-"lqsOs)#">rrKc?rr3#R6HoH1m4[i+!$1%u!l&a@j8T.$WV6>m\mk40"E(CBpa"_r!CYT;rrHE@
-qu7'\l.SK(s(/\>b:?iZrr3!CqXsjm9[NaJ.rFSFrrX;AW-.h6!U_T;rs.[Es,N->ruM+=!JZs!
-rrW,+CB"56hYHpG"JU5B9%*Y;!FNP<rrV@pci!eEk$Q\js-`n;~>
-"lqsOs)#">rrKc?rr3#R6HoH1m4[i+!$1%u!l&a@j8T.$WV6>m\mk40"E(CBpa"_r!CYT;rrHE@
-qu7'\l.SK(s(/\>b:?iZrr3!CqXsjm9[NaJ.rFSFrrX;AW-.h6!U_T;rs.[Es,N->ruM+=!JZs!
-rrW,+CB"56hYHpG"JU5B9%*Y;!FNP<rrV@pci!eEk$Q\js-`n;~>
-"lqsOs)#">rrKc?rr3#R6HoH1m4[i+!$1%u!l&a@j8T.$WV6>m\mk40"E(CBpa"_r!CYT;rrHE@
-qu7'\l.SK(s(/\>b:?iZrr3!CqXsjm9[NaJ.rFSFrrX;AW-.h6!U_T;rs.[Es,N->ruM+=!JZs!
-rrW,+CB"56hYHpG"JU5B9%*Y;!FNP<rrV@pci!eEk$Q\js-`n;~>
-$KOKTs7Z<hs3js?rVlrY6h^6R!_aRerVlol6N.r*EV]V6!p^A$rr3!gf_uj%J,91/m/R*]LB%9=
-)?h*#PkY1Xn,44/S,<4+cMedcU\t/Xr>Z3Fr;JVFV]6\]rVt:D*!NkNs8TB>r;QlD*#=n?rrN)2
-r>Yj_rq??mF/f-<"0W[Z[f6:.\m:*j*!#='rrQ^Air/l^DQa$>o)JQDrYuV$o`(\EnkpG]p&C<n
-*5aNjp&G&<rYu2-pA^*l#8eFOrVlm\iVWWkoD\^\s8Vfis8MN[s8R!W"<8Cns8VdbrYuMaq#C!a
-s8DH\s8PmA,9.\Iq>UBrnc/I[pAY0]0)PYRrU^'aq#C@7rpg2AQiI(9rVm%8_#OG]>5\C+/,u]"
-s'!eLdet-g\,H<I&cNaP^A\&Lr>Z*^rr<#op]'m`r;Qe)^&.g1=2t.;!D^pks-`n;~>
-$KOKTs7Z<hs3js?rVlrY6h^6R!_aRerVlol6N.r*EV]V6!p^A$rr3!gf_uj%J,91/m/R*]LB%9=
-)?h*#PkY1Xn,44/S,<4+cMedcU\t/Xr>Z3Fr;JVFV]6\]rVt:D*!NkNs8TB>r;QlD*#=n?rrN)2
-r>Yj_rq??mF/f-<"0W[Z[f6:.\m:*j*!#='rrQ^Air/l^DQa$>o)JQDrYuV$o`(\EnkpG]p&C<n
-*5aNjp&G&<rYu2-pA^*l#8eFOrVlm\iVWWkoD\^\s8Vfis8MN[s8R!W"<8Cns8VdbrYuMaq#C!a
-s8DH\s8PmA,9.\Iq>UBrnc/I[pAY0]0)PYRrU^'aq#C@7rpg2AQiI(9rVm%8_#OG]>5\C+/,u]"
-s'!eLdet-g\,H<I&cNaP^A\&Lr>Z*^rr<#op]'m`r;Qe)^&.g1=2t.;!D^pks-`n;~>
-$KOKTs7Z<hs3js?rVlrY6h^6R!_aRerVlol6N.r*EV]V6!p^A$rr3!gf_uj%J,91/m/R*]LB%9=
-)?h*#PkY1Xn,44/S,<4+cMedcU\t/Xr>Z3Fr;JVFV]6\]rVt:D*!NkNs8TB>r;QlD*#=n?rrN)2
-r>Yj_rq??mF/f-<"0W[Z[f6:.\m:*j*!#='rrQ^Air/l^DQa$>o)JQDrYuV$o`(\EnkpG]p&C<n
-*5aNjp&G&<rYu2-pA^*l#8eFOrVlm\iVWWkoD\^\s8Vfis8MN[s8R!W"<8Cns8VdbrYuMaq#C!a
-s8DH\s8PmA,9.\Iq>UBrnc/I[pAY0]0)PYRrU^'aq#C@7rpg2AQiI(9rVm%8_#OG]>5\C+/,u]"
-s'!eLdet-g\,H<I&cNaP^A\&Lr>Z*^rr<#op]'m`r;Qe)^&.g1=2t.;!D^pks-`n;~>
-!ouXLrVloJ8c&Gfd7a04!W"#=rrGd@rr3"fK)YcOm3ulNrrG/,rr37\PQ*B's8S[>rr3#d0D,8E
-*W?!@JAM6u:&b.n?bQ@:$Wb:Ii!OT+s%^l4-iO&KA)71bZ>079!K<->rrLn@rVlmLnFlk_F/f':
-!Gf"?rrTbCPlC[_*W?!JF=H>Os7+ZGP1KO1s.Fc=rt4`Os8REaaoCN]s,`6?39B$\qu6]J7fNDg
-7+hD:!Bf?,rrF>?rVlmtaSu2?ZB"_[#"'X1s8S:?n,EFV0(f/D)ZD/q'pnt#5McA>l>"B>s34C<
-rs0\GVfi#8c1WL_rrYdBmP"P="$YT'2uWaW<pTGY!FNP;rrH3@qu6[lc@Q"`s*t~>
-!ouXLrVloJ8c&Gfd7a04!W"#=rrGd@rr3"fK)YcOm3ulNrrG/,rr37\PQ*B's8S[>rr3#d0D,8E
-*W?!@JAM6u:&b.n?bQ@:$Wb:Ii!OT+s%^l4-iO&KA)71bZ>079!K<->rrLn@rVlmLnFlk_F/f':
-!Gf"?rrTbCPlC[_*W?!JF=H>Os7+ZGP1KO1s.Fc=rt4`Os8REaaoCN]s,`6?39B$\qu6]J7fNDg
-7+hD:!Bf?,rrF>?rVlmtaSu2?ZB"_[#"'X1s8S:?n,EFV0(f/D)ZD/q'pnt#5McA>l>"B>s34C<
-rs0\GVfi#8c1WL_rrYdBmP"P="$YT'2uWaW<pTGY!FNP;rrH3@qu6[lc@Q"`s*t~>
-!ouXLrVloJ8c&Gfd7a04!W"#=rrGd@rr3"fK)YcOm3ulNrrG/,rr37\PQ*B's8S[>rr3#d0D,8E
-*W?!@JAM6u:&b.n?bQ@:$Wb:Ii!OT+s%^l4-iO&KA)71bZ>079!K<->rrLn@rVlmLnFlk_F/f':
-!Gf"?rrTbCPlC[_*W?!JF=H>Os7+ZGP1KO1s.Fc=rt4`Os8REaaoCN]s,`6?39B$\qu6]J7fNDg
-7+hD:!Bf?,rrF>?rVlmtaSu2?ZB"_[#"'X1s8S:?n,EFV0(f/D)ZD/q'pnt#5McA>l>"B>s34C<
-rs0\GVfi#8c1WL_rrYdBmP"P="$YT'2uWaW<pTGY!FNP;rrH3@qu6[lc@Q"`s*t~>
-!ouXLrr3#?<Vl^sqPAT4rrMs?rVlmkdf07IRY(>7!BT6>rs4IFs"Wj>s.4]=rrML?o`"n3qYpO9
-rVlt,^&Rp,\cb7;s56$=rr[`)pfIF*!:9^b!O?J:rrJ(?rr3#S62gfa/F`B5!HY7;rrHo@rr3#1
-@f?<,*VfX@^dT:t7IU9VTR?b='_![Rs*LL?s6a\&OH'9"jki6$s4@7]!M)^ZrrGO?qu6[ZiTpLE
-,5V9<!J7$E\cC4RrrGL?rr3"_MXUQGmOn/3!$2(=$&4fHs7.Z>s*^O=rrLA@r;R$Ds/1#>:X/S[
-rVlsif'Y3irrYIAlsB\&!9s+T!FNP;rrH3@qu6[lc@Q"`s*t~>
-!ouXLrr3#?<Vl^sqPAT4rrMs?rVlmkdf07IRY(>7!BT6>rs4IFs"Wj>s.4]=rrML?o`"n3qYpO9
-rVlt,^&Rp,\cb7;s56$=rr[`)pfIF*!:9^b!O?J:rrJ(?rr3#S62gfa/F`B5!HY7;rrHo@rr3#1
-@f?<,*VfX@^dT:t7IU9VTR?b='_![Rs*LL?s6a\&OH'9"jki6$s4@7]!M)^ZrrGO?qu6[ZiTpLE
-,5V9<!J7$E\cC4RrrGL?rr3"_MXUQGmOn/3!$2(=$&4fHs7.Z>s*^O=rrLA@r;R$Ds/1#>:X/S[
-rVlsif'Y3irrYIAlsB\&!9s+T!FNP;rrH3@qu6[lc@Q"`s*t~>
-!ouXLrr3#?<Vl^sqPAT4rrMs?rVlmkdf07IRY(>7!BT6>rs4IFs"Wj>s.4]=rrML?o`"n3qYpO9
-rVlt,^&Rp,\cb7;s56$=rr[`)pfIF*!:9^b!O?J:rrJ(?rr3#S62gfa/F`B5!HY7;rrHo@rr3#1
-@f?<,*VfX@^dT:t7IU9VTR?b='_![Rs*LL?s6a\&OH'9"jki6$s4@7]!M)^ZrrGO?qu6[ZiTpLE
-,5V9<!J7$E\cC4RrrGL?rr3"_MXUQGmOn/3!$2(=$&4fHs7.Z>s*^O=rrLA@r;R$Ds/1#>:X/S[
-rVlsif'Y3irrYIAlsB\&!9s+T!FNP;rrH3@qu6[lc@Q"`s*t~>
-#NS0Qs8T`Ko(r@eT76G4!W"#=rrGd@rr3"fK)#?H3o^/=#`4cF1$el>Spp\=!UVQ4rr=)9rr=)<
-rrZWAs-rsq"<kebi&po:!9a;h"c`$Os0?D9rrJ(?rr3#S62gfa/F`B5!HY7;rrHo@rr3#1@f?<,
-*VTL6DQ`s<!MFi>rrqmCs8RG?r;R(bNW2!"h`_"eHN%=R;+CQb!CYT;rrG7@li-u0qY^?nKDo9[
-GKfj^!CPQ>rrJ=@n,EFV0(f/D*WH'FL6qr?pM7=mJ&M?d!R4I=rs0\GVfi#8c1WL_rrYdBmP"P=
-"$YT7OoAbhbk(i8?bQ@:!E[;<rrGm?JcD/<J,~>
-#NS0Qs8T`Ko(r@eT76G4!W"#=rrGd@rr3"fK)#?H3o^/=#`4cF1$el>Spp\=!UVQ4rr=)9rr=)<
-rrZWAs-rsq"<kebi&po:!9a;h"c`$Os0?D9rrJ(?rr3#S62gfa/F`B5!HY7;rrHo@rr3#1@f?<,
-*VTL6DQ`s<!MFi>rrqmCs8RG?r;R(bNW2!"h`_"eHN%=R;+CQb!CYT;rrG7@li-u0qY^?nKDo9[
-GKfj^!CPQ>rrJ=@n,EFV0(f/D*WH'FL6qr?pM7=mJ&M?d!R4I=rs0\GVfi#8c1WL_rrYdBmP"P=
-"$YT7OoAbhbk(i8?bQ@:!E[;<rrGm?JcD/<J,~>
-#NS0Qs8T`Ko(r@eT76G4!W"#=rrGd@rr3"fK)#?H3o^/=#`4cF1$el>Spp\=!UVQ4rr=)9rr=)<
-rrZWAs-rsq"<kebi&po:!9a;h"c`$Os0?D9rrJ(?rr3#S62gfa/F`B5!HY7;rrHo@rr3#1@f?<,
-*VTL6DQ`s<!MFi>rrqmCs8RG?r;R(bNW2!"h`_"eHN%=R;+CQb!CYT;rrG7@li-u0qY^?nKDo9[
-GKfj^!CPQ>rrJ=@n,EFV0(f/D*WH'FL6qr?pM7=mJ&M?d!R4I=rs0\GVfi#8c1WL_rrYdBmP"P=
-"$YT7OoAbhbk(i8?bQ@:!E[;<rrGm?JcD/<J,~>
-#38'Ps0mL>qYpS^L@bEGqBGn<!DCl?rrJR?rr3&lJuSbL!BP?%rs4IFs"Wj>s.4]=rrqdCs8Td\
-q#:=7rVlu-g]&;mrrZWAruM+="hQ>*s56$;rrMt]rVm'jfDkm'J&M6a!K<->rrLn@rVlmLnFlk_
-F/f':!Gf"?rrTbe_>aH7*W?!>Y(H0ArrI#?rVlnkI/a-Ln1=V>H_UH<%Zl\M39B$\s+cm>s7pM$
-rr3*hf`1-5rr3%hJc>$9#9s$Ef"(g]jSo/[Uj;b8!CPQ>rrJ=@pAY3]K!G:S!U_T4rr=)=rrIk@
-rr3)N8",&.rt!@Ns1?e\ruV3<FoP7^p*Tb<"%Ur10E(nQ52PB[rVlngoC`+a?bQC;!kWsAr;Qi-
-J*-\/!jdLEJcDGDJ,~>
-#38'Ps0mL>qYpS^L@bEGqBGn<!DCl?rrJR?rr3&lJuSbL!BP?%rs4IFs"Wj>s.4]=rrqdCs8Td\
-q#:=7rVlu-g]&;mrrZWAruM+="hQ>*s56$;rrMt]rVm'jfDkm'J&M6a!K<->rrLn@rVlmLnFlk_
-F/f':!Gf"?rrTbe_>aH7*W?!>Y(H0ArrI#?rVlnkI/a-Ln1=V>H_UH<%Zl\M39B$\s+cm>s7pM$
-rr3*hf`1-5rr3%hJc>$9#9s$Ef"(g]jSo/[Uj;b8!CPQ>rrJ=@pAY3]K!G:S!U_T4rr=)=rrIk@
-rr3)N8",&.rt!@Ns1?e\ruV3<FoP7^p*Tb<"%Ur10E(nQ52PB[rVlngoC`+a?bQC;!kWsAr;Qi-
-J*-\/!jdLEJcDGDJ,~>
-#38'Ps0mL>qYpS^L@bEGqBGn<!DCl?rrJR?rr3&lJuSbL!BP?%rs4IFs"Wj>s.4]=rrqdCs8Td\
-q#:=7rVlu-g]&;mrrZWAruM+="hQ>*s56$;rrMt]rVm'jfDkm'J&M6a!K<->rrLn@rVlmLnFlk_
-F/f':!Gf"?rrTbe_>aH7*W?!>Y(H0ArrI#?rVlnkI/a-Ln1=V>H_UH<%Zl\M39B$\s+cm>s7pM$
-rr3*hf`1-5rr3%hJc>$9#9s$Ef"(g]jSo/[Uj;b8!CPQ>rrJ=@pAY3]K!G:S!U_T4rr=)=rrIk@
-rr3)N8",&.rt!@Ns1?e\ruV3<FoP7^p*Tb<"%Ur10E(nQ52PB[rVlngoC`+a?bQC;!kWsAr;Qi-
-J*-\/!jdLEJcDGDJ,~>
-"lqsOs(t7(Ad+k-s,iH?o`#2OA.E4Bs8TQHral1Wc2R_Ekl=QZrrG0:ralakeGlXcAnH==_uKc3
-OCi*Ug\CdKUA\[+K]2qOrVlt,^&OGuAd*cC`rFsZr;QfpOo8kmMspZF!L8H=rs7Fm3'([/s7)'H
-Ac\"hq#:rOAhHJ`n,NF0Ah-A`o`)KaJ,X$[TDeck=odLZrrI#?rVloOJGs-aBrh:6H_UH<%Zl\M
-YOp^8s3H%(AnZ`brr3,.DJ!jtrVlm>rp9XiVe9Uc`rEYjral1UanYl:6eVJ=!L&E7rrUmS@/^*+
-mOn/3!2BI)!IiSurr_\IHHlEg&*o'aK&$D+P@d08Ar5jNOo8koMsgA%rFQ.ko(A%AAc[qbp&>&"
-^&7m2FK#*:!Go%<rrQ[1eq*jps*t~>
-"lqsOs(t7(Ad+k-s,iH?o`#2OA.E4Bs8TQHral1Wc2R_Ekl=QZrrG0:ralakeGlXcAnH==_uKc3
-OCi*Ug\CdKUA\[+K]2qOrVlt,^&OGuAd*cC`rFsZr;QfpOo8kmMspZF!L8H=rs7Fm3'([/s7)'H
-Ac\"hq#:rOAhHJ`n,NF0Ah-A`o`)KaJ,X$[TDeck=odLZrrI#?rVloOJGs-aBrh:6H_UH<%Zl\M
-YOp^8s3H%(AnZ`brr3,.DJ!jtrVlm>rp9XiVe9Uc`rEYjral1UanYl:6eVJ=!L&E7rrUmS@/^*+
-mOn/3!2BI)!IiSurr_\IHHlEg&*o'aK&$D+P@d08Ar5jNOo8koMsgA%rFQ.ko(A%AAc[qbp&>&"
-^&7m2FK#*:!Go%<rrQ[1eq*jps*t~>
-"lqsOs(t7(Ad+k-s,iH?o`#2OA.E4Bs8TQHral1Wc2R_Ekl=QZrrG0:ralakeGlXcAnH==_uKc3
-OCi*Ug\CdKUA\[+K]2qOrVlt,^&OGuAd*cC`rFsZr;QfpOo8kmMspZF!L8H=rs7Fm3'([/s7)'H
-Ac\"hq#:rOAhHJ`n,NF0Ah-A`o`)KaJ,X$[TDeck=odLZrrI#?rVloOJGs-aBrh:6H_UH<%Zl\M
-YOp^8s3H%(AnZ`brr3,.DJ!jtrVlm>rp9XiVe9Uc`rEYjral1UanYl:6eVJ=!L&E7rrUmS@/^*+
-mOn/3!2BI)!IiSurr_\IHHlEg&*o'aK&$D+P@d08Ar5jNOo8koMsgA%rFQ.ko(A%AAc[qbp&>&"
-^&7m2FK#*:!Go%<rrQ[1eq*jps*t~>
-"QVjNs4.%T"O[8Lb4G6)!6+rF!7:`F!5e`C!7LiG!r97Jrr3![ir6=cfDbdR]=#&og>`,3"nB".
-h#DQp8cls2rVa,+iW&qlrVluIm/Qn\[0>C3mf3"#qu6ZgrNuXkrVlrWI)#[\!:Tlo"7Z?jm/=<m
-o(DiO!rDr[rNub%s8V3Z[06@+ldFMd[/g.'rrUNSpAP!le`Zl1!8IL\!4i+/!SQQ3rrM$6rr3;u
-a8c1h[C*O9ao25@^pV)XrrKi?li.$p[E\^N!6+rF!7:K?!Qk!5rrM'6pAY3dL1'u["RZ^k8u_Rb
-!<2u*!8.5L!UA,1rrVDlh>[E[p9f'B[HRYjo_l0"li7"TrNuaps8VQd[/f[irrgP<8fYPCrrTHY
-k5>5\X,-!:rrUWVo7?q8s*t~>
-"QVjNs4.%T"O[8Lb4G6)!6+rF!7:`F!5e`C!7LiG!r97Jrr3![ir6=cfDbdR]=#&og>`,3"nB".
-h#DQp8cls2rVa,+iW&qlrVluIm/Qn\[0>C3mf3"#qu6ZgrNuXkrVlrWI)#[\!:Tlo"7Z?jm/=<m
-o(DiO!rDr[rNub%s8V3Z[06@+ldFMd[/g.'rrUNSpAP!le`Zl1!8IL\!4i+/!SQQ3rrM$6rr3;u
-a8c1h[C*O9ao25@^pV)XrrKi?li.$p[E\^N!6+rF!7:K?!Qk!5rrM'6pAY3dL1'u["RZ^k8u_Rb
-!<2u*!8.5L!UA,1rrVDlh>[E[p9f'B[HRYjo_l0"li7"TrNuaps8VQd[/f[irrgP<8fYPCrrTHY
-k5>5\X,-!:rrUWVo7?q8s*t~>
-"QVjNs4.%T"O[8Lb4G6)!6+rF!7:`F!5e`C!7LiG!r97Jrr3![ir6=cfDbdR]=#&og>`,3"nB".
-h#DQp8cls2rVa,+iW&qlrVluIm/Qn\[0>C3mf3"#qu6ZgrNuXkrVlrWI)#[\!:Tlo"7Z?jm/=<m
-o(DiO!rDr[rNub%s8V3Z[06@+ldFMd[/g.'rrUNSpAP!le`Zl1!8IL\!4i+/!SQQ3rrM$6rr3;u
-a8c1h[C*O9ao25@^pV)XrrKi?li.$p[E\^N!6+rF!7:K?!Qk!5rrM'6pAY3dL1'u["RZ^k8u_Rb
-!<2u*!8.5L!UA,1rrVDlh>[E[p9f'B[HRYjo_l0"li7"TrNuaps8VQd[/f[irrgP<8fYPCrrTHY
-k5>5\X,-!:rrUWVo7?q8s*t~>
-!ouXLd/O,-ip?[Fh##J!nC@O>kO7p?!;u]@!<0,#!7o'f!PDh=rrDurd/`FerrK$?h>[KGrm:`;
-rVloalMLS^lKj*%QiDR~>
-!ouXLd/O,-ip?[Fh##J!nC@O>kO7p?!;u]@!<0,#!7o'f!PDh=rrDurd/`FerrK$?h>[KGrm:`;
-rVloalMLS^lKj*%QiDR~>
-!ouXLd/O,-ip?[Fh##J!nC@O>kO7p?!;u]@!<0,#!7o'f!PDh=rrDurd/`FerrK$?h>[KGrm:`;
-rVloalMLS^lKj*%QiDR~>
-!ouXLd/O,5jFR>grrV%Uo[NmAWdB<sJcF[.J,~>
-!ouXLd/O,5jFR>grrV%Uo[NmAWdB<sJcF[.J,~>
-!ouXLd/O,5jFR>grrV%Uo[NmAWdB<sJcF[.J,~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-#in9Rs8UK[]uSt/!65#O!82r'JcC<$JcE(VJ,~>
-#in9Rs8UK[]uSt/!65#O!82r'JcC<$JcE(VJ,~>
-#in9Rs8UK[]uSt/!65#O!82r'JcC<$JcE(VJ,~>
-$04BSs2f=g?>-n,rrKZDra#VPe:IXNs+13$s0VfV~>
-$04BSs2f=g?>-n,rrKZDra#VPe:IXNs+13$s0VfV~>
-$04BSs2f=g?>-n,rrKZDra#VPe:IXNs+13$s0VfV~>
-$04BSs)#"?s4Kcsrs#$Hqu?]9_L_`<s+13$s0VfV~>
-$04BSs)#"?s4Kcsrs#$Hqu?]9_L_`<s+13$s0VfV~>
-$04BSs)#"?s4Kcsrs#$Hqu?]9_L_`<s+13$s0VfV~>
-%HKfWs)#"?s4Kd>s.n3ErrLQFrr3"HrVca&Rc"$ks2_GEs+C;b!2TVo"=7VnBrV+3!."QX!3UnQ
-JcC<$JcE@^J,~>
-%HKfWs)#"?s4Kd>s.n3ErrLQFrr3"HrVca&Rc"$ks2_GEs+C;b!2TVo"=7VnBrV+3!."QX!3UnQ
-JcC<$JcE@^J,~>
-%HKfWs)#"?s4Kd>s.n3ErrLQFrr3"HrVca&Rc"$ks2_GEs+C;b!2TVo"=7VnBrV+3!."QX!3UnQ
-JcC<$JcE@^J,~>
-%HKfWs(sVe9L2&Gs(&Y=rrKK@rr3!Bqu-O$;p"k[s.ao?JY<"K"H'/XH_gYI"Ga/[Ff55F!J@_0
-s+13$s+13_s*t~>
-%HKfWs(sVe9L2&Gs(&Y=rrKK@rr3!Bqu-O$;p"k[s.ao?JY<"K"H'/XH_gYI"Ga/[Ff55F!J@_0
-s+13$s+13_s*t~>
-%HKfWs(sVe9L2&Gs(&Y=rrKK@rr3!Bqu-O$;p"k[s.ao?JY<"K"H'/XH_gYI"Ga/[Ff55F!J@_0
-s+13$s+13_s*t~>
-'')>\s)!eBc`fe:s5I;>s4Ui>rr3!Bqu-O$;p"k[s.ao?9@Eh>"IarB6JDG="Hn]C3o^/=!U8m#
-s+13$s+13_s*t~>
-'')>\s)!eBc`fe:s5I;>s4Ui>rr3!Bqu-O$;p"k[s.ao?9@Eh>"IarB6JDG="Hn]C3o^/=!U8m#
-s+13$s+13_s*t~>
-'')>\s)!eBc`fe:s5I;>s4Ui>rr3!Bqu-O$;p"k[s.ao?9@Eh>"IarB6JDG="Hn]C3o^/=!U8m#
-s+13$s+13_s*t~>
-$04BSs)#"?s4Kd=rrc$Brle7<rrF;?rVm1&and4]UO)r5df07LRY(Q+gA_*WP)KA)1)q9LJcC<$
-JcC<$])R9~>
-$04BSs)#"?s4Kd=rrc$Brle7<rrF;?rVm1&and4]UO)r5df07LRY(Q+gA_*WP)KA)1)q9LJcC<$
-JcC<$])R9~>
-$04BSs)#"?s4Kd=rrc$Brle7<rrF;?rVm1&and4]UO)r5df07LRY(Q+gA_*WP)KA)1)q9LJcC<$
-JcC<$])R9~>
-$04BSs)#"?s4Kd<rrO\00)Y_[+oD#ss8Q$>qBGs7HN-Xdrr3+iK)\0krr3+aMuPitrr3#fn:CUj
-s+13$s1JA^~>
-$04BSs)#"?s4Kd<rrO\00)Y_[+oD#ss8Q$>qBGs7HN-Xdrr3+iK)\0krr3+aMuPitrr3#fn:CUj
-s+13$s1JA^~>
-$04BSs)#"?s4Kd<rrO\00)Y_[+oD#ss8Q$>qBGs7HN-Xdrr3+iK)\0krr3+aMuPitrr3#fn:CUj
-s+13$s1JA^~>
-$04BSs,i\`^T;JSrrQQ4@f66:=hUV\s8RPD]G\JHS,[`4rkASqU&T,7rkASmW;gY<rkAJeY(?V(
-s+13$s1JA^~>
-$04BSs,i\`^T;JSrrQQ4@f66:=hUV\s8RPD]G\JHS,[`4rkASqU&T,7rkASmW;gY<rkAJeY(?V(
-s+13$s1JA^~>
-$04BSs,i\`^T;JSrrQQ4@f66:=hUV\s8RPD]G\JHS,[`4rkASqU&T,7rkASmW;gY<rkAJeY(?V(
-s+13$s1JA^~>
-#in9Rs8S-b>]flC!,q`6!FC9SrrddS$s].urr@?D>QC;nrr@0?>QCMtrr?s9>QC[Qs+13$s+13^
-s*t~>
-#in9Rs8S-b>]flC!,q`6!FC9SrrddS$s].urr@?D>QC;nrr@0?>QCMtrr?s9>QC[Qs+13$s+13^
-s*t~>
-#in9Rs8S-b>]flC!,q`6!FC9SrrddS$s].urr@?D>QC;nrr@0?>QCMtrr?s9>QC[Qs+13$s+13^
-s*t~>
-!ouXLk5PJY,(]cFs+13$s.TIC~>
-!ouXLk5PJY,(]cFs+13$s.TIC~>
-!ouXLk5PJY,(]cFs+13$s.TIC~>
-!ouXLk5PJY,(]cFs+13$s.TIC~>
-!ouXLk5PJY,(]cFs+13$s.TIC~>
-!ouXLk5PJY,(]cFs+13$s.TIC~>
-!ouXLk5PJ]\q0m4s+13$s.TIC~>
-!ouXLk5PJ]\q0m4s+13$s.TIC~>
-!ouXLk5PJ]\q0m4s+13$s.TIC~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLq#:A8^4H<8s+13$s,[21~>
-!ouXLq#:A8^4H<8s+13$s,[21~>
-!ouXLq#:A8^4H<8s+13$s,[21~>
-!ouXLq#:A*\:O[2s+13$s,[21~>
-!ouXLq#:A*\:O[2s+13$s,[21~>
-!ouXLq#:A*\:O[2s+13$s,[21~>
-"lqsOs8UXK_?A<es(&Y=rrMNAJcC<$JcC<$PlH7~>
-"lqsOs8UXK_?A<es(&Y=rrMNAJcC<$JcC<$PlH7~>
-"lqsOs8UXK_?A<es(&Y=rrMNAJcC<$JcC<$PlH7~>
-"lqsOs3,K^=UArcs(&Y>q504DJcC<$JcC<$PlH7~>
-"lqsOs3,K^=UArcs(&Y>q504DJcC<$JcC<$PlH7~>
-"lqsOs3,K^=UArcs(&Y>q504DJcC<$JcC<$PlH7~>
-"lqsOs)#">rs68Fs(&X1Lio;?s+13$s+136s*t~>
-"lqsOs)#">rs68Fs(&X1Lio;?s+13$s+136s*t~>
-"lqsOs)#">rs68Fs(&X1Lio;?s+13$s+136s*t~>
-"lqsOs)#">rs$,Ds("oaR=YBhs+13$s,m>3~>
-"lqsOs)#">rs$,Ds("oaR=YBhs+13$s,m>3~>
-"lqsOs)#">rs$,Ds("oaR=YBhs+13$s,m>3~>
-"lqsOs)#">rs$,Ds($Od?%N$,s+13$s,m>3~>
-"lqsOs)#">rs$,Ds($Od?%N$,s+13$s,m>3~>
-"lqsOs)#">rs$,Ds($Od?%N$,s+13$s,m>3~>
-"lqsOs)#">rs68Fs(&Xf^c$1`s+13$s+136s*t~>
-"lqsOs)#">rs68Fs(&Xf^c$1`s+13$s+136s*t~>
-"lqsOs)#">rs68Fs(&Xf^c$1`s+13$s+136s*t~>
-"lqsOs6s7l*!oL2s(8hArT1&)JcC<$JcC<$PlH7~>
-"lqsOs6s7l*!oL2s(8hArT1&)JcC<$JcC<$PlH7~>
-"lqsOs6s7l*!oL2s(8hArT1&)JcC<$JcC<$PlH7~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-!ouXLJcC<$JcC<$K`?Q~>
-"QVjNs/l3<"K)5!R-9,$JcC<$JcCi3J,~>
-"QVjNs/l3<"K)5!R-9,$JcC<$JcCi3J,~>
-"QVjNs/l3<"K)5!R-9,$JcC<$JcCi3J,~>
-"QVjNs3LYE#(Bt[s2&7>JcC<$JcC<$OoKq~>
-"QVjNs3LYE#(Bt[s2&7>JcC<$JcC<$OoKq~>
-"QVjNs3LYE#(Bt[s2&7>JcC<$JcC<$OoKq~>
-!ouXLr;QiX?JPP[!ROMks+13$s+134s*t~>
-!ouXLr;QiX?JPP[!ROMks+13$s+134s*t~>
-!ouXLr;QiX?JPP[!ROMks+13$s+134s*t~>
-!ouXLrVlrn3U6PB!S9bks+13$s+135s*t~>
-!ouXLrVlrn3U6PB!S9bks+13$s+135s*t~>
-!ouXLrVlrn3U6PB!S9bks+13$s+135s*t~>
-%%EndData
-showpage
-%%Trailer
-end
-%%EOF
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index cf0d581352..61f49f5940 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -217,7 +217,7 @@
           <tag><c>{uncompress, <anno>What</anno>}</c></tag>
           <item>
             <p>Controls what types of files will be uncompressed. It is by
-            default set to <c>[".Z",".zip",".zoo",".arc",".lzh",".arj"]</c>.
+            default set to <c>[".Z", ".zip", ".zoo", ".arc", ".lzh", ".arj"]</c>.
 	    The following values of <c>What</c> are allowed:</p>
 	      <taglist>
 	            <tag><c>all</c></tag>
@@ -355,7 +355,7 @@
 {ok,{"dummy.zip",
      &lt;&lt;80,75,3,4,20,0,0,0,0,0,74,152,97,60,171,39,212,26,3,0,
        0,0,3,0,0,...&gt;&gt;}}
-&gt; <input>catch zip:foldl(fun("foo", _, B, _) -> throw(B()); (_, _, _, Acc) -> Acc end, [], {Name, Bin}). </input>
+&gt; <input>catch zip:foldl(fun("foo", _, B, _) -> throw(B()); (_,_,_,Acc) -> Acc end, [], {Name, Bin}). </input>
 &lt;&lt;"FOO"&gt;&gt;
 </pre>
       </desc>
diff --git a/lib/stdlib/examples/erl_id_trans.erl b/lib/stdlib/examples/erl_id_trans.erl
index 34c6ecc394..51def8c8e1 100644
--- a/lib/stdlib/examples/erl_id_trans.erl
+++ b/lib/stdlib/examples/erl_id_trans.erl
@@ -153,7 +153,6 @@ pattern({record,Line,Name,Pfs0}) ->
 pattern({record_index,Line,Name,Field0}) ->
     Field1 = pattern(Field0),
     {record_index,Line,Name,Field1};
-%% record_field occurs in query expressions
 pattern({record_field,Line,Rec0,Name,Field0}) ->
     Rec1 = expr(Rec0),
     Field1 = expr(Field0),
@@ -431,10 +430,6 @@ expr({'catch',Line,E0}) ->
     %% No new variables added.
     E1 = expr(E0),
     {'catch',Line,E1};
-expr({'query', Line, E0}) ->
-    %% lc expression
-    E = expr(E0),
-    {'query', Line, E};
 expr({match,Line,P0,E0}) ->
     E1 = expr(E0),
     P1 = pattern(P0),
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index 14304824d3..2bab46b72a 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -171,27 +171,29 @@ primary_bootstrap_compiler: \
   $(BOOTSTRAP_COMPILER)/ebin/erl_scan.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_lint.beam \
+  $(BOOTSTRAP_COMPILER)/ebin/io.beam \
   $(BOOTSTRAP_COMPILER)/ebin/otp_internal.beam
 
 $(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam: erl_parse.yrl
-	$(ERLC) -o $(BOOTSTRAP_COMPILER)/egen erl_parse.yrl
-	$(ERLC) -o $(BOOTSTRAP_COMPILER)/ebin $(BOOTSTRAP_COMPILER)/egen/erl_parse.erl
+	$(gen_verbose)
+	$(V_at)$(ERLC) -o $(BOOTSTRAP_COMPILER)/egen erl_parse.yrl
+	$(V_at)$(ERLC) -o $(BOOTSTRAP_COMPILER)/ebin $(BOOTSTRAP_COMPILER)/egen/erl_parse.erl
 
 $(BOOTSTRAP_TOP)/lib/stdlib/egen/erl_parse.erl: erl_parse.yrl
-	$(ERLC) $(YRL_FLAGS) -o$(BOOTSTRAP_TOP)/lib/stdlib/egen erl_parse.yrl
+	$(yecc_verbose)$(ERLC) $(YRL_FLAGS) -o$(BOOTSTRAP_TOP)/lib/stdlib/egen erl_parse.yrl
 
 $(BOOTSTRAP_COMPILER)/ebin/%.beam: %.erl
-	$(ERLC) -o $(BOOTSTRAP_COMPILER)/ebin $<
+	$(V_ERLC) -o $(BOOTSTRAP_COMPILER)/ebin $<
 
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/stdlib/src/base64.erl b/lib/stdlib/src/base64.erl
index 5d800e87b8..0068d82d43 100644
--- a/lib/stdlib/src/base64.erl
+++ b/lib/stdlib/src/base64.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %% 
 %% The 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 @@
 %% of (some) functions of this module.
 %%-------------------------------------------------------------------------
 
--type ascii_string() :: [1..255].
+-type ascii_string() :: [1..127].
 
 %%-------------------------------------------------------------------------
 %% encode_to_string(ASCII) -> Base64String
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index a920921a5e..4c1c0f904b 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -116,7 +116,7 @@ machine_load(Mod, File, Opts) ->
     File2 = filename:join(Dir, filename:basename(File, ".erl")),
     case compile:output_generated(Opts) of
 	true ->
-	    Base = packages:last(Mod),
+	    Base = atom_to_list(Mod),
 	    case filename:basename(File, ".erl") of
 		Base ->
 		    code:purge(Mod),
diff --git a/lib/stdlib/src/dict.erl b/lib/stdlib/src/dict.erl
index 2e9eba4bfa..4f8d45dc8d 100644
--- a/lib/stdlib/src/dict.erl
+++ b/lib/stdlib/src/dict.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %% 
 %% The 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 +18,7 @@
 %% %CopyrightEnd%
 %%
 
-%% We use the dynamic hashing techniques by Per-�ke Larsson as
+%% We use the dynamic hashing techniques by Per-Åke Larsson as
 %% described in "The Design and Implementation of Dynamic Hashing for
 %% Sets and Tables in Icon" by Griswold and Townsend.  Much of the
 %% terminology comes from that paper as well.
diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl
index 026bd9038f..3192879f09 100644
--- a/lib/stdlib/src/edlin.erl
+++ b/lib/stdlib/src/edlin.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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,10 +22,10 @@
 %% A simple Emacs-like line editor.
 %% About Latin-1 characters: see the beginning of erl_scan.erl.
 
--export([init/0,start/1,edit_line/2,prefix_arg/1]).
+-export([init/0,start/1,start/2,edit_line/2,prefix_arg/1]).
 -export([erase_line/1,erase_inp/1,redraw_line/1]).
 -export([length_before/1,length_after/1,prompt/1]).
--export([current_line/1]).
+-export([current_line/1, current_chars/1]).
 %%-export([expand/1]).
 
 -export([edit_line1/2]).
@@ -53,7 +54,12 @@ init() ->
 %%	{undefined,Char,Rest,Cont,Requests}
 
 start(Pbs) ->
-    {more_chars,{line,Pbs,{[],[]},none},[{put_chars,unicode,Pbs}]}.
+    start(Pbs, none).
+
+%% Only two modes used: 'none' and 'search'. Other modes can be
+%% handled inline through specific character handling.
+start(Pbs, Mode) ->
+    {more_chars,{line,Pbs,{[],[]},Mode},[{put_chars,unicode,Pbs}]}.
 
 edit_line(Cs, {line,P,L,{blink,N}}) ->
     edit(Cs, P, L, none, [{move_rel,N}]);
@@ -75,6 +81,10 @@ edit([C|Cs], P, {Bef,Aft}, Prefix, Rs0) ->
 	    edit(Cs, P, {Bef,Aft}, meta, Rs0);
 	meta_left_sq_bracket ->
 	    edit(Cs, P, {Bef,Aft}, meta_left_sq_bracket, Rs0);
+	search_meta ->
+	    edit(Cs, P, {Bef,Aft}, search_meta, Rs0);
+	search_meta_left_sq_bracket ->
+	    edit(Cs, P, {Bef,Aft}, search_meta_left_sq_bracket, Rs0);
 	ctlx ->
 	    edit(Cs, P, {Bef,Aft}, ctlx, Rs0);
 	new_line ->
@@ -114,6 +124,8 @@ edit([C|Cs], P, {Bef,Aft}, Prefix, Rs0) ->
 	    case do_op(Op, Bef, Aft, Rs0) of
 		{blink,N,Line,Rs} ->
 		    edit(Cs, P, Line, {blink,N}, Rs);
+		{Line, Rs, Mode} -> % allow custom modes from do_op
+		    edit(Cs, P, Line, Mode, Rs);
 		{Line,Rs} ->
 		    edit(Cs, P, Line, none, Rs)
 	    end
@@ -167,9 +179,15 @@ key_map($\^], none) -> auto_blink;
 key_map($\^X, none) -> ctlx;
 key_map($\^Y, none) -> yank;
 key_map($\e, none) -> meta;
-key_map($), Prefix) when Prefix =/= meta -> {blink,$),$(};
-key_map($}, Prefix) when Prefix =/= meta -> {blink,$},${};
-key_map($], Prefix) when Prefix =/= meta -> {blink,$],$[};
+key_map($), Prefix) when Prefix =/= meta,
+                         Prefix =/= search,
+                         Prefix =/= search_meta -> {blink,$),$(};
+key_map($}, Prefix) when Prefix =/= meta,
+                         Prefix =/= search,
+                         Prefix =/= search_meta -> {blink,$},${};
+key_map($], Prefix) when Prefix =/= meta,
+                         Prefix =/= search,
+                         Prefix =/= search_meta -> {blink,$],$[};
 key_map($B, meta) -> backward_word;
 key_map($D, meta) -> kill_word;
 key_map($F, meta) -> forward_word;
@@ -187,6 +205,32 @@ key_map($D, meta_left_sq_bracket) -> backward_char;
 key_map($C, meta_left_sq_bracket) -> forward_char;
 key_map(C, none) when C >= $\s ->
     {insert,C};
+%% for search, we need smarter line handling and so
+%% we cheat a bit on the dispatching, and allow to
+%% return a mode.
+key_map($\^H, search) -> {search, backward_delete_char};
+key_map($\177, search) -> {search, backward_delete_char};
+key_map($\^R, search) -> {search, skip_up};
+key_map($\^S, search) -> {search, skip_down};
+key_map($\n, search) -> {search, search_found};
+key_map($\r, search) -> {search, search_found};
+key_map($\^A, search) -> {search, search_quit};
+key_map($\^B, search) -> {search, search_quit};
+key_map($\^D, search) -> {search, search_quit};
+key_map($\^E, search) -> {search, search_quit};
+key_map($\^F, search) -> {search, search_quit};
+key_map($\t,  search) -> {search, search_quit};
+key_map($\^L, search) -> {search, search_quit};
+key_map($\^T, search) -> {search, search_quit};
+key_map($\^U, search) -> {search, search_quit};
+key_map($\^], search) -> {search, search_quit};
+key_map($\^X, search) -> {search, search_quit};
+key_map($\^Y, search) -> {search, search_quit};
+key_map($\e,  search) -> search_meta;
+key_map($[,  search_meta) -> search_meta_left_sq_bracket;
+key_map(_, search_meta) -> {search, search_quit};
+key_map(_C, search_meta_left_sq_bracket) -> {search, search_quit};
+key_map(C, search) -> {insert_search,C};
 key_map(C, _) -> {undefined,C}.
 
 %% do_op(Action, Before, After, Requests)
@@ -195,6 +239,57 @@ do_op({insert,C}, Bef, [], Rs) ->
     {{[C|Bef],[]},[{put_chars, unicode,[C]}|Rs]};
 do_op({insert,C}, Bef, Aft, Rs) ->
     {{[C|Bef],Aft},[{insert_chars, unicode, [C]}|Rs]};
+%% Search mode prompt always looks like (search)`$TERMS': $RESULT.
+%% the {insert_search, _} handlings allow to share this implementation
+%% correctly with group.erl. This module provides $TERMS, and group.erl
+%% is in charge of providing $RESULT.
+%% This require a bit of trickery. Because search disables moving around
+%% on the line (left/right arrow keys and other shortcuts that just exit
+%% search mode), we can use the Bef and Aft variables to hold each
+%% part of the line. Bef takes charge of "(search)`$TERMS" and Aft
+%% takes charge of "': $RESULT".
+do_op({insert_search, C}, Bef, [], Rs) ->
+    Aft="': ",
+    {{[C|Bef],Aft},
+     [{insert_chars, unicode, [C]++Aft}, {delete_chars,-3} | Rs],
+     search};
+do_op({insert_search, C}, Bef, Aft, Rs) ->
+    Offset= length(Aft),
+    NAft = "': ",
+    {{[C|Bef],NAft},
+     [{insert_chars, unicode, [C]++NAft}, {delete_chars,-Offset} | Rs],
+     search};
+do_op({search, backward_delete_char}, [_|Bef], Aft, Rs) ->
+    Offset= length(Aft)+1,
+    NAft = "': ",
+    {{Bef,NAft},
+     [{insert_chars, unicode, NAft}, {delete_chars,-Offset}|Rs],
+     search};
+do_op({search, backward_delete_char}, [], _Aft, Rs) ->
+    Aft="': ",
+    {{[],Aft}, Rs, search};
+do_op({search, skip_up}, Bef, Aft, Rs) ->
+    Offset= length(Aft),
+    NAft = "': ",
+    {{[$\^R|Bef],NAft}, % we insert ^R as a flag to whoever called us
+     [{insert_chars, unicode, NAft}, {delete_chars,-Offset}|Rs],
+     search};
+do_op({search, skip_down}, Bef, Aft, Rs) ->
+    Offset= length(Aft),
+    NAft = "': ",
+    {{[$\^S|Bef],NAft}, % we insert ^S as a flag to whoever called us
+     [{insert_chars, unicode, NAft}, {delete_chars,-Offset}|Rs],
+     search};
+do_op({search, search_found}, _Bef, Aft, Rs) ->
+    "': "++NAft = Aft,
+    {{[],NAft},
+     [{put_chars, unicode, "\n"}, {move_rel,-length(Aft)} | Rs],
+     search_found};
+do_op({search, search_quit}, _Bef, Aft, Rs) ->
+    "': "++NAft = Aft,
+    {{[],NAft},
+     [{put_chars, unicode, "\n"}, {move_rel,-length(Aft)} | Rs],
+     search_quit};
 %% do blink after $$
 do_op({blink,C,M}, Bef=[$$,$$|_], Aft, Rs) ->
     N = over_paren(Bef, C, M),
@@ -317,9 +412,9 @@ over_non_word([], Stack, N) ->
     {[],Stack,N}.
 
 word_char(C) when C >= $A, C =< $Z -> true;
-word_char(C) when C >= $�, C =< $�, C =/= $� -> true;
+word_char(C) when C >= $À, C =< $Þ, C =/= $× -> true;
 word_char(C) when C >= $a, C =< $z -> true;
-word_char(C) when C >= $�, C =< $�, C =/= $� -> true;
+word_char(C) when C >= $ß, C =< $ÿ, C =/= $÷ -> true;
 word_char(C) when C >= $0, C =< $9 -> true;
 word_char(C) when C =:= $_ -> true;
 word_char(C) when C =:= $. -> true;    % accept dot-separated names
@@ -452,6 +547,9 @@ prompt({line,Pbs,_,_}) ->
 current_line({line,_,{Bef, Aft},_}) ->
     reverse(Bef, Aft ++ "\n").
 
+current_chars({line,_,{Bef,Aft},_}) ->
+    reverse(Bef, Aft).
+
 %% %% expand(CurrentBefore) ->
 %% %%	{yes,Expansion} | no
 %% %%  Try to expand the word before as either a module name or a function
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 2c8d84a9e1..ebabf8d700 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -23,13 +23,18 @@
 -export([open/2,open/3,open/5,close/1,format_error/1]).
 -export([scan_erl_form/1,parse_erl_form/1,macro_defs/1]).
 -export([parse_file/1, parse_file/3]).
+-export([default_encoding/0, encoding_to_string/1,
+         read_encoding/1, read_encoding/2, set_encoding/1]).
 -export([interpret_file_attribute/1]).
 -export([normalize_typed_record_fields/1,restore_typed_record_fields/1]).
 
 %%------------------------------------------------------------------------
 
+-export_type([source_encoding/0]).
+
 -type macros() :: [{atom(), term()}].
 -type epp_handle() :: pid().
+-type source_encoding() :: latin1 | utf8.
 
 %% Epp state record.
 -record(epp, {file,				%Current file
@@ -213,6 +218,173 @@ parse_file(Epp) ->
 	    [{eof,Location}]
     end.
 
+-define(DEFAULT_ENCODING, latin1).
+
+-spec default_encoding() -> source_encoding().
+
+default_encoding() ->
+    ?DEFAULT_ENCODING.
+
+-spec encoding_to_string(Encoding) -> string() when
+      Encoding :: source_encoding().
+
+encoding_to_string(latin1) -> "coding: latin-1";
+encoding_to_string(utf8) -> "coding: utf-8".
+
+-spec read_encoding(FileName) -> source_encoding() | none when
+      FileName :: file:name().
+
+read_encoding(Name) ->
+    read_encoding(Name, []).
+
+-spec read_encoding(FileName, Options) -> source_encoding() | none when
+      FileName :: file:name(),
+      Options :: [Option],
+      Option :: {in_comment_only, boolean()}.
+
+read_encoding(Name, Options) ->
+    InComment = proplists:get_value(in_comment_only, Options, true),
+    case file:open(Name, [read]) of
+        {ok,File} ->
+            try read_encoding_from_file(File, InComment)
+            after ok = file:close(File)
+            end;
+        _Error ->
+            none
+    end.
+
+-spec set_encoding(File) -> source_encoding() | none when
+      File :: io:device(). % pid(); raw files don't work
+
+set_encoding(File) ->
+    Encoding = read_encoding_from_file(File, true),
+    Enc = case Encoding of
+              none -> default_encoding();
+              Encoding -> Encoding
+          end,
+    ok = io:setopts(File, [{encoding, Enc}]),
+    Encoding.
+
+-spec read_encoding_from_file(File, InComment) -> source_encoding() | none when
+      File :: io:device(),
+      InComment :: boolean().
+
+-define(ENC_CHUNK, 32).
+-define(N_ENC_CHUNK, 16). % a total of 512 bytes
+
+read_encoding_from_file(File, InComment) ->
+    {ok, Pos0} = file:position(File, cur),
+    Opts = io:getopts(File),
+    Encoding0 = lists:keyfind(encoding, 1, Opts),
+    Binary0 = lists:keyfind(binary, 1, Opts),
+    ok = io:setopts(File, [binary, {encoding, latin1}]),
+    try
+        {B, Fun} = (reader(File, 0))(),
+        com_nl(B, Fun, 0, InComment)
+    catch
+        throw:no ->
+            none
+    after
+        {ok, Pos0} = file:position(File, Pos0),
+        ok = io:setopts(File, [Binary0, Encoding0])
+    end.
+
+reader(Fd, N) ->
+    fun() when N =:= ?N_ENC_CHUNK ->
+            throw(no);
+       () ->
+            case file:read(Fd, ?ENC_CHUNK) of
+                eof ->
+                    {<<>>, reader(Fd, N+1)};
+                {ok, Bin} ->
+                    {Bin, reader(Fd, N+1)};
+                {error, _} ->
+                    throw(no) % ignore errors
+            end
+    end.
+
+com_nl(_, _, 2, _) ->
+    throw(no);
+com_nl(B, Fun, N, false=Com) ->
+    com_c(B, Fun, N, Com);
+com_nl(B, Fun, N, true=Com) ->
+    com(B, Fun, N, Com).
+
+com(<<"\n",B/binary>>, Fun, N, Com) ->
+    com_nl(B, Fun, N+1, Com);
+com(<<"%", B/binary>>, Fun, N, Com) ->
+    com_c(B, Fun, N, Com);
+com(<<_:1/unit:8,B/binary>>, Fun, N, Com) ->
+    com(B, Fun, N, Com);
+com(<<>>, Fun, N, Com) ->
+    {B, Fun1} = Fun(),
+    com(B, Fun1, N, Com).
+
+com_c(<<"c",B/binary>>, Fun, N, Com) ->
+    com_oding(B, Fun, N, Com);
+com_c(<<"\n",B/binary>>, Fun, N, Com) ->
+    com_nl(B, Fun, N+1, Com);
+com_c(<<_:1/unit:8,B/binary>>, Fun, N, Com) ->
+    com_c(B, Fun, N, Com);
+com_c(<<>>, Fun, N, Com) ->
+    {B, Fun1} = Fun(),
+    com_c(B, Fun1, N, Com).
+
+com_oding(<<"oding",B/binary>>, Fun, N, Com) ->
+    com_sep(B, Fun, N, Com);
+com_oding(B, Fun, N, Com) when byte_size(B) >= length("oding") ->
+    com_c(B, Fun, N, Com);
+com_oding(B, Fun, N, Com) ->
+    {B1, Fun1} = Fun(),
+    com_oding(list_to_binary([B, B1]), Fun1, N, Com).
+
+com_sep(<<":",B/binary>>, Fun, N, Com) ->
+    com_space(B, Fun, N, Com);
+com_sep(<<"=",B/binary>>, Fun, N, Com) ->
+    com_space(B, Fun, N, Com);
+com_sep(<<"\s",B/binary>>, Fun, N, Com) ->
+    com_sep(B, Fun, N, Com);
+com_sep(<<>>, Fun, N, Com) ->
+    {B, Fun1} = Fun(),
+    com_sep(B, Fun1, N, Com);
+com_sep(B, Fun, N, Com) ->
+    com_c(B, Fun, N, Com).
+
+com_space(<<"\s",B/binary>>, Fun, N, Com) ->
+    com_space(B, Fun, N, Com);
+com_space(<<>>, Fun, N, Com) ->
+    {B, Fun1} = Fun(),
+    com_space(B, Fun1, N, Com);
+com_space(B, Fun, N, _Com) ->
+    com_enc(B, Fun, N, [], []).
+
+com_enc(<<C:1/unit:8,B/binary>>, Fun, N, L, Ps) when C >= $a, C =< $z;
+                                                     C >= $A, C =< $Z;
+                                                     C >= $0, C =< $9 ->
+    com_enc(B, Fun, N, [C | L], Ps);
+com_enc(<<>>, Fun, N, L, Ps) ->
+    case Fun() of
+        {<<>>, _} ->
+            com_enc_end([L | Ps]);
+        {B, Fun1} ->
+            com_enc(B, Fun1, N, L, Ps)
+    end;
+com_enc(<<"-",B/binary>>, Fun, N, L, Ps) ->
+    com_enc(B, Fun, N, [], [L | Ps]);
+com_enc(_B, _Fun, _N, L, Ps) ->
+    com_enc_end([L | Ps]).
+
+com_enc_end(Ps0) ->
+    Ps = lists:reverse([lists:reverse(string:to_lower(P)) || P <- Ps0]),
+    com_encoding(Ps).
+
+com_encoding(["latin","1"|_]) ->
+    latin1;
+com_encoding(["utf","8"|_]) ->
+    utf8;
+com_encoding(_) ->
+    throw(no). % Don't try any further
+
 normalize_typed_record_fields([]) ->
     {typed, []};
 normalize_typed_record_fields(Fields) ->
@@ -266,14 +438,17 @@ init_server(Pid, Name, File, AtLocation, Path, Pdm, Pre) ->
     Ms0 = predef_macros(Name),
     case user_predef(Pdm, Ms0) of
 	{ok,Ms1} ->
-	    epp_reply(Pid, {ok,self()}),
-            %% ensure directory of current source file is first in path
+            _ = set_encoding(File),
+            epp_reply(Pid, {ok,self()}),
+            %% ensure directory of current source file is
+            %% first in path
             Path1 = [filename:dirname(Name) | Path],
-	    St = #epp{file=File, location=AtLocation, delta=0, name=Name,
-                      name2=Name, path=Path1, macs=Ms1, pre_opened = Pre},
-	    From = wait_request(St),
-	    enter_file_reply(From, Name, AtLocation, AtLocation),
-	    wait_req_scan(St);
+            St = #epp{file=File, location=AtLocation, delta=0,
+                      name=Name, name2=Name, path=Path1, macs=Ms1,
+                      pre_opened = Pre},
+            From = wait_request(St),
+            enter_file_reply(From, Name, AtLocation, AtLocation),
+            wait_req_scan(St);
 	{error,E} ->
 	    epp_reply(Pid, {error,E})
     end.
@@ -385,19 +560,20 @@ enter_file(NewName, Inc, From, St) ->
 %% enter_file2(File, FullName, From, EppState, AtLocation) -> EppState.
 %%  Set epp to use this file and "enter" it.
 
-enter_file2(NewF, Pname, From, St, AtLocation) ->
+enter_file2(NewF, Pname, From, St0, AtLocation) ->
     Loc = start_loc(AtLocation),
     enter_file_reply(From, Pname, Loc, AtLocation),
-    Ms = dict:store({atom,'FILE'}, {none,[{string,Loc,Pname}]}, St#epp.macs),
+    Ms = dict:store({atom,'FILE'}, {none,[{string,Loc,Pname}]}, St0#epp.macs),
     %% update the head of the include path to be the directory of the new
     %% source file, so that an included file can always include other files
     %% relative to its current location (this is also how C does it); note
     %% that the directory of the parent source file (the previous head of
     %% the path) must be dropped, otherwise the path used within the current
     %% file will depend on the order of file inclusions in the parent files
-    Path = [filename:dirname(Pname) | tl(St#epp.path)],
+    Path = [filename:dirname(Pname) | tl(St0#epp.path)],
+    _ = set_encoding(NewF),
     #epp{file=NewF,location=Loc,name=Pname,delta=0,
-         sstk=[St|St#epp.sstk],path=Path,macs=Ms}.
+         sstk=[St0|St0#epp.sstk],path=Path,macs=Ms}.
 
 enter_file_reply(From, Name, Location, AtLocation) ->
     Attr = loc_attr(AtLocation),
@@ -456,7 +632,7 @@ leave_file(From, St) ->
 %% scan_toks(Tokens, From, EppState)
 
 scan_toks(From, St) ->
-    case io:scan_erl_form(St#epp.file, '', St#epp.location) of
+    case io:scan_erl_form(St#epp.file, '', St#epp.location, [unicode]) of
 	{ok,Toks,Cl} ->
 	    scan_toks(Toks, From, St#epp{location=Cl});
 	{error,E,Cl} ->
@@ -830,7 +1006,7 @@ new_location(Ln, {Le,_}, {Lf,_}) ->
 %%  nested conditionals and repeated 'else's.
 
 skip_toks(From, St, [I|Sis]) ->
-    case io:scan_erl_form(St#epp.file, '', St#epp.location) of
+    case io:scan_erl_form(St#epp.file, '', St#epp.location, [unicode]) of
 	{ok,[{'-',_Lh},{atom,_Li,ifdef}|_Toks],Cl} ->
 	    skip_toks(From, St#epp{location=Cl}, [ifdef,I|Sis]);
 	{ok,[{'-',_Lh},{atom,_Li,ifndef}|_Toks],Cl} ->
@@ -1048,8 +1224,6 @@ macro_arg([{'try',Lr}|Toks], E, Arg) ->
     macro_arg(Toks, ['end'|E], [{'try',Lr}|Arg]);
 macro_arg([{'cond',Lr}|Toks], E, Arg) ->
     macro_arg(Toks, ['end'|E], [{'cond',Lr}|Arg]);
-macro_arg([{'query',Lr}|Toks], E, Arg) ->
-    macro_arg(Toks, ['end'|E], [{'query',Lr}|Arg]);
 macro_arg([{Rb,Lrb}|Toks], [Rb|E], Arg) ->	%Found matching close
     macro_arg(Toks, E, [{Rb,Lrb}|Arg]);
 macro_arg([T|Toks], E, Arg) ->
@@ -1094,6 +1268,7 @@ expand_arg([], Ts, L, Rest, Bs) ->
 %%% tokenized would yield the token list Ts.
 
 %% erl_scan:token_info(T, text) is not backward compatible with this.
+%% Note that escaped characters will be replaced by themselves.
 token_src({dot, _}) ->
     ".";
 token_src({X, _}) when is_atom(X) ->
@@ -1101,16 +1276,16 @@ token_src({X, _}) when is_atom(X) ->
 token_src({var, _, X}) ->
     atom_to_list(X);
 token_src({char,_,C}) ->
-    io_lib:write_char(C);
+    io_lib:write_unicode_char(C);
 token_src({string, _, X}) ->
-    lists:flatten(io_lib:format("~p", [X]));
+    io_lib:write_unicode_string(X);
 token_src({_, _, X}) ->
-    lists:flatten(io_lib:format("~w", [X])).
+    io_lib:format("~w", [X]).
 
 stringify1([]) ->
     [];
 stringify1([T | Tokens]) ->
-    [io_lib:format(" ~s", [token_src(T)]) | stringify1(Tokens)].
+    [io_lib:format(" ~ts", [token_src(T)]) | stringify1(Tokens)].
 
 stringify(Ts, L) ->
     [$\s | S] = lists:flatten(stringify1(Ts)),
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index 95ba6b1096..8471ae6b64 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -227,13 +227,6 @@ expr({bc,_,E,Qs}, Bs, Lf, Ef, RBs) ->
 expr({tuple,_,Es}, Bs0, Lf, Ef, RBs) ->
     {Vs,Bs} = expr_list(Es, Bs0, Lf, Ef),
     ret_expr(list_to_tuple(Vs), Bs, RBs);
-expr({record_field,_,_,_}=Mod, Bs, _Lf, _Ef, RBs) ->
-    case expand_module_name(Mod, Bs) of
-	{atom,_,A} ->
-	    ret_expr(A, Bs, RBs);    %% This is the "x.y" syntax
-	_ ->
-	    erlang:raise(error, {badexpr, '.'}, stacktrace())
-    end;
 expr({record_field,_,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
     erlang:raise(error, {undef_record,Name}, stacktrace());
 expr({record_index,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
@@ -332,8 +325,7 @@ expr({call,L1,{remote,L2,{record_field,_,{atom,_,''},{atom,_,qlc}=Mod},
      Bs, Lf, Ef, RBs) when length(As0) =< 1 ->
     expr({call,L1,{remote,L2,Mod,Func},As}, Bs, Lf, Ef, RBs);
 expr({call,_,{remote,_,Mod,Func},As0}, Bs0, Lf, Ef, RBs) ->
-    Mod1 = expand_module_name(Mod, Bs0),
-    {value,M,Bs1} = expr(Mod1, Bs0, Lf, Ef, none),
+    {value,M,Bs1} = expr(Mod, Bs0, Lf, Ef, none),
     {value,F,Bs2} = expr(Func, Bs0, Lf, Ef, none),
     {As,Bs3} = expr_list(As0, merge_bindings(Bs1, Bs2), Lf, Ef),
     %% M could be a parameterized module (not an atom).
@@ -1210,41 +1202,6 @@ ret_expr(_Old, New) ->
 
 line(Expr) -> element(2, Expr).
 
-%% In syntax trees, module/package names are atoms or lists of atoms.
-
-expand_module_name({atom,L,A} = M, Bs) ->
-    case binding({module,A}, Bs) of
-	{value, A1} ->
-	    {atom,L,A1};
-	unbound ->
-	    case packages:is_segmented(A) of
-		true ->
-		    M;
-		false ->
-%%% 		    P = case binding({module,'$package'}, Bs) of
-%%% 			    {value, P1} -> P1;
-%%% 			    unbound -> ""
-%%% 			end,
-%%% 		    A1 = list_to_atom(packages:concat(P, A)),
-%%% 		    {atom,L,list_to_atom(A1)}
-		    {atom,L,A}
-	    end
-    end;
-expand_module_name(M, _) ->
-    case erl_parse:package_segments(M) of
-	error ->
-	    M;
-	M1 ->
-	    L = element(2,M),
-	    Mod = packages:concat(M1),
-	    case packages:is_valid(Mod) of
-		true ->
-		    {atom,L,list_to_atom(Mod)};
-		false ->
-		    erlang:raise(error, {bad_module_name, Mod}, stacktrace())
-	    end
-    end.
-
 %% {?MODULE,expr,3} is still the stacktrace, despite the
 %% fact that expr() now takes two, three or four arguments...
 stacktrace() -> [{?MODULE,expr,3}].
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index 85defacc43..d05f630d8e 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -135,8 +135,6 @@ pattern({tuple,Line,Ps}, St0) ->
 %%pattern({struct,Line,Tag,Ps}, St0) ->
 %%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
 %%    {{struct,Line,Tag,TPs},TPsvs,St1};
-pattern({record_field,_,_,_}=M, St) ->
-    {M,St};  % must be a package name
 pattern({record_index,Line,Name,Field}, St) ->
     {index_expr(Line, Field, Name, record_fields(Name, St)),St};
 pattern({record,Line,Name,Pfs}, St0) ->
@@ -306,8 +304,6 @@ expr({tuple,Line,Es0}, St0) ->
 %%expr({struct,Line,Tag,Es0}, Vs, St0) ->
 %%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
 %%    {{struct,Line,Tag,Es1},Esvs,Esus,St1};
-expr({record_field,_,_,_}=M, St) ->
-    {M,St};  % must be a package name
 expr({record_index,Line,Name,F}, St) ->
     I = index_expr(Line, F, Name, record_fields(Name, St)),
     expr(I, St);
@@ -375,9 +371,6 @@ expr({call,Line,{atom,_La,N}=Atom,As0}, St0) ->
                     end
             end
     end;
-expr({call,Line,{record_field,_,_,_}=M,As0}, St0) ->
-    {As,St1} = expr_list(As0, St0),
-    {{call,Line,M,As},St1};
 expr({call,Line,{remote,Lr,M,F},As0}, St0) ->
     {[M1,F1 | As1],St1} = expr_list([M,F | As0], St0),
     {{call,Line,{remote,Lr,M1,F1},As1},St1};
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 1e5f962375..642d972582 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -94,12 +94,9 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 %% the other function collections contain {Function, Arity}.
 -record(lint, {state=start		:: 'start' | 'attribute' | 'function',
                module=[],                       %Module
-               package="",                      %Module package
-               extends=[],                      %Extends
                behaviour=[],                    %Behaviour
                exports=gb_sets:empty()	:: gb_set(),	%Exports
                imports=[],                      %Imports
-               mod_imports=dict:new()	:: dict(),	%Module Imports
                compile=[],                      %Compile flags
                records=dict:new()	:: dict(),	%Record definitions
                locals=gb_sets:empty()	:: gb_set(),	%All defined functions (prescanned)
@@ -114,7 +111,6 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 	       enabled_warnings=[],		%All enabled warnings (ordset).
                errors=[],                       %Current errors
                warnings=[],                     %Current warnings
-	       global_vt=[],                    %The global VarTable
                file = ""        :: string(),	%From last file attribute
                recdef_top=false :: boolean(),	%true in record initialisation
 						%outside any fun or lc
@@ -144,10 +140,8 @@ format_error({bad_module_name, M}) ->
     io_lib:format("bad module name '~s'", [M]);
 format_error(redefine_module) ->
     "redefining module";
-format_error(redefine_extends) ->
-    "redefining extends attribute";
-format_error(extends_self) ->
-    "cannot extend from self";
+format_error(pmod_unsupported) ->
+    "parameterized modules are no longer supported";
 %% format_error({redefine_mod_import, M, P}) ->
 %%     io_lib:format("module '~s' already imported from package '~s'", [M, P]);
 
@@ -168,10 +162,6 @@ format_error({bad_inline,{F,A}}) ->
     io_lib:format("inlined function ~w/~w undefined", [F,A]);
 format_error({invalid_deprecated,D}) ->
     io_lib:format("badly formed deprecated attribute ~w", [D]);
-format_error(invalid_extends) ->
-    "badly formed extends attribute";
-format_error(define_instance) ->
-    "defining instance function not allowed in abstract module";
 format_error({bad_deprecated,{F,A}}) ->
     io_lib:format("deprecated function ~w/~w undefined or not exported", [F,A]);
 format_error({bad_nowarn_unused_function,{F,A}}) ->
@@ -539,7 +529,6 @@ start(File, Opts) ->
 	    end,
     #lint{state = start,
           exports = gb_sets:from_list([{module_info,0},{module_info,1}]),
-          mod_imports = dict:from_list([{erlang,erlang}]),
           compile = Opts,
           %% Internal pseudo-functions must appear as defined/reached.
           defined = gb_sets:from_list(pseudolocals()),
@@ -625,8 +614,6 @@ forms(Forms0, St0) ->
 
 pre_scan([{function,_L,new,_A,_Cs} | Fs], St) ->
     pre_scan(Fs, St#lint{new=true});
-pre_scan([{attribute,_L,extends,M} | Fs], St) when is_atom(M) ->
-    pre_scan(Fs, St#lint{extends=true});
 pre_scan([{attribute,L,compile,C} | Fs], St) ->
     case is_warn_enabled(export_all, St) andalso
 	member(export_all, lists:flatten([C])) of
@@ -681,51 +668,15 @@ form(Form, #lint{state=State}=St) ->
 
 %% start_state(Form, State) -> State'
 
-start_state({attribute,L,module,{M,Ps}}, St) ->
-    St1 = set_module(M, L, St),
-    Arity = length(Ps),
-    Ps1 = if is_atom(St1#lint.extends) ->
-		  ['BASE', 'THIS' | Ps];
-	     true ->
-		  ['THIS' | Ps]
-	  end,
-    Vt = orddict:from_list([{V, {bound, used, []}} || V <- Ps1]),
-    St2 = add_instance(Arity, St1),
-    St3 = ensure_new(Arity, St2),
-    St3#lint{state=attribute, extends=[], global_vt=Vt};
-start_state({attribute,L,module,M}, St) ->
-    St1 = set_module(M, L, St),
-    St1#lint{state=attribute, extends=[]};
+start_state({attribute,Line,module,{_,_}}=Form, St0) ->
+    St1 = add_error(Line, pmod_unsupported, St0),
+    attribute_state(Form, St1#lint{state=attribute});
+start_state({attribute,_,module,M}, St0) ->
+    St1 = St0#lint{module=M},
+    St1#lint{state=attribute};
 start_state(Form, St) ->
     St1 = add_error(element(2, Form), undefined_module, St),
-    attribute_state(Form, St1#lint{state=attribute, extends=[]}).
-
-set_module(M, L, St) ->
-    M1 = package_to_string(M),
-    case packages:is_valid(M1) of
-	true ->
-	    St#lint{module=list_to_atom(M1),
-		    package=packages:strip_last(M1)};
-	false ->
-	    add_error(L, {bad_module_name, M1}, St)
-    end.
-
-ensure_new(Arity, St) ->
-    case St#lint.new of
-	true ->
-	    St;
-	false ->
-	    add_func(new, Arity, St)
-    end.
-
-add_instance(Arity, St) ->
-    A = Arity + (if is_atom(St#lint.extends) -> 1; true -> 0 end),
-    add_func(instance, A, St).
-
-add_func(Name, Arity, St) ->
-    F = {Name, Arity},
-    St#lint{exports = gb_sets:add_element(F, St#lint.exports),
-	    defined = gb_sets:add_element(F, St#lint.defined)}.
+    attribute_state(Form, St1#lint{state=attribute}).
 
 %% attribute_state(Form, State) ->
 %%      State'
@@ -734,15 +685,6 @@ attribute_state({attribute,_L,module,_M}, #lint{module=[]}=St) ->
     St;
 attribute_state({attribute,L,module,_M}, St) ->
     add_error(L, redefine_module, St);
-attribute_state({attribute,L,extends,M}, #lint{module=M}=St) when is_atom(M) ->
-    add_error(L, extends_self, St);
-attribute_state({attribute,_L,extends,M}, #lint{extends=[]}=St)
-  when is_atom(M) ->
-    St#lint{extends=M};
-attribute_state({attribute,L,extends,M}, St) when is_atom(M) ->
-    add_error(L, redefine_extends, St);
-attribute_state({attribute,L,extends,_M}, St) ->
-    add_error(L, invalid_extends, St);
 attribute_state({attribute,L,export,Es}, St) ->
     export(L, Es, St);
 attribute_state({attribute,L,export_type,Es}, St) ->
@@ -1007,9 +949,9 @@ check_imports(Forms, St0) ->
         true ->
             Usage = St0#lint.usage,
             Unused = ordsets:subtract(St0#lint.imports, Usage#usage.imported),
-            Imports = [{{FA,list_to_atom(package_to_string(Mod))},L}
-                       || {attribute,L,import,{Mod,Fs}} <- Forms,
-                          FA <- lists:usort(Fs)],
+            Imports = [{{FA,Mod},L} ||
+		 {attribute,L,import,{Mod,Fs}} <- Forms,
+		 FA <- lists:usort(Fs)],
             Bad = [{FM,L} || FM <- Unused, {FM2,L} <- Imports, FM =:= FM2],
             func_line_warning(unused_import, Bad, St0)
     end.
@@ -1222,73 +1164,46 @@ export_type(Line, ETs, #lint{usage = Usage, exp_types = ETs0} = St0) ->
 -spec import(line(), import(), lint_state()) -> lint_state().
 
 import(Line, {Mod,Fs}, St) ->
-    Mod1 = package_to_string(Mod),
-    case packages:is_valid(Mod1) of
-        true ->
-            Mfs = ordsets:from_list(Fs),
-            case check_imports(Line, Mfs, St#lint.imports) of
-                [] ->
-                    St#lint{imports=add_imports(list_to_atom(Mod1), Mfs,
-                                                St#lint.imports)};
-                Efs ->
-		    {Err, St1} =
-			foldl(fun ({bif,{F,A},_}, {Err,St0}) ->
-				      %% BifClash - import directive
-				      Warn = is_warn_enabled(bif_clash, St0)
-					  and (not bif_clash_specifically_disabled(St0,{F,A})),
-				      AutoImpSup = is_autoimport_suppressed(St0#lint.no_auto,{F,A}),
-				      OldBif = erl_internal:old_bif(F,A),
-				      {Err,if
-					       Warn and (not AutoImpSup) and OldBif ->
-						   add_error
-						     (Line,
-						      {redefine_old_bif_import, {F,A}},
-						      St0);
-					       Warn and (not AutoImpSup) ->
-						   add_warning
-						     (Line,
-						      {redefine_bif_import, {F,A}},
-						      St0);
-					       true ->
-						   St0
-					   end};
-				  (Ef, {_Err,St0}) ->
-				      {true,add_error(Line,
-						      {redefine_import,Ef},
-						      St0)}
-                          end,
-                          {false,St}, Efs),
-		    if
-			not Err ->
-			    St1#lint{imports=
-				     add_imports(list_to_atom(Mod1), Mfs,
+    Mfs = ordsets:from_list(Fs),
+    case check_imports(Line, Mfs, St#lint.imports) of
+	[] ->
+	    St#lint{imports=add_imports(Mod, Mfs,
+					St#lint.imports)};
+	Efs ->
+	    {Err, St1} =
+		foldl(fun ({bif,{F,A},_}, {Err,St0}) ->
+			      %% BifClash - import directive
+			      Warn = is_warn_enabled(bif_clash, St0) andalso
+				  (not bif_clash_specifically_disabled(St0,{F,A})),
+			      AutoImpSup = is_autoimport_suppressed(St0#lint.no_auto,{F,A}),
+			      OldBif = erl_internal:old_bif(F,A),
+			      {Err,if
+				       Warn and (not AutoImpSup) and OldBif ->
+					   add_error
+					     (Line,
+					      {redefine_old_bif_import, {F,A}},
+					      St0);
+				       Warn and (not AutoImpSup) ->
+					   add_warning
+					     (Line,
+					      {redefine_bif_import, {F,A}},
+					      St0);
+				       true ->
+					   St0
+				   end};
+			  (Ef, {_Err,St0}) ->
+			      {true,add_error(Line,
+					      {redefine_import,Ef},
+					      St0)}
+		      end,
+		      {false,St}, Efs),
+	    if
+		not Err ->
+		    St1#lint{imports=add_imports(Mod, Mfs,
 						 St#lint.imports)};
-			true ->
-			    St1
-		    end
-            end;
-        false ->
-            add_error(Line, {bad_module_name, Mod1}, St)
-    end;
-import(Line, Mod, St) ->
-    Mod1 = package_to_string(Mod),
-    case packages:is_valid(Mod1) of
-        true ->
-            Key = list_to_atom(packages:last(Mod1)),
-            Imps = St#lint.mod_imports,
-%%%         case dict:is_key(Key, Imps) of
-%%%             true ->
-%%%                 M = packages:last(Mod1),
-%%%                 P = packages:strip_last(Mod1),
-%%%                 add_error(Line, {redefine_mod_import, M, P}, St);
-%%%             false ->
-%%%                 St#lint{mod_imports =
-%%%                         dict:store(Key, list_to_atom(Mod1), Imps)}
-%%%         end;
-            St#lint{mod_imports = dict:store(Key, list_to_atom(Mod1),
-                                             Imps)};
-        false ->
-            add_error(Line, {bad_module_name, Mod1}, St)
+		true ->
+		    St1
+	    end
     end.
 
 check_imports(_Line, Fs, Is) ->
@@ -1362,11 +1277,9 @@ call_function(Line, F, A, #lint{usage=Usage0,called=Cd,func=Func}=St) ->
 
 %% function(Line, Name, Arity, Clauses, State) -> State.
 
-function(Line, instance, _Arity, _Cs, St) when St#lint.global_vt =/= [] ->
-    add_error(Line, define_instance, St);
 function(Line, Name, Arity, Cs, St0) ->
     St1 = define_function(Line, Name, Arity, St0#lint{func={Name,Arity}}),
-    clauses(Cs, St1#lint.global_vt, St1).
+    clauses(Cs, St1).
 
 -spec define_function(line(), atom(), arity(), lint_state()) -> lint_state().
 
@@ -1389,15 +1302,16 @@ 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([Clause], State) -> {VarTable, State}.
 
-clauses(Cs, Vt, St) ->
+clauses(Cs, St) ->
     foldl(fun (C, St0) ->
-                  {_,St1} = clause(C, Vt, St0),
+                  {_,St1} = clause(C, St0),
                   St1
           end, St, Cs).
 
-clause({clause,_Line,H,G,B}, Vt0, St0) ->
+clause({clause,_Line,H,G,B}, St0) ->
+    Vt0 = [],
     {Hvt,Binvt,St1} = head(H, Vt0, St0),
     %% Cannot ignore BinVt since "binsize variables" may have been used.
     Vt1 = vtupdate(Hvt, vtupdate(Binvt, Vt0)),
@@ -1463,13 +1377,6 @@ pattern({record_index,Line,Name,Field}, _Vt, _Old, _Bvt, St) ->
                              pattern_field(Field, Name, Dfs, St1)
                      end),
     {Vt1,[],St1};
-pattern({record_field,Line,_,_}=M, _Vt, _Old, _Bvt, St0) ->
-    case expand_package(M, St0) of
-        {error, St1} ->
-            {[],[],add_error(Line, illegal_expr, St1)};
-        {_, St1} ->
-            {[],[],St1}
-    end;
 pattern({record,Line,Name,Pfs}, Vt, Old, Bvt, St) ->
     case dict:find(Name, St#lint.records) of
         {ok,{_Line,Fields}} ->
@@ -1851,13 +1758,6 @@ gexpr({tuple,_Line,Es}, Vt, St) ->
 gexpr({record_index,Line,Name,Field}, _Vt, St) ->
     check_record(Line, Name, St,
                  fun (Dfs, St1) -> record_field(Field, Name, Dfs, St1) end );
-gexpr({record_field,Line,_,_}=M, _Vt, St0) ->
-    case expand_package(M, St0) of
-        {error, St1} ->
-            {[],add_error(Line, illegal_expr, St1)};
-        {_, St1} ->
-            {[], St1}
-    end;
 gexpr({record_field,Line,Rec,Name,Field}, Vt, St0) ->
     {Rvt,St1} = gexpr(Rec, Vt, St0),
     {Fvt,St2} = check_record(Line, Name, St1,
@@ -1996,8 +1896,6 @@ is_gexpr({tuple,_L,Es}, RDs) -> is_gexpr_list(Es, RDs);
 %%    is_gexpr_list(Es, RDs);
 is_gexpr({record_index,_L,_Name,Field}, RDs) ->
     is_gexpr(Field, RDs);
-is_gexpr({record_field,_L,_,_}=M, _RDs) ->
-    erl_parse:package_segments(M) =/= error;
 is_gexpr({record_field,_L,Rec,_Name,Field}, RDs) ->
     is_gexpr_list([Rec,Field], RDs);
 is_gexpr({record,L,Name,Inits}, RDs) ->
@@ -2086,13 +1984,6 @@ expr({record,Line,Name,Inits}, Vt, St) ->
                  fun (Dfs, St1) ->
                          init_fields(Inits, Line, Name, Dfs, Vt, St1)
                  end);
-expr({record_field,Line,_,_}=M, _Vt, St0) ->
-    case expand_package(M, St0) of
-        {error, St1} ->
-            {[],add_error(Line, illegal_expr, St1)};
-        {_, St1} ->
-            {[], St1}
-    end;
 expr({record_field,Line,Rec,Name,Field}, Vt, St0) ->
     {Rvt,St1} = record_expr(Line, Rec, Vt, St0),
     {Fvt,St2} = check_record(Line, Name, St1,
@@ -2163,20 +2054,14 @@ expr({call,Line,{remote,_Lr,{atom,_Lm,erlang},{atom,Lf,is_record}},[E,A]},
     expr({call,Line,{atom,Lf,is_record},[E,A]}, Vt, St0);
 expr({call,L,{tuple,Lt,[{atom,Lm,erlang},{atom,Lf,is_record}]},As}, Vt, St) ->
     expr({call,L,{remote,Lt,{atom,Lm,erlang},{atom,Lf,is_record}},As}, Vt, St);
+expr({call,Line,{remote,_Lr,{atom,_Lm,M},{atom,Lf,F}},As}, Vt, St0) ->
+    St1 = keyword_warning(Lf, F, St0),
+    St2 = check_remote_function(Line, M, F, As, St1),
+    expr_list(As, Vt, St2);
 expr({call,Line,{remote,_Lr,M,F},As}, Vt, St0) ->
-    case expand_package(M, St0) of
-        {error, _} ->
-            expr_list([M,F|As], Vt, St0);
-        {{atom,_La,M1}, St1} ->
-            case F of
-                {atom,Lf,F1} ->
-                    St2 = keyword_warning(Lf, F1, St1),
-                    St3 = check_remote_function(Line, M1, F1, As, St2),
-                    expr_list(As, Vt, St3);
-                _ ->
-                    expr_list([F|As], Vt, St1)
-            end
-    end;
+    St1 = keyword_warning(Line, M, St0),
+    St2 = keyword_warning(Line, F, St1),
+    expr_list([M,F|As], Vt, St2);
 expr({call,Line,{atom,La,F},As}, Vt, St0) ->
     St1 = keyword_warning(La, F, St0),
     {Asvt,St2} = expr_list(As, Vt, St1),
@@ -2232,13 +2117,6 @@ expr({call,Line,{atom,La,F},As}, Vt, St0) ->
                           end
                   end}
     end;
-expr({call,Line,{record_field,_,_,_}=F,As}, Vt, St0) ->
-    case expand_package(F, St0) of
-        {error, _} ->
-	    expr_list([F|As], Vt, St0);
-        {A, St1} ->
-	    expr({call,Line,A,As}, Vt, St1)
-    end;
 expr({call,Line,F,As}, Vt, St0) ->
     St = warn_invalid_call(Line,F,St0),
     expr_list([F|As], Vt, St);                  %They see the same variables
@@ -2281,9 +2159,7 @@ expr({op,_Line,_Op,L,R}, Vt, St) ->
     expr_list([L,R], Vt, St);                   %They see the same variables
 %% The following are not allowed to occur anywhere!
 expr({remote,Line,_M,_F}, _Vt, St) ->
-    {[],add_error(Line, illegal_expr, St)};
-expr({'query',Line,_Q}, _Vt, St) ->
-    {[],add_error(Line, {mnemosyne,"query"}, St)}.
+    {[],add_error(Line, illegal_expr, St)}.
 
 %% expr_list(Expressions, Variables, State) ->
 %%      {UsedVarTable,State}
@@ -3618,6 +3494,10 @@ extract_sequence(4, [$t, $c | Fmt], Need) ->
     extract_sequence(5, [$c|Fmt], Need);
 extract_sequence(4, [$t, $s | Fmt], Need) ->
     extract_sequence(5, [$s|Fmt], Need);
+extract_sequence(4, [$t, $p | Fmt], Need) ->
+    extract_sequence(5, [$p|Fmt], Need);
+extract_sequence(4, [$t, $P | Fmt], Need) ->
+    extract_sequence(5, [$P|Fmt], Need);
 extract_sequence(4, [$t, C | _Fmt], _Need) ->
     {error,"invalid control ~t" ++ [C]};
 extract_sequence(4, Fmt, Need) ->
@@ -3654,49 +3534,6 @@ control_type($n, Need) -> Need;
 control_type($i, Need) -> [term|Need];
 control_type(_C, _Need) -> error.
 
-%% In syntax trees, module/package names are atoms or lists of atoms.
-
-package_to_string(A) when is_atom(A) -> atom_to_list(A);
-package_to_string(L) when is_list(L) -> packages:concat(L).
-
-expand_package({atom,L,A} = M, St0) ->
-    St1 = keyword_warning(L, A, St0),
-    case dict:find(A, St1#lint.mod_imports) of
-        {ok, A1} ->
-            {{atom,L,A1}, St1};
-        error ->
-            Name = atom_to_list(A),
-            case packages:is_valid(Name) of
-                true ->
-                    case packages:is_segmented(Name) of
-                        true ->
-                            {M, St1};
-                        false ->
-                            M1 = packages:concat(St1#lint.package,
-                                                 Name),
-                            {{atom,L,list_to_atom(M1)}, St1}
-                    end;
-                false ->
-                    St2 = add_error(L, {bad_module_name, Name}, St1),
-                    {error, St2}
-            end
-    end;
-expand_package(M, St0) ->
-    L = element(2, M),
-    case erl_parse:package_segments(M) of
-        error ->
-            {error, St0};
-        M1 ->
-            Name = package_to_string(M1),
-            case packages:is_valid(Name) of
-                true ->
-                    {{atom,L,list_to_atom(Name)}, St0};
-                false ->
-                    St1 = add_error(L, {bad_module_name, Name}, St0),
-                    {error, St1}
-            end
-    end.
-
 
 %% Prebuild set of local functions (to override auto-import)
 local_functions(Forms) ->
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 928c10f7f2..8316462989 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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 @@ attribute attr_val
 function function_clauses function_clause
 clause_args clause_guard clause_body
 expr expr_100 expr_150 expr_160 expr_200 expr_300 expr_400 expr_500
-expr_600 expr_700 expr_800 expr_900
+expr_600 expr_700 expr_800
 expr_max
 list tail
 list_comprehension lc_expr lc_exprs
@@ -36,7 +36,7 @@ tuple
 record_expr record_tuple record_field record_fields
 if_expr if_clause if_clauses case_expr cr_clause cr_clauses receive_expr
 fun_expr fun_clause fun_clauses atom_or_var integer_or_var
-try_expr try_catch try_clause try_clauses query_expr
+try_expr try_catch try_clause try_clauses
 function_call argument_list
 exprs guard
 atomic strings
@@ -54,7 +54,7 @@ char integer float atom string var
 
 '(' ')' ',' '->' ':-' '{' '}' '[' ']' '|' '||' '<-' ';' ':' '#' '.'
 'after' 'begin' 'case' 'try' 'catch' 'end' 'fun' 'if' 'of' 'receive' 'when'
-'andalso' 'orelse' 'query'
+'andalso' 'orelse'
 'bnot' 'not'
 '*' '/' 'div' 'rem' 'band' 'and'
 '+' '-' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor'
@@ -253,15 +253,9 @@ expr_700 -> function_call : '$1'.
 expr_700 -> record_expr : '$1'.
 expr_700 -> expr_800 : '$1'.
 
-expr_800 -> expr_900 ':' expr_max :
+expr_800 -> expr_max ':' expr_max :
 	{remote,?line('$2'),'$1','$3'}.
-expr_800 -> expr_900 : '$1'.
-
-expr_900 -> '.' atom :
-	{record_field,?line('$1'),{atom,?line('$1'),''},'$2'}.
-expr_900 -> expr_900 '.' atom :
-	{record_field,?line('$2'),'$1','$3'}.
-expr_900 -> expr_max : '$1'.
+expr_800 -> expr_max : '$1'.
 
 expr_max -> var : '$1'.
 expr_max -> atomic : '$1'.
@@ -278,7 +272,6 @@ expr_max -> case_expr : '$1'.
 expr_max -> receive_expr : '$1'.
 expr_max -> fun_expr : '$1'.
 expr_max -> try_expr : '$1'.
-expr_max -> query_expr : '$1'.
 
 
 list -> '[' ']' : {nil,?line('$1')}.
@@ -438,9 +431,6 @@ try_clause -> var ':' expr clause_guard clause_body :
 	L = ?line('$1'),
 	{clause,L,[{tuple,L,['$1','$3',{var,L,'_'}]}],'$4','$5'}.
 
-query_expr -> 'query' list_comprehension 'end' :
-	{'query',?line('$1'),'$2'}.
-
 
 argument_list -> '(' ')' : {[],?line('$1')}.
 argument_list -> '(' exprs ')' : {'$2',?line('$1')}.
@@ -510,7 +500,7 @@ Erlang code.
 
 -export([parse_form/1,parse_exprs/1,parse_term/1]).
 -export([normalise/1,abstract/1,tokens/1,tokens/2]).
--export([abstract/2, package_segments/1]).
+-export([abstract/2]).
 -export([inop_prec/1,preop_prec/1,func_prec/0,max_prec/0]).
 -export([set_line/2,get_attribute/2,get_attributes/1]).
 
@@ -679,20 +669,6 @@ build_attribute({atom,La,module}, Val) ->
 	    {attribute,La,module,Module};
 	[{atom,_Lm,Module},ExpList] ->
 	    {attribute,La,module,{Module,var_list(ExpList)}};
-	[Name] ->
-	    case package_segments(Name) of
-		error ->
-		    error_bad_decl(La, module);
-		Module ->
-		    {attribute,La,module,Module}
-	    end;
-	[Name,ExpList] ->
-	    case package_segments(Name) of
-		error ->
-		    error_bad_decl(La, module);
-		Module ->
-		    {attribute,La,module,{Module,var_list(ExpList)}}
-	    end;
 	_Other ->
 	    error_bad_decl(La, module)
     end;
@@ -704,22 +680,8 @@ build_attribute({atom,La,export}, Val) ->
     end;
 build_attribute({atom,La,import}, Val) ->
     case Val of
-	[Name] ->
-	    case package_segments(Name) of
-		error ->
-		    error_bad_decl(La, import);
-		Module ->
-		    {attribute,La,import,Module}
-	    end;
 	[{atom,_Lm,Mod},ImpList] ->
 	    {attribute,La,import,{Mod,farity_list(ImpList)}};
-	[Name, ImpList] ->
-	    case package_segments(Name) of
-		error ->
-		    error_bad_decl(La, import);
-		Module ->
-		    {attribute,La,import,{Module,farity_list(ImpList)}}
-	    end;
 	_Other -> error_bad_decl(La, import)
     end;
 build_attribute({atom,La,record}, Val) ->
@@ -820,18 +782,6 @@ term(Expr) ->
     catch _:_R -> ret_err(?line(Expr), "bad attribute")
     end.
 
-package_segments(Name) ->
-    package_segments(Name, [], []).
-
-package_segments({record_field, _, F1, F2}, Fs, As) ->
-    package_segments(F1, [F2 | Fs], As);
-package_segments({atom, _, A}, [F | Fs], As) ->
-    package_segments(F, Fs, [A | As]);
-package_segments({atom, _, A}, [], As) ->
-    lists:reverse([A | As]);
-package_segments(_, _, _) ->
-    error.
-
 %% build_function([Clause]) -> {function,Line,Name,Arity,[Clause]}
 
 build_function(Cs) ->
@@ -900,12 +850,6 @@ normalise({cons,_,Head,Tail}) ->
     [normalise(Head)|normalise(Tail)];
 normalise({tuple,_,Args}) ->
     list_to_tuple(normalise_list(Args));
-%% Atom dot-notation, as in 'foo.bar.baz'
-normalise({record_field,_,_,_}=A) ->
-    case package_segments(A) of
-	error -> erlang:error({badarg, A});
-	As -> list_to_atom(packages:concat(As))
-    end;
 %% Special case for unary +/-.
 normalise({op,_,'+',{char,_,I}}) -> I;
 normalise({op,_,'+',{integer,_,I}}) -> I;
@@ -923,73 +867,77 @@ normalise_list([]) ->
 -spec abstract(Data) -> AbsTerm when
       Data :: term(),
       AbsTerm :: abstract_expr().
-abstract(T) when is_integer(T) -> {integer,0,T};
-abstract(T) when is_float(T) -> {float,0,T};
-abstract(T) when is_atom(T) -> {atom,0,T};
-abstract([]) -> {nil,0};
-abstract(B) when is_bitstring(B) ->
-    {bin, 0, [abstract_byte(Byte, 0) || Byte <- bitstring_to_list(B)]};
-abstract([C|T]) when is_integer(C), 0 =< C, C < 256 ->
-    abstract_string(T, [C]);
-abstract([H|T]) ->
-    {cons,0,abstract(H),abstract(T)};
-abstract(Tuple) when is_tuple(Tuple) ->
-    {tuple,0,abstract_list(tuple_to_list(Tuple))}.
-
-abstract_string([C|T], String) when is_integer(C), 0 =< C, C < 256 ->
-    abstract_string(T, [C|String]);
-abstract_string([], String) ->
-    {string, 0, lists:reverse(String)};
-abstract_string(T, String) ->
-    not_string(String, abstract(T)).
-
-not_string([C|T], Result) ->
-    not_string(T, {cons, 0, {integer, 0, C}, Result});
-not_string([], Result) ->
+abstract(T) ->
+    abstract(T, 0, epp:default_encoding()).
+
+%%% abstract/2 takes line and encoding options
+-spec abstract(Data, Options) -> AbsTerm when
+      Data :: term(),
+      Options :: Line | [Option],
+      Option :: {line, Line} | {encoding, Encoding},
+      Encoding :: latin1 | unicode | utf8,
+      Line :: erl_scan:line(),
+      AbsTerm :: abstract_expr().
+
+abstract(T, Line) when is_integer(Line) ->
+    abstract(T, Line, epp:default_encoding());
+abstract(T, Options) when is_list(Options) ->
+    Line = proplists:get_value(line, Options, 0),
+    Encoding = proplists:get_value(encoding, Options,epp:default_encoding()),
+    abstract(T, Line, Encoding).
+
+-define(UNICODE(C),
+         (C >= 0 andalso C < 16#D800 orelse
+          C > 16#DFFF andalso C < 16#FFFE orelse
+          C > 16#FFFF andalso C =< 16#10FFFF)).
+
+abstract(T, L, _E) when is_integer(T) -> {integer,L,T};
+abstract(T, L, _E) when is_float(T) -> {float,L,T};
+abstract(T, L, _E) when is_atom(T) -> {atom,L,T};
+abstract([], L, _E) -> {nil,L};
+abstract(B, L, _E) when is_bitstring(B) ->
+    {bin, L, [abstract_byte(Byte, L) || Byte <- bitstring_to_list(B)]};
+abstract([C|T], L, unicode=E) when ?UNICODE(C) ->
+    abstract_unicode_string(T, [C], L, E);
+abstract([C|T], L, utf8=E) when ?UNICODE(C) ->
+    abstract_unicode_string(T, [C], L, E);
+abstract([C|T], L, latin1=E) when is_integer(C), 0 =< C, C < 256 ->
+    abstract_string(T, [C], L, E);
+abstract([H|T], L, E) ->
+    {cons,L,abstract(H, L, E),abstract(T, L, E)};
+abstract(Tuple, L, E) when is_tuple(Tuple) ->
+    {tuple,L,abstract_list(tuple_to_list(Tuple), L, E)}.
+
+abstract_string([C|T], String, L, E) when is_integer(C), 0 =< C, C < 256 ->
+    abstract_string(T, [C|String], L, E);
+abstract_string([], String, L, _E) ->
+    {string, L, lists:reverse(String)};
+abstract_string(T, String, L, E) ->
+    not_string(String, abstract(T, L, E), L, E).
+
+abstract_unicode_string([C|T], String, L, E) when ?UNICODE(C) ->
+    abstract_unicode_string(T, [C|String], L, E);
+abstract_unicode_string([], String, L, _E) ->
+    {string, L, lists:reverse(String)};
+abstract_unicode_string(T, String, L, E) ->
+    not_string(String, abstract(T, L, E), L, E).
+
+not_string([C|T], Result, L, E) ->
+    not_string(T, {cons, L, {integer, L, C}, Result}, L, E);
+not_string([], Result, _L, _E) ->
     Result.
 
-abstract_list([H|T]) ->
-    [abstract(H)|abstract_list(T)];
-abstract_list([]) ->
+abstract_list([H|T], L, E) ->
+    [abstract(H, L, E)|abstract_list(T, L, E)];
+abstract_list([], _L, _E) ->
     [].
 
-abstract_byte(Byte, Line) when is_integer(Byte) ->
-    {bin_element, Line, {integer, Line, Byte}, default, default};
-abstract_byte(Bits, Line) ->
+abstract_byte(Byte, L) when is_integer(Byte) ->
+    {bin_element, L, {integer, L, Byte}, default, default};
+abstract_byte(Bits, L) ->
     Sz = bit_size(Bits),
     <<Val:Sz>> = Bits,
-    {bin_element, Line, {integer, Line, Val}, {integer, Line, Sz}, default}.
-
-%%% abstract/2 keeps the line number
-abstract(T, Line) when is_integer(T) -> {integer,Line,T};
-abstract(T, Line) when is_float(T) -> {float,Line,T};
-abstract(T, Line) when is_atom(T) -> {atom,Line,T};
-abstract([], Line) -> {nil,Line};
-abstract(B, Line) when is_bitstring(B) ->
-    {bin, Line, [abstract_byte(Byte, Line) || Byte <- bitstring_to_list(B)]};
-abstract([C|T], Line) when is_integer(C), 0 =< C, C < 256 ->
-    abstract_string(T, [C], Line);
-abstract([H|T], Line) ->
-    {cons,Line,abstract(H, Line),abstract(T, Line)};
-abstract(Tuple, Line) when is_tuple(Tuple) ->
-    {tuple,Line,abstract_list(tuple_to_list(Tuple), Line)}.
-
-abstract_string([C|T], String, Line) when is_integer(C), 0 =< C, C < 256 ->
-    abstract_string(T, [C|String], Line);
-abstract_string([], String, Line) ->
-    {string, Line, lists:reverse(String)};
-abstract_string(T, String, Line) ->
-    not_string(String, abstract(T, Line), Line).
-
-not_string([C|T], Result, Line) ->
-    not_string(T, {cons, Line, {integer, Line, C}, Result}, Line);
-not_string([], Result, _Line) ->
-    Result.
-
-abstract_list([H|T], Line) ->
-    [abstract(H, Line)|abstract_list(T, Line)];
-abstract_list([], _Line) ->
-    [].
+    {bin_element, L, {integer, L, Val}, {integer, L, Sz}, default}.
 
 %%  Generate a list of tokens representing the abstract term.
 
@@ -1079,9 +1027,9 @@ preop_prec('#') -> {700,800}.
 
 func_prec() -> {800,700}.
 
--spec max_prec() -> 1000.
+-spec max_prec() -> 900.
 
-max_prec() -> 1000.
+max_prec() -> 900.
 
 %%% [Experimental]. The parser just copies the attributes of the
 %%% scanner tokens to the abstract format. This design decision has
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index 6b5aa951cf..0e1156075a 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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 @@
          guard/1,guard/2,exprs/1,exprs/2,exprs/3,expr/1,expr/2,expr/3,expr/4]).
 
 -import(lists, [append/1,foldr/3,mapfoldl/3,reverse/1,reverse/2]).
--import(io_lib, [write/1,format/2,write_char/1,write_string/1]).
+-import(io_lib, [write/1,format/2]).
 -import(erl_parse, [inop_prec/1,preop_prec/1,func_prec/0,max_prec/0]).
 
 -define(MAXLINE, 72).
@@ -36,7 +36,15 @@
                               CurrentIndentation :: integer(),
                               CurrentPrecedence :: non_neg_integer(),
                               HookFunction :: hook_function()) ->
-                                    io_lib:chars())).
+                                   io_lib:chars())).
+
+-type(option() :: {hook, hook_function()}
+                | {encoding, latin1 | unicode | utf8}).
+-type(options() :: hook_function() | [option()]).
+
+-record(pp, {string_fun, char_fun}).
+
+-record(options, {hook, encoding, opts}).
 
 %%%
 %%% Exported functions
@@ -48,12 +56,12 @@
 form(Thing) ->
     form(Thing, none).
 
--spec(form(Form, HookFunction) -> io_lib:chars() when
+-spec(form(Form, Options) -> io_lib:chars() when
       Form :: erl_parse:abstract_form(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-form(Thing, Hook) ->
-    frmt(lform(Thing, Hook)).
+form(Thing, Options) ->
+    frmt(lform(Thing, options(Options)), state(Options)).
 
 -spec(attribute(Attribute) -> io_lib:chars() when
       Attribute :: erl_parse:abstract_form()).
@@ -61,12 +69,12 @@ form(Thing, Hook) ->
 attribute(Thing) ->
     attribute(Thing, none).
 
--spec(attribute(Attribute, HookFunction) -> io_lib:chars() when
+-spec(attribute(Attribute, Options) -> io_lib:chars() when
       Attribute :: erl_parse:abstract_form(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-attribute(Thing, Hook) ->
-    frmt(lattribute(Thing, Hook)).
+attribute(Thing, Options) ->
+    frmt(lattribute(Thing, options(Options)), state(Options)).
 
 -spec(function(Function) -> io_lib:chars() when
       Function :: erl_parse:abstract_form()).
@@ -74,18 +82,18 @@ attribute(Thing, Hook) ->
 function(F) ->
     function(F, none).
 
--spec(function(Function, HookFunction) -> io_lib:chars() when
+-spec(function(Function, Options) -> io_lib:chars() when
       Function :: erl_parse:abstract_form(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-function(F, Hook) ->
-    frmt(lfunction(F, Hook)).
+function(F, Options) ->
+    frmt(lfunction(F, options(Options)), state(Options)).
 
 rule(R) ->
     rule(R, none).
 
-rule(R, Hook) ->
-    frmt(lrule(R, Hook)).
+rule(R, Options) ->
+    frmt(lrule(R, options(Options)), state(Options)).
 
 -spec(guard(Guard) -> io_lib:chars() when
       Guard :: [erl_parse:abstract_expr()]).
@@ -93,12 +101,12 @@ rule(R, Hook) ->
 guard(Gs) ->
     guard(Gs, none).
 
--spec(guard(Guard, HookFunction) -> io_lib:chars() when
+-spec(guard(Guard, Options) -> io_lib:chars() when
       Guard :: [erl_parse:abstract_expr()],
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-guard(Gs, Hook) ->
-    frmt(lguard(Gs, Hook)).
+guard(Gs, Options) ->
+    frmt(lguard(Gs, options(Options)), state(Options)).
 
 -spec(exprs(Expressions) -> io_lib:chars() when
       Expressions :: [erl_parse:abstract_expr()]).
@@ -106,99 +114,129 @@ guard(Gs, Hook) ->
 exprs(Es) ->
     exprs(Es, 0, none).
 
--spec(exprs(Expressions, HookFunction) -> io_lib:chars() when
+-spec(exprs(Expressions, Options) -> io_lib:chars() when
       Expressions :: [erl_parse:abstract_expr()],
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-exprs(Es, Hook) ->
-    exprs(Es, 0, Hook).
+exprs(Es, Options) ->
+    exprs(Es, 0, Options).
 
--spec(exprs(Expressions, Indent, HookFunction) -> io_lib:chars() when
+-spec(exprs(Expressions, Indent, Options) -> io_lib:chars() when
       Expressions :: [erl_parse:abstract_expr()],
       Indent :: integer(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-exprs(Es, I, Hook) ->
-    frmt({seq,[],[],[$,],lexprs(Es, Hook)}, I).
+exprs(Es, I, Options) ->
+    frmt({seq,[],[],[$,],lexprs(Es, options(Options))}, I, state(Options)).
 
 -spec(expr(Expression) -> io_lib:chars() when
       Expression :: erl_parse:abstract_expr()).
 
 expr(E) ->
-    frmt(lexpr(E, 0, none)).
+    frmt(lexpr(E, 0, options(none)), state(none)).
 
--spec(expr(Expression, HookFunction) -> io_lib:chars() when
+-spec(expr(Expression, Options) -> io_lib:chars() when
       Expression :: erl_parse:abstract_expr(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-expr(E, Hook) ->
-    frmt(lexpr(E, 0, Hook)).
+expr(E, Options) ->
+    frmt(lexpr(E, 0, options(Options)), state(Options)).
 
--spec(expr(Expression, Indent, HookFunction) -> io_lib:chars() when
+-spec(expr(Expression, Indent, Options) -> io_lib:chars() when
       Expression :: erl_parse:abstract_expr(),
       Indent :: integer(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-expr(E, I, Hook) ->
-    frmt(lexpr(E, 0, Hook), I).
+expr(E, I, Options) ->
+    frmt(lexpr(E, 0, options(Options)), I, state(Options)).
 
--spec(expr(Expression, Indent, Precedence, HookFunction) -> io_lib:chars() when
+-spec(expr(Expression, Indent, Precedence, Options) -> io_lib:chars() when
       Expression :: erl_parse:abstract_expr(),
       Indent :: integer(),
       Precedence :: non_neg_integer(),
-      HookFunction :: hook_function()).
+      Options :: options()).
 
-expr(E, I, P, Hook) ->
-    frmt(lexpr(E, P, Hook), I).
+expr(E, I, P, Options) ->
+    frmt(lexpr(E, P, options(Options)), I, state(Options)).
 
 %%%
 %%% Local functions
 %%%
 
-lform({attribute,Line,Name,Arg}, Hook) ->
-    lattribute({attribute,Line,Name,Arg}, Hook);
-lform({function,Line,Name,Arity,Clauses}, Hook) ->
-    lfunction({function,Line,Name,Arity,Clauses}, Hook);
-lform({rule,Line,Name,Arity,Clauses}, Hook) ->
-    lrule({rule,Line,Name,Arity,Clauses}, Hook);
+options(Options) when is_list(Options) ->
+    Hook = proplists:get_value(hook, Options, none),
+    Encoding = encoding(Options),
+    #options{hook = Hook, encoding = Encoding, opts = Options};
+options(Hook) ->
+    #options{hook = Hook, encoding = encoding([]), opts = Hook}.
+
+state(Options) when is_list(Options) ->
+    case encoding(Options) of
+        latin1 -> state();
+        unicode -> unicode_state()
+    end;
+state(_Hook) ->
+    state().
+
+state() ->
+    #pp{string_fun = fun io_lib:write_unicode_string_as_latin1/1,
+        char_fun   = fun io_lib:write_unicode_char_as_latin1/1}.
+
+unicode_state() ->
+    #pp{string_fun = fun io_lib:write_unicode_string/1,
+        char_fun   = fun io_lib:write_unicode_char/1}.
+
+encoding(Options) ->
+    case proplists:get_value(encoding, Options, epp:default_encoding()) of
+        latin1 -> latin1;
+        utf8 -> unicode;
+        unicode -> unicode
+    end.
+
+lform({attribute,Line,Name,Arg}, Opts) ->
+    lattribute({attribute,Line,Name,Arg}, Opts);
+lform({function,Line,Name,Arity,Clauses}, Opts) ->
+    lfunction({function,Line,Name,Arity,Clauses}, Opts);
+lform({rule,Line,Name,Arity,Clauses}, Opts) ->
+    lrule({rule,Line,Name,Arity,Clauses}, Opts);
 %% These are specials to make it easier for the compiler.
-lform({error,E}, _Hook) ->
+lform({error,E}, _Opts) ->
     leaf(format("~p\n", [{error,E}]));
-lform({warning,W}, _Hook) ->
+lform({warning,W}, _Opts) ->
     leaf(format("~p\n", [{warning,W}]));
-lform({eof,_Line}, _Hook) ->
+lform({eof,_Line}, _Opts) ->
     $\n.
 
-lattribute({attribute,_Line,type,Type}, Hook) ->
-    [typeattr(type, Type, Hook),leaf(".\n")];
-lattribute({attribute,_Line,opaque,Type}, Hook) ->
-    [typeattr(opaque, Type, Hook),leaf(".\n")];
-lattribute({attribute,_Line,spec,Arg}, _Hook) ->
+lattribute({attribute,_Line,type,Type}, Opts) ->
+    [typeattr(type, Type, Opts),leaf(".\n")];
+lattribute({attribute,_Line,opaque,Type}, Opts) ->
+    [typeattr(opaque, Type, Opts),leaf(".\n")];
+lattribute({attribute,_Line,spec,Arg}, _Opts) ->
     [specattr(Arg),leaf(".\n")];
-lattribute({attribute,_Line,Name,Arg}, Hook) ->
-    [lattribute(Name, Arg, Hook),leaf(".\n")].
+lattribute({attribute,_Line,Name,Arg}, Opts) ->
+    [lattribute(Name, Arg, Opts),leaf(".\n")].
 
-lattribute(module, {M,Vs}, _Hook) ->
+lattribute(module, {M,Vs}, _Opts) ->
     attr("module",[{var,0,pname(M)},
                    foldr(fun(V, C) -> {cons,0,{var,0,V},C}
                          end, {nil,0}, Vs)]);
-lattribute(module, M, _Hook) ->
+lattribute(module, M, _Opts) ->
     attr("module", [{var,0,pname(M)}]);
-lattribute(export, Falist, _Hook) ->
+lattribute(export, Falist, _Opts) ->
     call({var,0,"-export"}, [falist(Falist)], 0, none);
-lattribute(import, Name, _Hook) when is_list(Name) ->
+lattribute(import, Name, _Opts) when is_list(Name) ->
     attr("import", [{var,0,pname(Name)}]);
-lattribute(import, {From,Falist}, _Hook) ->
+lattribute(import, {From,Falist}, _Opts) ->
     attr("import",[{var,0,pname(From)},falist(Falist)]);
-lattribute(file, {Name,Line}, _Hook) ->
+lattribute(file, {Name,Line}, _Opts) ->
     attr("file", [{var,0,format("~p", [Name])},{integer,0,Line}]);
-lattribute(record, {Name,Is}, Hook) ->
+lattribute(record, {Name,Is}, Opts) ->
     Nl = leaf(format("-record(~w,", [Name])),
-    [{first,Nl,record_fields(Is, Hook)},$)];
-lattribute(Name, Arg, _Hook) ->
-    attr(write(Name), [erl_parse:abstract(Arg)]).
+    [{first,Nl,record_fields(Is, Opts)},$)];
+lattribute(Name, Arg, #options{encoding = Encoding}) ->
+    attr(write(Name), [erl_parse:abstract(Arg, [{encoding,Encoding}])]).
 
-typeattr(Tag, {TypeName,Type,Args}, _Hook) ->
+typeattr(Tag, {TypeName,Type,Args}, _Opts) ->
     {first,leaf("-"++atom_to_list(Tag)++" "),
      typed(call({atom,0,TypeName}, Args, 0, none), Type)}.
 
@@ -293,7 +331,7 @@ guard_type(Before, Gs) ->
     Gl = {list,[{step,'when',expr_list(Gs, [$,], fun constraint/2, none)}]},
     {list,[{step,Before,Gl}]}.
 
-constraint({type,_Line,constraint,[Tag,As]}, _Hook) ->
+constraint({type,_Line,constraint,[Tag,As]}, _Opts) ->
     simple_type(Tag, As).
 
 fun_type(Before, {type,_,'fun',[FType,Ret]}) ->
@@ -333,231 +371,230 @@ falist([]) ->
 falist([{Name,Arity}|Falist]) ->
     {cons,0,{var,0,format("~w/~w", [Name,Arity])},falist(Falist)}.
 
-lfunction({function,_Line,Name,_Arity,Cs}, Hook) ->
-    Cll = nl_clauses(fun (C, H) -> func_clause(Name, C, H) end, $;, Hook, Cs),
+lfunction({function,_Line,Name,_Arity,Cs}, Opts) ->
+    Cll = nl_clauses(fun (C, H) -> func_clause(Name, C, H) end, $;, Opts, Cs),
     [Cll,leaf(".\n")].
 
-func_clause(Name, {clause,Line,Head,Guard,Body}, Hook) ->
-    Hl = call({atom,Line,Name}, Head, 0, Hook),
-    Gl = guard_when(Hl, Guard, Hook),
-    Bl = body(Body, Hook),
+func_clause(Name, {clause,Line,Head,Guard,Body}, Opts) ->
+    Hl = call({atom,Line,Name}, Head, 0, Opts),
+    Gl = guard_when(Hl, Guard, Opts),
+    Bl = body(Body, Opts),
     {step,Gl,Bl}.
 
-lrule({rule,_Line,Name,_Arity,Cs}, Hook) ->
-    Cll = nl_clauses(fun (C, H) -> rule_clause(Name, C, H) end, $;, Hook, Cs),
+lrule({rule,_Line,Name,_Arity,Cs}, Opts) ->
+    Cll = nl_clauses(fun (C, H) -> rule_clause(Name, C, H) end, $;, Opts, Cs),
     [Cll,leaf(".\n")].
 
-rule_clause(Name, {clause,Line,Head,Guard,Body}, Hook) ->
-    Hl = call({atom,Line,Name}, Head, 0, Hook),
-    Gl = guard_when(Hl, Guard, Hook, leaf(" :-")),
-    Bl = rule_body(Body, Hook),
+rule_clause(Name, {clause,Line,Head,Guard,Body}, Opts) ->
+    Hl = call({atom,Line,Name}, Head, 0, Opts),
+    Gl = guard_when(Hl, Guard, Opts, leaf(" :-")),
+    Bl = rule_body(Body, Opts),
     {step,Gl,Bl}.
 
-rule_body(Es, Hook) ->
-    lc_quals(Es, Hook).
+rule_body(Es, Opts) ->
+    lc_quals(Es, Opts).
 
-guard_when(Before, Guard, Hook) ->
-    guard_when(Before, Guard, Hook, ' ->').
+guard_when(Before, Guard, Opts) ->
+    guard_when(Before, Guard, Opts, ' ->').
 
-guard_when(Before, Guard, Hook, After) ->
-    Gl = lguard(Guard, Hook),
+guard_when(Before, Guard, Opts, After) ->
+    Gl = lguard(Guard, Opts),
     [{list,[{step,Before,Gl}]},After].
 
-lguard([E|Es], Hook) when is_list(E) ->
-    {list,[{step,'when',expr_list([E|Es], [$;], fun guard0/2, Hook)}]};
-lguard([E|Es], Hook) -> % before R6
-    lguard([[E|Es]], Hook);
+lguard([E|Es], Opts) when is_list(E) ->
+    {list,[{step,'when',expr_list([E|Es], [$;], fun guard0/2, Opts)}]};
+lguard([E|Es], Opts) -> % before R6
+    lguard([[E|Es]], Opts);
 lguard([], _) ->
     [].
 
-guard0(Es, Hook) ->
-    expr_list(Es, [$,], fun lexpr/2, Hook).
+guard0(Es, Opts) ->
+    expr_list(Es, [$,], fun lexpr/2, Opts).
 
-%% body(Before, Es, Hook) -> [Char].
+%% body(Before, Es, Opts) -> [Char].
 
-body([E], Hook) ->
-    lexpr(E, Hook);
-body(Es, Hook) ->
-    {prefer_nl,[$,],lexprs(Es, Hook)}.
+body([E], Opts) ->
+    lexpr(E, Opts);
+body(Es, Opts) ->
+    {prefer_nl,[$,],lexprs(Es, Opts)}.
 
-lexpr(E, Hook) ->
-    lexpr(E, 0, Hook).
+lexpr(E, Opts) ->
+    lexpr(E, 0, Opts).
 
 lexpr({var,_,V}, _, _) when is_integer(V) ->    %Special hack for Robert
     leaf(format("_~w", [V]));
 lexpr({var,_,V}, _, _) -> leaf(format("~s", [V]));
-lexpr({char,_,C}, _, _) -> leaf(write_char(C));
+lexpr({char,_,C}, _, _) -> {char,C};
 lexpr({integer,_,N}, _, _) -> leaf(write(N));
 lexpr({float,_,F}, _, _) -> leaf(write(F));
 lexpr({atom,_,A}, _, _) -> leaf(write(A));
 lexpr({string,_,S}, _, _) -> {string,S};
 lexpr({nil,_}, _, _) -> '[]';
-lexpr({cons,_,H,T}, _, Hook) ->
-    list(T, [H], Hook);
-lexpr({lc,_,E,Qs}, _Prec, Hook) ->
-    Lcl = {list,[{step,[lexpr(E, Hook),leaf(" ||")],lc_quals(Qs, Hook)}]},
+lexpr({cons,_,H,T}, _, Opts) ->
+    list(T, [H], Opts);
+lexpr({lc,_,E,Qs}, _Prec, Opts) ->
+    Lcl = {list,[{step,[lexpr(E, Opts),leaf(" ||")],lc_quals(Qs, Opts)}]},
     {list,[{seq,$[,[],[[]],[{force_nl,leaf(" "),[Lcl]}]},$]]};
     %% {list,[{step,$[,Lcl},$]]};
-lexpr({bc,_,E,Qs}, _Prec, Hook) ->
-    Lcl = {list,[{step,[lexpr(E, Hook),leaf(" ||")],lc_quals(Qs, Hook)}]},
+lexpr({bc,_,E,Qs}, _Prec, Opts) ->
+    Lcl = {list,[{step,[lexpr(E, Opts),leaf(" ||")],lc_quals(Qs, Opts)}]},
     {list,[{seq,'<<',[],[[]],[{force_nl,leaf(" "),[Lcl]}]},'>>']};
     %% {list,[{step,'<<',Lcl},'>>']};
-lexpr({tuple,_,Elts}, _, Hook) ->
-    tuple(Elts, Hook);
-%%lexpr({struct,_,Tag,Elts}, _, Hook) ->
-%%  {first,format("~w", [Tag]),tuple(Elts, Hook)};
-lexpr({record_index, _, Name, F}, Prec, Hook) ->
+lexpr({tuple,_,Elts}, _, Opts) ->
+    tuple(Elts, Opts);
+%%lexpr({struct,_,Tag,Elts}, _, Opts) ->
+%%  {first,format("~w", [Tag]),tuple(Elts, Opts)};
+lexpr({record_index, _, Name, F}, Prec, Opts) ->
     {P,R} = preop_prec('#'),
     Nl = record_name(Name),
-    El = [Nl,$.,lexpr(F, R, Hook)],
+    El = [Nl,$.,lexpr(F, R, Opts)],
     maybe_paren(P, Prec, El);
-lexpr({record, _, Name, Fs}, Prec, Hook) ->
+lexpr({record, _, Name, Fs}, Prec, Opts) ->
     {P,_R} = preop_prec('#'),
     Nl = record_name(Name),
-    El = {first,Nl,record_fields(Fs, Hook)},
+    El = {first,Nl,record_fields(Fs, Opts)},
     maybe_paren(P, Prec, El);
-lexpr({record_field, _, Rec, Name, F}, Prec, Hook) ->
+lexpr({record_field, _, Rec, Name, F}, Prec, Opts) ->
     {L,P,R} = inop_prec('#'),
-    Rl = lexpr(Rec, L, Hook),
+    Rl = lexpr(Rec, L, Opts),
     Nl = leaf(format("#~w.", [Name])),
-    El = [Rl,Nl,lexpr(F, R, Hook)],
+    El = [Rl,Nl,lexpr(F, R, Opts)],
     maybe_paren(P, Prec, El);
-lexpr({record, _, Rec, Name, Fs}, Prec, Hook) ->
+lexpr({record, _, Rec, Name, Fs}, Prec, Opts) ->
     {L,P,_R} = inop_prec('#'),
-    Rl = lexpr(Rec, L, Hook),
+    Rl = lexpr(Rec, L, Opts),
     Nl = record_name(Name),
-    El = {first,[Rl,Nl],record_fields(Fs, Hook)},
+    El = {first,[Rl,Nl],record_fields(Fs, Opts)},
     maybe_paren(P, Prec, El);
-lexpr({record_field, _, {atom,_,''}, F}, Prec, Hook) ->
+lexpr({record_field, _, {atom,_,''}, F}, Prec, Opts) ->
     {_L,P,R} = inop_prec('.'),
-    El = [$.,lexpr(F, R, Hook)],
+    El = [$.,lexpr(F, R, Opts)],
     maybe_paren(P, Prec, El);
-lexpr({record_field, _, Rec, F}, Prec, Hook) ->
+lexpr({record_field, _, Rec, F}, Prec, Opts) ->
     {L,P,R} = inop_prec('.'),
-    El = [lexpr(Rec, L, Hook),$.,lexpr(F, R, Hook)],
+    El = [lexpr(Rec, L, Opts),$.,lexpr(F, R, Opts)],
     maybe_paren(P, Prec, El);
-lexpr({block,_,Es}, _, Hook) ->
-    {list,[{step,'begin',body(Es, Hook)},'end']};
-lexpr({'if',_,Cs}, _, Hook) ->
-    {list,[{step,'if',if_clauses(Cs, Hook)},'end']};
-lexpr({'case',_,Expr,Cs}, _, Hook) ->
-    {list,[{step,{list,[{step,'case',lexpr(Expr, Hook)},'of']},
-            cr_clauses(Cs, Hook)},
+lexpr({block,_,Es}, _, Opts) ->
+    {list,[{step,'begin',body(Es, Opts)},'end']};
+lexpr({'if',_,Cs}, _, Opts) ->
+    {list,[{step,'if',if_clauses(Cs, Opts)},'end']};
+lexpr({'case',_,Expr,Cs}, _, Opts) ->
+    {list,[{step,{list,[{step,'case',lexpr(Expr, Opts)},'of']},
+            cr_clauses(Cs, Opts)},
            'end']};
-lexpr({'cond',_,Cs}, _, Hook) ->
-    {list,[{step,leaf("cond"),cond_clauses(Cs, Hook)},'end']};
-lexpr({'receive',_,Cs}, _, Hook) ->
-    {list,[{step,'receive',cr_clauses(Cs, Hook)},'end']};
-lexpr({'receive',_,Cs,To,ToOpt}, _, Hook) ->
-    Al = {list,[{step,[lexpr(To, Hook),' ->'],body(ToOpt, Hook)}]},
-    {list,[{step,'receive',cr_clauses(Cs, Hook)},
+lexpr({'cond',_,Cs}, _, Opts) ->
+    {list,[{step,leaf("cond"),cond_clauses(Cs, Opts)},'end']};
+lexpr({'receive',_,Cs}, _, Opts) ->
+    {list,[{step,'receive',cr_clauses(Cs, Opts)},'end']};
+lexpr({'receive',_,Cs,To,ToOpt}, _, Opts) ->
+    Al = {list,[{step,[lexpr(To, Opts),' ->'],body(ToOpt, Opts)}]},
+    {list,[{step,'receive',cr_clauses(Cs, Opts)},
            {step,'after',Al},
            'end']};
-lexpr({'fun',_,{function,F,A}}, _Prec, _Hook) ->
+lexpr({'fun',_,{function,F,A}}, _Prec, _Opts) ->
     leaf(format("fun ~w/~w", [F,A]));
-lexpr({'fun',_,{function,F,A},Extra}, _Prec, _Hook) ->
+lexpr({'fun',_,{function,F,A},Extra}, _Prec, _Opts) ->
     {force_nl,fun_info(Extra),leaf(format("fun ~w/~w", [F,A]))};
-lexpr({'fun',_,{function,M,F,A}}, _Prec, _Hook)
+lexpr({'fun',_,{function,M,F,A}}, _Prec, _Opts)
   when is_atom(M), is_atom(F), is_integer(A) ->
     %% For backward compatibility with pre-R15 abstract format.
     leaf(format("fun ~w:~w/~w", [M,F,A]));
-lexpr({'fun',_,{function,M,F,A}}, _Prec, Hook) ->
+lexpr({'fun',_,{function,M,F,A}}, _Prec, Opts) ->
     %% New format in R15.
-    NameItem = lexpr(M, Hook),
-    CallItem = lexpr(F, Hook),
-    ArityItem = lexpr(A, Hook),
+    NameItem = lexpr(M, Opts),
+    CallItem = lexpr(F, Opts),
+    ArityItem = lexpr(A, Opts),
     ["fun ",NameItem,$:,CallItem,$/,ArityItem];
-lexpr({'fun',_,{clauses,Cs}}, _Prec, Hook) ->
-    {list,[{first,'fun',fun_clauses(Cs, Hook)},'end']};
-lexpr({'fun',_,{clauses,Cs},Extra}, _Prec, Hook) ->
+lexpr({'fun',_,{clauses,Cs}}, _Prec, Opts) ->
+    {list,[{first,'fun',fun_clauses(Cs, Opts)},'end']};
+lexpr({'fun',_,{clauses,Cs},Extra}, _Prec, Opts) ->
     {force_nl,fun_info(Extra),
-     {list,[{first,'fun',fun_clauses(Cs, Hook)},'end']}};
-lexpr({'query',_,Lc}, _Prec, Hook) ->
-    {list,[{step,leaf("query"),lexpr(Lc, 0, Hook)},'end']};
-lexpr({call,_,{remote,_,{atom,_,M},{atom,_,F}=N}=Name,Args}, Prec, Hook) ->
+     {list,[{first,'fun',fun_clauses(Cs, Opts)},'end']}};
+lexpr({call,_,{remote,_,{atom,_,M},{atom,_,F}=N}=Name,Args}, Prec, Opts) ->
     case erl_internal:bif(M, F, length(Args)) of
         true ->
-            call(N, Args, Prec, Hook);
+            call(N, Args, Prec, Opts);
         false ->
-            call(Name, Args, Prec, Hook)
+            call(Name, Args, Prec, Opts)
     end;
-lexpr({call,_,Name,Args}, Prec, Hook) ->
-    call(Name, Args, Prec, Hook);
-lexpr({'try',_,Es,Scs,Ccs,As}, _, Hook) ->
+lexpr({call,_,Name,Args}, Prec, Opts) ->
+    call(Name, Args, Prec, Opts);
+lexpr({'try',_,Es,Scs,Ccs,As}, _, Opts) ->
     {list,[if
                Scs =:= [] ->
-                   {step,'try',body(Es, Hook)};
+                   {step,'try',body(Es, Opts)};
                true ->
-                   {step,{list,[{step,'try',body(Es, Hook)},'of']},
-                    cr_clauses(Scs, Hook)}
+                   {step,{list,[{step,'try',body(Es, Opts)},'of']},
+                    cr_clauses(Scs, Opts)}
            end,
            if
                Ccs =:= [] ->
                    [];
                true ->
-                   {step,'catch',try_clauses(Ccs, Hook)}
+                   {step,'catch',try_clauses(Ccs, Opts)}
            end,
            if
                As =:= [] ->
                    [];
                true ->
-                   {step,'after',body(As, Hook)}
+                   {step,'after',body(As, Opts)}
            end,
            'end']};
-lexpr({'catch',_,Expr}, Prec, Hook) ->
+lexpr({'catch',_,Expr}, Prec, Opts) ->
     {P,R} = preop_prec('catch'),
-    El = {list,[{step,'catch',lexpr(Expr, R, Hook)}]},
+    El = {list,[{step,'catch',lexpr(Expr, R, Opts)}]},
     maybe_paren(P, Prec, El);
-lexpr({match,_,Lhs,Rhs}, Prec, Hook) ->
+lexpr({match,_,Lhs,Rhs}, Prec, Opts) ->
     {L,P,R} = inop_prec('='),
-    Pl = lexpr(Lhs, L, Hook),
-    Rl = lexpr(Rhs, R, Hook),
+    Pl = lexpr(Lhs, L, Opts),
+    Rl = lexpr(Rhs, R, Opts),
     El = {list,[{cstep,[Pl,' ='],Rl}]},
     maybe_paren(P, Prec, El);
-lexpr({op,_,Op,Arg}, Prec, Hook) ->
+lexpr({op,_,Op,Arg}, Prec, Opts) ->
     {P,R} = preop_prec(Op),
     Ol = leaf(format("~s ", [Op])),
-    El = [Ol,lexpr(Arg, R, Hook)],
+    El = [Ol,lexpr(Arg, R, Opts)],
     maybe_paren(P, Prec, El);
-lexpr({op,_,Op,Larg,Rarg}, Prec, Hook)  when Op =:= 'orelse';
+lexpr({op,_,Op,Larg,Rarg}, Prec, Opts)  when Op =:= 'orelse';
                                              Op =:= 'andalso' ->
     %% Breaks lines since R12B.
     {L,P,R} = inop_prec(Op),
-    Ll = lexpr(Larg, L, Hook),
+    Ll = lexpr(Larg, L, Opts),
     Ol = leaf(format("~s", [Op])),
-    Lr = lexpr(Rarg, R, Hook),
+    Lr = lexpr(Rarg, R, Opts),
     El = {prefer_nl,[[]],[Ll,Ol,Lr]},
     maybe_paren(P, Prec, El);
-lexpr({op,_,Op,Larg,Rarg}, Prec, Hook) ->
+lexpr({op,_,Op,Larg,Rarg}, Prec, Opts) ->
     {L,P,R} = inop_prec(Op),
-    Ll = lexpr(Larg, L, Hook),
+    Ll = lexpr(Larg, L, Opts),
     Ol = leaf(format("~s", [Op])),
-    Lr = lexpr(Rarg, R, Hook),
+    Lr = lexpr(Rarg, R, Opts),
     El = {list,[Ll,Ol,Lr]},
     maybe_paren(P, Prec, El);
 %% Special expressions which are not really legal everywhere.
-lexpr({remote,_,M,F}, Prec, Hook) ->
+lexpr({remote,_,M,F}, Prec, Opts) ->
     {L,P,R} = inop_prec(':'),
-    NameItem = lexpr(M, L, Hook),
-    CallItem = lexpr(F, R, Hook),
+    NameItem = lexpr(M, L, Opts),
+    CallItem = lexpr(F, R, Opts),
     maybe_paren(P, Prec, [NameItem,$:,CallItem]);
 %% BIT SYNTAX:
-lexpr({bin,_,Fs}, _, Hook) ->
-    bit_grp(Fs, Hook);
+lexpr({bin,_,Fs}, _, Opts) ->
+    bit_grp(Fs, Opts);
 %% Special case for straight values.
 lexpr({value,_,Val}, _,_) ->
     leaf(write(Val));
 %% Now do the hook.
-lexpr(Other, _Precedence, none) ->
+lexpr(Other, _Precedence, #options{hook = none}) ->
     leaf(format("INVALID-FORM:~w:",[Other]));
-lexpr(HookExpr, Precedence, {Mod,Func,Eas}) when Mod =/= 'fun' ->
+lexpr(HookExpr, Precedence, #options{hook = {Mod,Func,Eas}})
+                                        when Mod =/= 'fun' ->
     {ehook,HookExpr,Precedence,{Mod,Func,Eas}};
-lexpr(HookExpr, Precedence, Func) ->
-    {hook,HookExpr,Precedence,Func}.
+lexpr(HookExpr, Precedence, #options{hook = Func, opts = Options}) ->
+    {hook,HookExpr,Precedence,Func,Options}.
 
-call(Name, Args, Prec, Hook) ->
+call(Name, Args, Prec, Opts) ->
     {F,P} = func_prec(),
-    Item = {first,lexpr(Name, F, Hook),args(Args, Hook)},
+    Item = {first,lexpr(Name, F, Opts),args(Args, Opts)},
     maybe_paren(P, Prec, Item).
 
 fun_info(Extra) ->
@@ -565,32 +602,18 @@ fun_info(Extra) ->
 
 %% BITS:
 
-bit_grp(Fs, Hook) ->
-    append([['<<'],
-            [try
-                 true = Fs =/= [],
-                 S = bin_string(Fs),
-                 true = io_lib:printable_list(S),
-                 {string,S}
-             catch _:_ ->
-                 bit_elems(Fs, Hook)
-             end],
-            ['>>']]).
-
-bin_string([]) ->
-    [];
-bin_string([{bin_element,_,{char,_,C},_,_}|Bin]) ->
-    [C | bin_string(Bin)].
+bit_grp(Fs, Opts) ->
+    append([['<<'], [bit_elems(Fs, Opts)], ['>>']]).
 
-bit_elems(Es, Hook) ->
-    expr_list(Es, $,, fun bit_elem/2, Hook).
+bit_elems(Es, Opts) ->
+    expr_list(Es, $,, fun bit_elem/2, Opts).
 
-bit_elem({bin_element,_,Expr,Sz,Types}, Hook) ->
+bit_elem({bin_element,_,Expr,Sz,Types}, Opts) ->
     P = max_prec(),
-    VChars = lexpr(Expr, P, Hook),
+    VChars = lexpr(Expr, P, Opts),
     SChars = if
                  Sz =/= default ->
-                     [VChars,$:,lexpr(Sz, P, Hook)];
+                     [VChars,$:,lexpr(Sz, P, Opts)];
                  true ->
                      VChars
              end,
@@ -618,157 +641,157 @@ bit_elem_type(T) ->
 record_name(Name) ->
     leaf(format("#~w", [Name])).
 
-record_fields(Fs, Hook) ->
-    tuple(Fs, fun record_field/2, Hook).
+record_fields(Fs, Opts) ->
+    tuple(Fs, fun record_field/2, Opts).
 
-record_field({record_field,_,F,Val}, Hook) ->
+record_field({record_field,_,F,Val}, Opts) ->
     {L,_P,R} = inop_prec('='),
-    Fl = lexpr(F, L, Hook),
-    Vl = lexpr(Val, R, Hook),
+    Fl = lexpr(F, L, Opts),
+    Vl = lexpr(Val, R, Opts),
     {list,[{cstep,[Fl,' ='],Vl}]};
-record_field({typed_record_field,{record_field,_,F,Val},Type}, Hook) ->
+record_field({typed_record_field,{record_field,_,F,Val},Type}, Opts) ->
     {L,_P,R} = inop_prec('='),
-    Fl = lexpr(F, L, Hook),
-    Vl = typed(lexpr(Val, R, Hook), Type),
+    Fl = lexpr(F, L, Opts),
+    Vl = typed(lexpr(Val, R, Opts), Type),
     {list,[{cstep,[Fl,' ='],Vl}]};
-record_field({typed_record_field,Field,Type}, Hook) ->
-    typed(record_field(Field, Hook), Type);
-record_field({record_field,_,F}, Hook) ->
-    lexpr(F, 0, Hook).
-
-list({cons,_,H,T}, Es, Hook) ->
-    list(T, [H|Es], Hook);
-list({nil,_}, Es, Hook) ->
-    proper_list(reverse(Es), Hook);
-list(Other, Es, Hook) ->
-    improper_list(reverse(Es, [Other]), Hook).
-
-%% if_clauses(Clauses, Hook) -> [Char].
+record_field({typed_record_field,Field,Type}, Opts) ->
+    typed(record_field(Field, Opts), Type);
+record_field({record_field,_,F}, Opts) ->
+    lexpr(F, 0, Opts).
+
+list({cons,_,H,T}, Es, Opts) ->
+    list(T, [H|Es], Opts);
+list({nil,_}, Es, Opts) ->
+    proper_list(reverse(Es), Opts);
+list(Other, Es, Opts) ->
+    improper_list(reverse(Es, [Other]), Opts).
+
+%% if_clauses(Clauses, Opts) -> [Char].
 %%  Print 'if' clauses.
 
-if_clauses(Cs, Hook) ->
-    clauses(fun if_clause/2, Hook, Cs).
+if_clauses(Cs, Opts) ->
+    clauses(fun if_clause/2, Opts, Cs).
 
-if_clause({clause,_,[],G,B}, Hook) ->
-    Gl = [guard_no_when(G, Hook),' ->'],
-    {step,Gl,body(B, Hook)}.
+if_clause({clause,_,[],G,B}, Opts) ->
+    Gl = [guard_no_when(G, Opts),' ->'],
+    {step,Gl,body(B, Opts)}.
 
-guard_no_when([E|Es], Hook) when is_list(E) ->
-    expr_list([E|Es], $;, fun guard0/2, Hook);
-guard_no_when([E|Es], Hook) -> % before R6
-    guard_no_when([[E|Es]], Hook);
+guard_no_when([E|Es], Opts) when is_list(E) ->
+    expr_list([E|Es], $;, fun guard0/2, Opts);
+guard_no_when([E|Es], Opts) -> % before R6
+    guard_no_when([[E|Es]], Opts);
 guard_no_when([], _) -> % cannot happen
     leaf("true").
 
-%% cr_clauses(Clauses, Hook) -> [Char].
+%% cr_clauses(Clauses, Opts) -> [Char].
 %%  Print 'case'/'receive' clauses.
 
-cr_clauses(Cs, Hook) ->
-    clauses(fun cr_clause/2, Hook, Cs).
+cr_clauses(Cs, Opts) ->
+    clauses(fun cr_clause/2, Opts, Cs).
 
-cr_clause({clause,_,[T],G,B}, Hook) ->
-    El = lexpr(T, 0, Hook),
-    Gl = guard_when(El, G, Hook),
-    Bl = body(B, Hook),
+cr_clause({clause,_,[T],G,B}, Opts) ->
+    El = lexpr(T, 0, Opts),
+    Gl = guard_when(El, G, Opts),
+    Bl = body(B, Opts),
     {step,Gl,Bl}.
 
-%% try_clauses(Clauses, Hook) -> [Char].
+%% try_clauses(Clauses, Opts) -> [Char].
 %%  Print 'try' clauses.
 
-try_clauses(Cs, Hook) ->
-    clauses(fun try_clause/2, Hook, Cs).
+try_clauses(Cs, Opts) ->
+    clauses(fun try_clause/2, Opts, Cs).
 
-try_clause({clause,_,[{tuple,_,[{atom,_,throw},V,S]}],G,B}, Hook) ->
-    El = lexpr(V, 0, Hook),
-    Sl = stack_backtrace(S, [El], Hook),
-    Gl = guard_when(Sl, G, Hook),
-    Bl = body(B, Hook),
+try_clause({clause,_,[{tuple,_,[{atom,_,throw},V,S]}],G,B}, Opts) ->
+    El = lexpr(V, 0, Opts),
+    Sl = stack_backtrace(S, [El], Opts),
+    Gl = guard_when(Sl, G, Opts),
+    Bl = body(B, Opts),
     {step,Gl,Bl};
-try_clause({clause,_,[{tuple,_,[C,V,S]}],G,B}, Hook) ->
-    Cs = lexpr(C, 0, Hook),
-    El = lexpr(V, 0, Hook),
+try_clause({clause,_,[{tuple,_,[C,V,S]}],G,B}, Opts) ->
+    Cs = lexpr(C, 0, Opts),
+    El = lexpr(V, 0, Opts),
     CsEl = [Cs,$:,El],
-    Sl = stack_backtrace(S, CsEl, Hook),
-    Gl = guard_when(Sl, G, Hook),
-    Bl = body(B, Hook),
+    Sl = stack_backtrace(S, CsEl, Opts),
+    Gl = guard_when(Sl, G, Opts),
+    Bl = body(B, Opts),
     {step,Gl,Bl}.
 
-stack_backtrace({var,_,'_'}, El, _Hook) ->
+stack_backtrace({var,_,'_'}, El, _Opts) ->
     El;
-stack_backtrace(S, El, Hook) ->
-    El++[$:,lexpr(S, 0, Hook)].
+stack_backtrace(S, El, Opts) ->
+    El++[$:,lexpr(S, 0, Opts)].
 
-%% fun_clauses(Clauses, Hook) -> [Char].
+%% fun_clauses(Clauses, Opts) -> [Char].
 %%  Print 'fun' clauses.
 
-fun_clauses(Cs, Hook) ->
-    nl_clauses(fun fun_clause/2, [$;], Hook, Cs).
+fun_clauses(Cs, Opts) ->
+    nl_clauses(fun fun_clause/2, [$;], Opts, Cs).
 
-fun_clause({clause,_,A,G,B}, Hook) ->
-    El = args(A, Hook),
-    Gl = guard_when(El, G, Hook),
-    Bl = body(B, Hook),
+fun_clause({clause,_,A,G,B}, Opts) ->
+    El = args(A, Opts),
+    Gl = guard_when(El, G, Opts),
+    Bl = body(B, Opts),
     {step,Gl,Bl}.
 
-%% cond_clauses(Clauses, Hook) -> [Char].
+%% cond_clauses(Clauses, Opts) -> [Char].
 %%  Print 'cond' clauses.
 
-cond_clauses(Cs, Hook) ->
-    clauses(fun cond_clause/2, Hook, Cs).
+cond_clauses(Cs, Opts) ->
+    clauses(fun cond_clause/2, Opts, Cs).
 
-cond_clause({clause,_,[],[[E]],B}, Hook) ->
-    {step,[lexpr(E, Hook),' ->'],body(B, Hook)}.
+cond_clause({clause,_,[],[[E]],B}, Opts) ->
+    {step,[lexpr(E, Opts),' ->'],body(B, Opts)}.
 
-%% nl_clauses(Type, Hook, Clauses) -> [Char].
+%% nl_clauses(Type, Opts, Clauses) -> [Char].
 %%  Generic clause printing function (always breaks lines).
 
-nl_clauses(Type, Sep, Hook, Cs) ->
-    {prefer_nl,Sep,lexprs(Cs, Type, Hook)}.
+nl_clauses(Type, Sep, Opts, Cs) ->
+    {prefer_nl,Sep,lexprs(Cs, Type, Opts)}.
 
-%% clauses(Type, Hook, Clauses) -> [Char].
+%% clauses(Type, Opts, Clauses) -> [Char].
 %%  Generic clause printing function (breaks lines since R12B).
 
-clauses(Type, Hook, Cs) ->
-    {prefer_nl,[$;],lexprs(Cs, Type, Hook)}.
+clauses(Type, Opts, Cs) ->
+    {prefer_nl,[$;],lexprs(Cs, Type, Opts)}.
 
-%% lc_quals(Qualifiers, After, Hook)
+%% lc_quals(Qualifiers, After, Opts)
 %% List comprehension qualifiers (breaks lines since R12B).
 
-lc_quals(Qs, Hook) ->
-    {prefer_nl,[$,],lexprs(Qs, fun lc_qual/2, Hook)}.
+lc_quals(Qs, Opts) ->
+    {prefer_nl,[$,],lexprs(Qs, fun lc_qual/2, Opts)}.
 
-lc_qual({b_generate,_,Pat,E}, Hook) ->
-    Pl = lexpr(Pat, 0, Hook),
-    {list,[{step,[Pl,leaf(" <=")],lexpr(E, 0, Hook)}]};
-lc_qual({generate,_,Pat,E}, Hook) ->
-    Pl = lexpr(Pat, 0, Hook),
-    {list,[{step,[Pl,leaf(" <-")],lexpr(E, 0, Hook)}]};
-lc_qual(Q, Hook) ->
-    lexpr(Q, 0, Hook).
+lc_qual({b_generate,_,Pat,E}, Opts) ->
+    Pl = lexpr(Pat, 0, Opts),
+    {list,[{step,[Pl,leaf(" <=")],lexpr(E, 0, Opts)}]};
+lc_qual({generate,_,Pat,E}, Opts) ->
+    Pl = lexpr(Pat, 0, Opts),
+    {list,[{step,[Pl,leaf(" <-")],lexpr(E, 0, Opts)}]};
+lc_qual(Q, Opts) ->
+    lexpr(Q, 0, Opts).
 
-proper_list(Es, Hook) ->
-    {seq,$[,$],$,,lexprs(Es, Hook)}.
+proper_list(Es, Opts) ->
+    {seq,$[,$],$,,lexprs(Es, Opts)}.
 
-improper_list(Es, Hook) ->
-    {seq,$[,$],{$,,$|},lexprs(Es, Hook)}.
+improper_list(Es, Opts) ->
+    {seq,$[,$],{$,,$|},lexprs(Es, Opts)}.
 
-tuple(L, Hook) ->
-    tuple(L, fun lexpr/2, Hook).
+tuple(L, Opts) ->
+    tuple(L, fun lexpr/2, Opts).
 
-tuple(Es, F, Hook) ->
-    {seq,${,$},$,,lexprs(Es, F, Hook)}.
+tuple(Es, F, Opts) ->
+    {seq,${,$},$,,lexprs(Es, F, Opts)}.
 
-args(As, Hook) ->
-    {seq,$(,$),[$,],lexprs(As, Hook)}.
+args(As, Opts) ->
+    {seq,$(,$),[$,],lexprs(As, Opts)}.
 
-expr_list(Es, Sep, F, Hook) ->
-    {seq,[],[],Sep,lexprs(Es, F, Hook)}.
+expr_list(Es, Sep, F, Opts) ->
+    {seq,[],[],Sep,lexprs(Es, F, Opts)}.
 
-lexprs(Es, Hook) ->
-    lexprs(Es, fun lexpr/2, Hook).
+lexprs(Es, Opts) ->
+    lexprs(Es, fun lexpr/2, Opts).
 
-lexprs(Es, F, Hook) ->
-    [F(E, Hook) || E <- Es].
+lexprs(Es, F, Opts) ->
+    [F(E, Opts) || E <- Es].
 
 maybe_paren(P, Prec, Expr) when P < Prec ->
     [$(,Expr,$)];
@@ -781,13 +804,13 @@ leaf(S) ->
 %%% Do the formatting. Currently nothing fancy. Could probably have
 %%% done it in one single pass.
 
-frmt(Item) ->
-    frmt(Item, 0).
+frmt(Item, PP) ->
+    frmt(Item, 0, PP).
 
-frmt(Item, I) ->
+frmt(Item, I, PP) ->
     ST = spacetab(),
     WT = wordtable(),
-    {Chars,_Length} = f(Item, I, ST, WT),
+    {Chars,_Length} = f(Item, I, ST, WT, PP),
     [Chars].
 
 %%% What the tags mean:
@@ -803,6 +826,7 @@ frmt(Item, I) ->
 %%% - {force_nl,ExtraInfo,I}: fun-info (a comment) forces linebreak before I.
 %%% - {prefer_nl,Sep,IPs}: forces linebreak between Is unlesss negative
 %%%   indentation.
+%%% - {char,C}: a character
 %%% - {string,S}: a string.
 %%% - {hook,...}, {ehook,...}: hook expressions.
 %%%
@@ -812,22 +836,22 @@ frmt(Item, I) ->
 %%% cstep works similarly, but no linebreak if the width of I1 is less
 %%% than the indentation (this is for "A = <expression over several lines>).
 
-f([]=Nil, _I0, _ST, _WT) ->
+f([]=Nil, _I0, _ST, _WT, _PP) ->
     {Nil,0};
-f(C, _I0, _ST, _WT) when is_integer(C) ->
+f(C, _I0, _ST, _WT, _PP) when is_integer(C) ->
     {C,1};
-f({leaf,Length,Chars}, _I0, _ST, _WT) ->
+f({leaf,Length,Chars}, _I0, _ST, _WT, _PP) ->
     {Chars,Length};
-f([Item|Items], I0, ST, WT) ->
-    consecutive(Items, f(Item, I0, ST, WT), I0, ST, WT);
-f({list,Items}, I0, ST, WT) ->
-    f({seq,[],[],[[]],Items}, I0, ST, WT);
-f({first,E,Item}, I0, ST, WT) ->
-    f({seq,E,[],[[]],[Item]}, I0, ST, WT);
-f({seq,Before,After,Sep,LItems}, I0, ST, WT) ->
-    BCharsSize = f(Before, I0, ST, WT),
+f([Item|Items], I0, ST, WT, PP) ->
+    consecutive(Items, f(Item, I0, ST, WT, PP), I0, ST, WT, PP);
+f({list,Items}, I0, ST, WT, PP) ->
+    f({seq,[],[],[[]],Items}, I0, ST, WT, PP);
+f({first,E,Item}, I0, ST, WT, PP) ->
+    f({seq,E,[],[[]],[Item]}, I0, ST, WT, PP);
+f({seq,Before,After,Sep,LItems}, I0, ST, WT, PP) ->
+    BCharsSize = f(Before, I0, ST, WT, PP),
     I = indent(BCharsSize, I0),
-    CharsSizeL = fl(LItems, Sep, I, After, ST, WT),
+    CharsSizeL = fl(LItems, Sep, I, After, ST, WT, PP),
     {CharsL,SizeL} = unz(CharsSizeL),
     {BCharsL,BSizeL} = unz1([BCharsSize]),
     Sizes = BSizeL ++ SizeL,
@@ -848,15 +872,15 @@ f({seq,Before,After,Sep,LItems}, I0, ST, WT) ->
             {BCharsL++insert_newlines(CharsSizeL, I, ST),
              nsz(lists:last(Sizes), I0)}
     end;
-f({force_nl,_ExtraInfoItem,Item}, I, ST, WT) when I < 0 ->
+f({force_nl,_ExtraInfoItem,Item}, I, ST, WT, PP) when I < 0 ->
     %% Extra info is a comment; cannot have that on the same line
-    f(Item, I, ST, WT);
-f({force_nl,ExtraInfoItem,Item}, I, ST, WT) ->
-    f({prefer_nl,[],[ExtraInfoItem,Item]}, I, ST, WT);
-f({prefer_nl,Sep,LItems}, I, ST, WT) when I < 0 ->
-    f({seq,[],[],Sep,LItems}, I, ST, WT);
-f({prefer_nl,Sep,LItems}, I0, ST, WT) ->
-    CharsSize2L = fl(LItems, Sep, I0, [], ST, WT),
+    f(Item, I, ST, WT, PP);
+f({force_nl,ExtraInfoItem,Item}, I, ST, WT, PP) ->
+    f({prefer_nl,[],[ExtraInfoItem,Item]}, I, ST, WT, PP);
+f({prefer_nl,Sep,LItems}, I, ST, WT, PP) when I < 0 ->
+    f({seq,[],[],Sep,LItems}, I, ST, WT, PP);
+f({prefer_nl,Sep,LItems}, I0, ST, WT, PP) ->
+    CharsSize2L = fl(LItems, Sep, I0, [], ST, WT, PP),
     {_CharsL,Sizes} = unz(CharsSize2L),
     if
         Sizes =:= [] ->
@@ -864,37 +888,40 @@ f({prefer_nl,Sep,LItems}, I0, ST, WT) ->
         true ->
             {insert_newlines(CharsSize2L, I0, ST),nsz(lists:last(Sizes), I0)}
     end;
-f({string,S}, I, ST, WT) ->
-    f(write_a_string(S, I), I, ST, WT);
-f({hook,HookExpr,Precedence,Func}, I, _ST, _WT) ->
-    Chars = Func(HookExpr, I, Precedence, Func),
+f({char,C}, I, ST, WT, PP) ->
+    f(write_a_char(C, PP), I, ST, WT, PP);
+f({string,S}, I, ST, WT, PP) ->
+    f(write_a_string(S, I, PP), I, ST, WT, PP);
+f({hook,HookExpr,Precedence,Func,Options}, I, _ST, _WT, _PP) ->
+    Chars = Func(HookExpr, I, Precedence, Options),
     {Chars,indentation(Chars, I)};
-f({ehook,HookExpr,Precedence,{Mod,Func,Eas}=ModFuncEas}, I, _ST, _WT) ->
+f({ehook,HookExpr,Precedence,{Mod,Func,Eas}=ModFuncEas}, I, _ST, _WT, _PP) ->
     Chars = apply(Mod, Func, [HookExpr,I,Precedence,ModFuncEas|Eas]),
     {Chars,indentation(Chars, I)};
-f(WordName, _I, _ST, WT) -> % when is_atom(WordName)
+f(WordName, _I, _ST, WT, _PP) -> % when is_atom(WordName)
     word(WordName, WT).
 
 -define(IND, 4).
 
 %% fl(ListItems, I0, ST, WT) -> [[CharsSize1,CharsSize2]]
 %% ListItems = [{Item,Items}|Item]
-fl([], _Sep, I0, After, ST, WT) ->
-    [[f(After, I0, ST, WT),{[],0}]];
-fl(CItems, Sep0, I0, After, ST, WT) ->
+fl([], _Sep, I0, After, ST, WT, PP) ->
+    [[f(After, I0, ST, WT, PP),{[],0}]];
+fl(CItems, Sep0, I0, After, ST, WT, PP) ->
     F = fun({step,Item1,Item2}, S) ->
-                [f(Item1, I0, ST, WT),f([Item2,S], incr(I0, ?IND), ST, WT)];
+                [f(Item1, I0, ST, WT, PP),
+                 f([Item2,S], incr(I0, ?IND), ST, WT, PP)];
            ({cstep,Item1,Item2}, S) ->
-                {_,Sz1} = CharSize1 = f(Item1, I0, ST, WT),
+                {_,Sz1} = CharSize1 = f(Item1, I0, ST, WT, PP),
                 if
                     is_integer(Sz1), Sz1 < ?IND ->
                         Item2p = [leaf("\s"),Item2,S],
-                        [consecutive(Item2p, CharSize1, I0, ST, WT),{[],0}];
+                        [consecutive(Item2p, CharSize1, I0, ST, WT, PP),{[],0}];
                     true ->
-                        [CharSize1,f([Item2,S], incr(I0, ?IND), ST, WT)]
+                        [CharSize1,f([Item2,S], incr(I0, ?IND), ST, WT, PP)]
                 end;
            (Item, S) ->
-                [f([Item,S], I0, ST, WT),{[],0}]
+                [f([Item,S], I0, ST, WT, PP),{[],0}]
         end,
     {Sep,LastSep}  = case Sep0 of {_,_} -> Sep0; _ -> {Sep0,Sep0} end,
     fl1(CItems, F, Sep, LastSep, After).
@@ -906,10 +933,10 @@ fl1([CItem1,CItem2], F, _Sep, LastSep, After) ->
 fl1([CItem|CItems], F, Sep, LastSep, After) ->
     [F(CItem, Sep)|fl1(CItems, F, Sep, LastSep, After)].
 
-consecutive(Items, CharSize1, I0, ST, WT) ->
+consecutive(Items, CharSize1, I0, ST, WT, PP) ->
     {CharsSizes,_Length} =
         mapfoldl(fun(Item, Len) ->
-                         CharsSize = f(Item, Len, ST, WT),
+                         CharsSize = f(Item, Len, ST, WT, PP),
                          {CharsSize,indent(CharsSize, Len)}
                  end, indent(CharSize1, I0), Items),
     {CharsL,SizeL} = unz1([CharSize1|CharsSizes]),
@@ -999,26 +1026,40 @@ has_nl([C|Cs]) ->
 has_nl([]) ->
     false.
 
+write_a_char(C, PP) ->
+    flat_leaf(write_char(C, PP)).
+
 -define(MIN_SUBSTRING, 5).
 
-write_a_string(S, I) when I < 0; S =:= [] ->
-    leaf(write_string(S));
-write_a_string(S, I) ->
+write_a_string(S, I, PP) when I < 0; S =:= [] ->
+    flat_leaf(write_string(S, PP));
+write_a_string(S, I, PP) ->
     Len = erlang:max(?MAXLINE-I, ?MIN_SUBSTRING),
-    {list,write_a_string(S, Len, Len)}.
+    {list,write_a_string(S, Len, Len, PP)}.
 
-write_a_string([], _N, _Len) ->
+write_a_string([], _N, _Len, _PP) ->
     [];
-write_a_string(S, N, Len) ->
+write_a_string(S, N, Len, PP) ->
     SS = string:sub_string(S, 1, N),
-    Sl = write_string(SS),
-    case (iolist_size(Sl) > Len) and (N > ?MIN_SUBSTRING) of
+    Sl = write_string(SS, PP),
+    case (length(Sl) > Len) and (N > ?MIN_SUBSTRING) of
         true ->
-            write_a_string(S, N-1, Len);
+            write_a_string(S, N-1, Len, PP);
         false ->
-            [leaf(Sl)|write_a_string(lists:nthtail(length(SS), S), Len, Len)]
+            [flat_leaf(Sl) |
+             write_a_string(lists:nthtail(length(SS), S), Len, Len, PP)]
     end.
 
+flat_leaf(S) ->
+    L = lists:flatten(S),
+    {leaf,length(L),L}.
+
+write_string(S, PP) ->
+    lists:flatten((PP#pp.string_fun)(S)).
+
+write_char(C, PP) ->
+    lists:flatten((PP#pp.char_fun)(C)).
+
 %%
 %% Utilities
 %%
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 0c8735bb6d..bc0eaf015d 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -32,19 +33,19 @@
 %% 173 - 176    { - ~           punctuation
 %% 177          DEL             control
 %% 200 - 237                    control
-%% 240 - 277    NBSP - �        punctuation
-%% 300 - 326    � - �           uppercase
-%% 327          �               punctuation
-%% 330 - 336    � - �           uppercase
-%% 337 - 366    � - �           lowercase
-%% 367          �               punctuation
-%% 370 - 377    � - �           lowercase
+%% 240 - 277    NBSP - ¿        punctuation
+%% 300 - 326    À - Ö           uppercase
+%% 327          ×               punctuation
+%% 330 - 336    Ø - Þ           uppercase
+%% 337 - 366    ß - ö           lowercase
+%% 367          ÷               punctuation
+%% 370 - 377    ø - ÿ           lowercase
 %%
 %% Many punctuation characters have special meaning:
 %%  $\s, $_, $", $$, $%, $', $.
 %% DEL is a punctuation.
 %%
-%% Must watch using � \327, very close to x \170.
+%% Must watch using × \327, very close to x \170.
 
 -module(erl_scan).
 
@@ -55,7 +56,15 @@
          token_info/1,token_info/2,
          attributes_info/1,attributes_info/2,set_attribute/3]).
 
--export_type([error_info/0, line/0, return_cont/0, tokens_result/0]).
+%%% Private
+-export([continuation_location/1]).
+
+-export_type([error_info/0,
+              line/0,
+              location/0,
+              options/0,
+              return_cont/0,
+              tokens_result/0]).
 
 %%%
 %%% Defines and type definitions
@@ -74,7 +83,8 @@
 -type location() :: line() | {line(),column()}.
 -type resword_fun() :: fun((atom()) -> boolean()).
 -type option() :: 'return' | 'return_white_spaces' | 'return_comments'
-                | 'text' | {'reserved_word_fun', resword_fun()}.
+                | 'text' | {'reserved_word_fun', resword_fun()}
+                | 'unicode'.
 -type options() :: option() | [option()].
 -type symbol() :: atom() | float() | integer() | string().
 -type info_line() :: integer() | term().
@@ -95,7 +105,8 @@
         {resword_fun = fun reserved_word/1 :: resword_fun(),
          ws          = false               :: boolean(),
          comment     = false               :: boolean(),
-         text        = false               :: boolean()}).
+         text        = false               :: boolean(),
+         unicode     = false               :: boolean()}).
 
 %%----------------------------------------------------------------------------
 
@@ -183,6 +194,11 @@ tokens({erl_scan_continuation,Cs,Col,Toks,Line,St,Any,Fun},
        CharSpec, _Loc, _Opts) ->
     tokens1(Cs++CharSpec, St, Line, Col, Toks, Fun, Any).
 
+continuation_location({erl_scan_continuation,_,no_col,_,Line,_,_,_}) ->
+    Line;
+continuation_location({erl_scan_continuation,_,Col,_,Line,_,_,_}) ->
+    {Line,Col}.
+
 -type attribute_item() :: 'column' | 'length' | 'line'
                         | 'location' | 'text'.
 -type info_location() :: location() | term().
@@ -201,15 +217,14 @@ token_info(Token) ->
     Items = [category,column,length,line,symbol,text], % undefined order
     token_info(Token, Items).
 
--spec token_info(Token, TokenItem) -> TokenInfo | 'undefined' when
-      Token :: token(),
-      TokenItem :: token_item(),
-      TokenInfo :: TokenInfoTuple :: token_info();
-                (Token, TokenItems) -> [TokenInfo] when
-      Token :: token(),
-      TokenItems :: [TokenItem],
-      TokenItem :: token_item(),
-      TokenInfo :: [TokenInfoTuple :: token_info()].
+-spec token_info(Token, TokenItem) -> TokenInfoTuple | 'undefined' when
+                     Token :: token(),
+                     TokenItem :: token_item(),
+                     TokenInfoTuple :: token_info();
+                (Token, TokenItems) -> TokenInfo when
+                     Token :: token(),
+                     TokenItems :: [TokenItem :: token_item()],
+                     TokenInfo :: [TokenInfoTuple :: token_info()].
 token_info(_Token, []) ->
     [];
 token_info(Token, [Item|Items]) when is_atom(Item) ->
@@ -239,16 +254,15 @@ attributes_info(Attributes) ->
     Items = [column,length,line,text], % undefined order
     attributes_info(Attributes, Items).
 
--spec attributes_info(Attributes, AttributeItem) ->
-                        AttributeInfo | 'undefined' when
-      Attributes :: attributes(),
-      AttributeItem :: attribute_item(),
-      AttributeInfo :: AttributeInfoTuple :: attribute_info();
-                     (Attributes, AttributeItems) -> [AttributeInfo] when
-      Attributes :: attributes(),
-      AttributeItems :: [AttributeItem],
-      AttributeItem :: attribute_item(),
-      AttributeInfo :: [AttributeInfoTuple :: attribute_info()].
+-spec attributes_info
+        (Attributes, AttributeItem) -> AttributeInfoTuple | 'undefined' when
+             Attributes :: attributes(),
+             AttributeItem :: attribute_item(),
+             AttributeInfoTuple :: attribute_info();
+        (Attributes, AttributeItems) -> AttributeInfo when
+             Attributes :: attributes(),
+             AttributeItems :: [AttributeItem :: attribute_item()],
+             AttributeInfo :: [AttributeInfoTuple :: attribute_info()].
 attributes_info(_Attrs, []) ->
     [];
 attributes_info(Attrs, [A|As]) when is_atom(A) ->
@@ -324,13 +338,20 @@ string_thing(_) -> "string".
          (C >= $\000 andalso C =< $\s orelse C >= $\200 andalso C =< $\240)).
 -define(DIGIT(C), C >= $0, C =< $9).
 -define(CHAR(C), is_integer(C), C >= 0).
-
-%% A workaround: Unicode strings are not returned as strings, but as
-%% lists of integers. For instance, "b\x{aaa}c" => [98,2730,99]. This
-%% is to protect the system from character codes greater than 255. To
-%% be removed. Search for UNI to find workaround code.
+-define(UNICODE(C),
+         (C >= 0 andalso C < 16#D800 orelse
+          C > 16#DFFF andalso C < 16#FFFE orelse
+          C > 16#FFFF andalso C =< 16#10FFFF)).
+
+%% When the option 'unicode' is false: return Unicode strings as lists
+%% of integers and Unicode characters as integers. For instance,
+%% erl_scan:string("\"b\x{aaa}c\".") is equivalent to
+%% erl_scan:string("[98,2730,99]."). This is to protect the caller
+%% from character codes greater than 255. Search for UNI to find code
+%% implementing this "feature". The 'unicode' option is undocumented
+%% and will probably be removed later.
 -define(NO_UNICODE, 0).
--define(UNI255(C), (C) =< 16#ff).
+-define(UNI255(C), (C =< 16#ff)).
 
 options(Opts0) when is_list(Opts0) ->
     Opts = lists:foldr(fun expand_opt/2, [], Opts0),
@@ -344,10 +365,12 @@ options(Opts0) when is_list(Opts0) ->
     Comment = proplists:get_bool(return_comments, Opts),
     WS = proplists:get_bool(return_white_spaces, Opts),
     Txt = proplists:get_bool(text, Opts),
+    Unicode = proplists:get_bool(unicode, Opts),
     #erl_scan{resword_fun = RW_fun,
               comment     = Comment,
               ws          = WS,
-              text        = Txt};
+              text        = Txt,
+              unicode     = Unicode};
 options(Opt) ->
     options([Opt]).
 
@@ -513,9 +536,9 @@ scan1([$$|Cs], St, Line, Col, Toks) ->
     scan_char(Cs, St, Line, Col, Toks);
 scan1([$\r|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
     white_space_end(Cs, St, Line, Col, Toks, 1, "\r");
-scan1([C|Cs], St, Line, Col, Toks) when C >= $�, C =< $�, C =/= $� ->
+scan1([C|Cs], St, Line, Col, Toks) when C >= $ß, C =< $ÿ, C =/= $÷ ->
     scan_atom(Cs, St, Line, Col, Toks, [C]);
-scan1([C|Cs], St, Line, Col, Toks) when C >= $�, C =< $�, C /= $� ->
+scan1([C|Cs], St, Line, Col, Toks) when C >= $À, C =< $Þ, C /= $× ->
     scan_variable(Cs, St, Line, Col, Toks, [C]);
 scan1([$\t|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
     scan_tabs(Cs, St, Line, Col, Toks, 1);
@@ -628,15 +651,12 @@ scan1([$~|Cs], St, Line, Col, Toks) ->
 scan1([$&|Cs], St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, "&", '&', 1);
 %% End of optimization.
-scan1([C|Cs], St, Line, Col, Toks) when ?CHAR(C) ->
+scan1([C|Cs], St, Line, Col, Toks) when ?CHAR(C), ?UNI255(C) ->
     Str = [C],
-    case catch list_to_atom(Str) of
-        Sym when is_atom(Sym) ->
-            tok2(Cs, St, Line, Col, Toks, Str, Sym, 1);
-        _ ->
-            Ncol = incr_column(Col, 1),
-            scan_error({illegal,character}, Line, Col, Line, Ncol, Cs)
-    end;
+    tok2(Cs, St, Line, Col, Toks, Str, list_to_atom(Str), 1);
+scan1([C|Cs], _St, Line, Col, _Toks) when ?CHAR(C) ->
+    Ncol = incr_column(Col, 1),
+    scan_error({illegal,character}, Line, Col, Line, Ncol, Cs);
 scan1([]=Cs, _St, Line, Col, Toks) ->
     {more,{Cs,Col,Toks,Line,[],fun scan/6}};
 scan1(eof=Cs, _St, Line, Col, Toks) ->
@@ -685,9 +705,9 @@ scan_name([C|Cs], Ncs) when ?DIGIT(C) ->
     scan_name(Cs, [C|Ncs]);
 scan_name([$@=C|Cs], Ncs) ->
     scan_name(Cs, [C|Ncs]);
-scan_name([C|Cs], Ncs) when C >= $�, C =< $�, C =/= $� ->
+scan_name([C|Cs], Ncs) when C >= $ß, C =< $ÿ, C =/= $÷ ->
     scan_name(Cs, [C|Ncs]);
-scan_name([C|Cs], Ncs) when C >= $�, C =< $�, C =/= $� ->
+scan_name([C|Cs], Ncs) when C >= $À, C =< $Þ, C =/= $× ->
     scan_name(Cs, [C|Ncs]);
 scan_name([], Ncs) ->
     {more,Ncs};
@@ -834,32 +854,44 @@ scan_char([$\\|Cs]=Cs0, St, Line, Col, Toks) ->
         {eof,Ncol} ->
             scan_error(char, Line, Col, Line, Ncol, eof);
         {nl,Val,Str,Ncs,Ncol} ->
-            Attrs = attributes(Line, Col, St, "$\\"++Str),
+            Attrs = attributes(Line, Col, St, "$\\"++Str), %"
             Ntoks = [{char,Attrs,Val}|Toks],
             scan1(Ncs, St, Line+1, Ncol, Ntoks);
         {unicode,Val,Str,Ncs,Ncol} ->
-            Attrs = attributes(Line, Col, St, "$\\"++Str),
-            Ntoks = [{integer,Attrs,Val}|Toks], % UNI
+            Attrs = attributes(Line, Col, St, "$\\"++Str), %"
+            Tag = char_tag(Val, St), % UNI
+            Ntoks = [{Tag,Attrs,Val}|Toks],
             scan1(Ncs, St, Line, Ncol, Ntoks);
         {Val,Str,Ncs,Ncol} ->
-            Attrs = attributes(Line, Col, St, "$\\"++Str),
+            Attrs = attributes(Line, Col, St, "$\\"++Str), %"
             Ntoks = [{char,Attrs,Val}|Toks],
             scan1(Ncs, St, Line, Ncol, Ntoks)
     end;
 scan_char([$\n=C|Cs], St, Line, Col, Toks) ->
     Attrs = attributes(Line, Col, St, [$$,C]),
     scan1(Cs, St, Line+1, new_column(Col, 1), [{char,Attrs,C}|Toks]);
-scan_char([C|Cs], St, Line, Col, Toks) when ?CHAR(C) ->
-    Tag = if ?UNI255(C) -> char; true -> integer end, % UNI
+scan_char([C|Cs], St, Line, Col, Toks) when ?UNICODE(C) ->
+    Tag = char_tag(C, St), % UNI
     Attrs = attributes(Line, Col, St, [$$,C]),
     scan1(Cs, St, Line, incr_column(Col, 2), [{Tag,Attrs,C}|Toks]);
+scan_char([C|_Cs], _St, Line, Col, _Toks) when ?CHAR(C) ->
+    scan_error({illegal,character}, Line, Col, Line, incr_column(Col, 1), eof);
 scan_char([], _St, Line, Col, Toks) ->
     {more,{[$$],Col,Toks,Line,[],fun scan/6}};
 scan_char(eof, _St, Line, Col, _Toks) ->
     scan_error(char, Line, Col, Line, incr_column(Col, 1), eof).
 
+-compile({inline,[char_tag/2]}).
+
+char_tag(C, _St) when ?UNI255(C) ->
+    char;
+char_tag(_C, #erl_scan{unicode = true}) ->
+    char;
+char_tag(_C, _St) ->
+    integer.
+
 scan_string(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0,Uni0}) ->
-    case scan_string0(Cs, St, Line, Col, $\", Str, Wcs, Uni0) of
+    case scan_string0(Cs, St, Line, Col, $\", true, Str, Wcs, Uni0) of %"
         {more,Ncs,Nline,Ncol,Nstr,Nwcs,Uni} ->
             State = {Nwcs,Nstr,Line0,Col0,Uni},
             {more,{Ncs,Ncol,Toks,Nline,State,fun scan_string/6}};
@@ -867,8 +899,9 @@ scan_string(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0,Uni0}) ->
             scan_error(Error, Nline, Ncol, Nline, EndCol, Ncs);
         {error,Nline,Ncol,Nwcs,Ncs} ->
             Estr = string:substr(Nwcs, 1, 16), % Expanded escape chars.
-            scan_error({string,$\",Estr}, Line0, Col0, Nline, Ncol, Ncs);
-        {Ncs,Nline,Ncol,Nstr,Nwcs,?NO_UNICODE} ->
+            scan_error({string,$\",Estr}, Line0, Col0, Nline, Ncol, Ncs); %"
+        {Ncs,Nline,Ncol,Nstr,Nwcs,Uni} when Uni =:= ?NO_UNICODE;
+                                            St#erl_scan.unicode ->
             Attrs = attributes(Line0, Col0, St, Nstr),
             scan1(Ncs, St, Nline, Ncol, [{string,Attrs,Nwcs}|Toks]);
         {Ncs,Nline,Ncol,Nstr,_Nwcs,_Uni} ->
@@ -920,7 +953,8 @@ unicode_tokens(Line, Col, Str, Val, St, Toks, Cs, Cline, Ccol) ->
     [{',',attributes(Cline, Ccol, St, "")} || Cs =/= "\""] ++ [Token|Toks].
 
 scan_qatom(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0,Uni0}) ->
-    case scan_string0(Cs, St, Line, Col, $\', Str, Wcs, Uni0) of
+    AllowUni = St#erl_scan.unicode,
+    case scan_string0(Cs, St, Line, Col, $\', AllowUni, Str, Wcs, Uni0) of %'
         {more,Ncs,Nline,Ncol,Nstr,Nwcs,Uni} ->
             State = {Nwcs,Nstr,Line0,Col0,Uni},
             {more,{Ncs,Ncol,Toks,Nline,State,fun scan_qatom/6}};
@@ -928,8 +962,9 @@ scan_qatom(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0,Uni0}) ->
             scan_error(Error, Nline, Ncol, Nline, EndCol, Ncs);
         {error,Nline,Ncol,Nwcs,Ncs} ->
             Estr = string:substr(Nwcs, 1, 16), % Expanded escape chars.
-            scan_error({string,$\',Estr}, Line0, Col0, Nline, Ncol, Ncs);
-        {Ncs,Nline,Ncol,Nstr,Nwcs,?NO_UNICODE} ->
+            scan_error({string,$\',Estr}, Line0, Col0, Nline, Ncol, Ncs); %'
+        {Ncs,Nline,Ncol,Nstr,Nwcs,Uni} ->
+            true = Uni =:= ?NO_UNICODE orelse AllowUni,
             case catch list_to_atom(Nwcs) of
                 A when is_atom(A) ->
                     Attrs = attributes(Line0, Col0, St, Nstr),
@@ -939,38 +974,40 @@ scan_qatom(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0,Uni0}) ->
             end
     end.
 
-scan_string0(Cs, #erl_scan{text=false}, Line, no_col=Col, Q, [], Wcs, Uni) ->
-    scan_string_no_col(Cs, Line, Col, Q, Wcs, Uni);
-scan_string0(Cs, #erl_scan{text=true}, Line, no_col=Col, Q, Str, Wcs, Uni) ->
-    scan_string1(Cs, Line, Col, Q, Str, Wcs, Uni);
-scan_string0(Cs, _St, Line, Col, Q, [], Wcs, Uni) ->
-    scan_string_col(Cs, Line, Col, Q, Wcs, Uni);
-scan_string0(Cs, _St, Line, Col, Q, Str, Wcs, Uni) ->
-    scan_string1(Cs, Line, Col, Q, Str, Wcs, Uni).
+scan_string0(Cs, #erl_scan{text=false}, Line, no_col=Col, Q, U, [], Wcs, Uni) ->
+    scan_string_no_col(Cs, Line, Col, Q, U, Wcs, Uni);
+scan_string0(Cs, #erl_scan{text=true}, Line, no_col=Col, Q, U, Str, Wcs, Uni) ->
+    scan_string1(Cs, Line, Col, Q, U, Str, Wcs, Uni);
+scan_string0(Cs, _St, Line, Col, Q, U, [], Wcs, Uni) ->
+    scan_string_col(Cs, Line, Col, Q, U, Wcs, Uni);
+scan_string0(Cs, _St, Line, Col, Q, U, Str, Wcs, Uni) ->
+    scan_string1(Cs, Line, Col, Q, U, Str, Wcs, Uni).
 
 %% Optimization. Col =:= no_col.
-scan_string_no_col([Q|Cs], Line, Col, Q, Wcs, Uni) ->
+scan_string_no_col([Q|Cs], Line, Col, Q, _U, Wcs, Uni) ->
     {Cs,Line,Col,_DontCare=[],lists:reverse(Wcs),Uni};
-scan_string_no_col([$\n=C|Cs], Line, Col, Q, Wcs, Uni) ->
-    scan_string_no_col(Cs, Line+1, Col, Q, [C|Wcs], Uni);
-scan_string_no_col([C|Cs], Line, Col, Q, Wcs, Uni) when C =/= $\\,
-                                                        ?CHAR(C), ?UNI255(C) ->
-    scan_string_no_col(Cs, Line, Col, Q, [C|Wcs], Uni);
-scan_string_no_col(Cs, Line, Col, Q, Wcs, Uni) ->
-    scan_string1(Cs, Line, Col, Q, Wcs, Wcs, Uni).
+scan_string_no_col([$\n=C|Cs], Line, Col, Q, U, Wcs, Uni) ->
+    scan_string_no_col(Cs, Line+1, Col, Q, U, [C|Wcs], Uni);
+scan_string_no_col([C|Cs], Line, Col, Q, U, Wcs, Uni) when C =/= $\\,
+                                                           ?CHAR(C),
+                                                           ?UNI255(C) ->
+    scan_string_no_col(Cs, Line, Col, Q, U, [C|Wcs], Uni);
+scan_string_no_col(Cs, Line, Col, Q, U, Wcs, Uni) ->
+    scan_string1(Cs, Line, Col, Q, U, Wcs, Wcs, Uni).
 
 %% Optimization. Col =/= no_col.
-scan_string_col([Q|Cs], Line, Col, Q, Wcs0, Uni) ->
+scan_string_col([Q|Cs], Line, Col, Q, _U, Wcs0, Uni) ->
     Wcs = lists:reverse(Wcs0),
     Str = [Q|Wcs++[Q]],
     {Cs,Line,Col+1,Str,Wcs,Uni};
-scan_string_col([$\n=C|Cs], Line, _xCol, Q, Wcs, Uni) ->
-    scan_string_col(Cs, Line+1, 1, Q, [C|Wcs], Uni);
-scan_string_col([C|Cs], Line, Col, Q, Wcs, Uni) when C =/= $\\,
-                                                     ?CHAR(C), ?UNI255(C) ->
-    scan_string_col(Cs, Line, Col+1, Q, [C|Wcs], Uni);
-scan_string_col(Cs, Line, Col, Q, Wcs, Uni) ->
-    scan_string1(Cs, Line, Col, Q, Wcs, Wcs, Uni).
+scan_string_col([$\n=C|Cs], Line, _xCol, Q, U, Wcs, Uni) ->
+    scan_string_col(Cs, Line+1, 1, Q, U, [C|Wcs], Uni);
+scan_string_col([C|Cs], Line, Col, Q, U, Wcs, Uni) when C =/= $\\,
+                                                        ?CHAR(C),
+                                                        ?UNI255(C) ->
+    scan_string_col(Cs, Line, Col+1, Q, U, [C|Wcs], Uni);
+scan_string_col(Cs, Line, Col, Q, U, Wcs, Uni) ->
+    scan_string1(Cs, Line, Col, Q, U, Wcs, Wcs, Uni).
 
 %% UNI_STR is to be replaced by STR when the Unicode-string-to-list
 %% workaround is eventually removed.
@@ -981,14 +1018,14 @@ scan_string_col(Cs, Line, Col, Q, Wcs, Uni) ->
 %% but then the end location of the error tuple would not correspond
 %% to the start location of the returned Rest string. (Maybe the end
 %% location could be modified, but that too is ugly.)
-scan_string1([Q|Cs], Line, Col, Q, Str0, Wcs0, Uni) ->
+scan_string1([Q|Cs], Line, Col, Q, _U, Str0, Wcs0, Uni) ->
     Wcs = lists:reverse(Wcs0),
     Str = ?UNI_STR(Col, [Q|lists:reverse(Str0, [Q])]),
     {Cs,Line,incr_column(Col, 1),Str,Wcs,Uni};
-scan_string1([$\n=C|Cs], Line, Col, Q, Str, Wcs, Uni) ->
+scan_string1([$\n=C|Cs], Line, Col, Q, U, Str, Wcs, Uni) ->
     Ncol = new_column(Col, 1),
-    scan_string1(Cs, Line+1, Ncol, Q, ?UNI_STR(Col, [C|Str]), [C|Wcs], Uni);
-scan_string1([$\\|Cs]=Cs0, Line, Col, Q, Str, Wcs, Uni) ->
+    scan_string1(Cs, Line+1, Ncol, Q, U, ?UNI_STR(Col, [C|Str]), [C|Wcs], Uni);
+scan_string1([$\\|Cs]=Cs0, Line, Col, Q, U, Str, Wcs, Uni) ->
     case scan_escape(Cs, Col) of
         more ->
             {more,Cs0,Line,Col,Str,Wcs,Uni};
@@ -999,31 +1036,33 @@ scan_string1([$\\|Cs]=Cs0, Line, Col, Q, Str, Wcs, Uni) ->
         {nl,Val,ValStr,Ncs,Ncol} ->
             Nstr = ?UNI_STR(Ncol, lists:reverse(ValStr, [$\\|Str])),
             Nwcs = [Val|Wcs],
-            scan_string1(Ncs, Line+1, Ncol, Q, Nstr, Nwcs, Uni);
-        {unicode,_Val,_ValStr,Ncs,Ncol} when Q =:= $' -> %' Emacs
+            scan_string1(Ncs, Line+1, Ncol, Q, U, Nstr, Nwcs, Uni);
+        {unicode,_Val,_ValStr,Ncs,Ncol} when not U -> %' Emacs
             {char_error,Ncs,{illegal,character},Line,Col,incr_column(Ncol, 1)};
         {unicode,Val,ValStr,Ncs,Ncol} -> % UNI. Uni is set to Val.
             Nstr = ?UNI_STR(Ncol, lists:reverse(ValStr, [$\\|Str])),
             Nwcs = [Val|Wcs], % not used
-            scan_string1(Ncs, Line, incr_column(Ncol, 1), Q, Nstr, Nwcs, Val);
+            scan_string1(Ncs, Line, incr_column(Ncol, 1), Q, U, Nstr, Nwcs, Val);
         {Val,ValStr,Ncs,Ncol} ->
             Nstr = ?UNI_STR(Ncol, lists:reverse(ValStr, [$\\|Str])),
             Nwcs = [Val|Wcs],
-            scan_string1(Ncs, Line, incr_column(Ncol, 1), Q, Nstr, Nwcs, Uni)
+            scan_string1(Ncs, Line, incr_column(Ncol, 1), Q, U, Nstr, Nwcs, Uni)
     end;
-scan_string1([C|Cs], Line, no_col=Col, Q, Str, Wcs, Uni) when ?CHAR(C),
-                                                              ?UNI255(C) ->
-    %% scan_string1(Cs, Line, Col, Q, Str, [C|Wcs], Uni);
-    scan_string1(Cs, Line, Col, Q, [C|Str], [C|Wcs], Uni); % UNI
-scan_string1([C|Cs], Line, Col, Q, Str, Wcs, Uni) when ?CHAR(C), ?UNI255(C) ->
-    scan_string1(Cs, Line, Col+1, Q, [C|Str], [C|Wcs], Uni);
-scan_string1([C|Cs], Line, Col, $', _Str, _Wcs, _Uni) when ?CHAR(C) -> %' UNI
+scan_string1([C|Cs], Line, no_col=Col, Q, U, Str, Wcs, Uni) when ?CHAR(C),
+                                                                 ?UNI255(C) ->
+    %% scan_string1(Cs, Line, Col, Q, U, Str, [C|Wcs], Uni);
+    scan_string1(Cs, Line, Col, Q, U, [C|Str], [C|Wcs], Uni); % UNI
+scan_string1([C|Cs], Line, Col, Q, U, Str, Wcs, Uni) when ?CHAR(C), ?UNI255(C) ->
+    scan_string1(Cs, Line, Col+1, Q, U, [C|Str], [C|Wcs], Uni);
+scan_string1([C|Cs], Line, Col, _Q, false, _Str, _Wcs, _Uni) when ?CHAR(C) -> %' UNI
+    {char_error,Cs,{illegal,character},Line,Col,incr_column(Col, 1)};
+scan_string1([C|Cs], Line, Col, Q, U, Str, Wcs, _Uni) when ?UNICODE(C) ->
+    scan_string1(Cs, Line, incr_column(Col, 1), Q, U, [C|Str], [C|Wcs], C);
+scan_string1([C|Cs], Line, Col, _Q, _U, _Str, _Wcs, _Uni) when ?CHAR(C) -> % UNI
     {char_error,Cs,{illegal,character},Line,Col,incr_column(Col, 1)};
-scan_string1([C|Cs], Line, Col, Q, Str, Wcs, _Uni) when ?CHAR(C) -> % UNI
-    scan_string1(Cs, Line, incr_column(Col, 1), Q, [C|Str], [C|Wcs], C);
-scan_string1([]=Cs, Line, Col, _Q, Str, Wcs, Uni) ->
+scan_string1([]=Cs, Line, Col, _Q, _U, Str, Wcs, Uni) ->
     {more,Cs,Line,Col,Str,Wcs,Uni};
-scan_string1(eof, Line, Col, _Q, _Str, Wcs, _Uni) ->
+scan_string1(eof, Line, Col, _Q, _U, _Str, Wcs, _Uni) ->
     {error,Line,Col,lists:reverse(Wcs),eof}.
 
 -define(OCT(C), C >= $0, C =< $7).
@@ -1074,8 +1113,10 @@ scan_escape([$\n=C|Cs], Col) ->
 scan_escape([C0|Cs], Col) when ?CHAR(C0), ?UNI255(C0) ->
     C = escape_char(C0),
     {C,?UNI_STR(Col, [C0]),Cs,incr_column(Col, 1)};
-scan_escape([C|Cs], Col) when ?CHAR(C) -> % UNI
+scan_escape([C|Cs], Col) when ?UNICODE(C) ->
     {unicode,C,?UNI_STR(Col, [C]),Cs,incr_column(Col, 1)};
+scan_escape([C|Cs], Col) when ?CHAR(C) -> % UNI
+    {error,Cs,{illegal,character},incr_column(Col, 1)};
 scan_escape([], _Col) ->
     more;
 scan_escape(eof, Col) ->
@@ -1093,7 +1134,7 @@ scan_esc_end([$}|Cs], Col, Wcs0, B, Str0) ->
     case catch erlang:list_to_integer(Wcs, B) of
         Val when Val =< 16#FF ->
             {Val,?UNI_STR(Col, Str0++Wcs++[$}]),Cs,incr_column(Col, 1)};
-        Val when Val =< 16#10FFFF ->
+        Val when ?UNICODE(Val) ->
             {unicode,Val,?UNI_STR(Col, Str0++Wcs++[$}]),Cs,incr_column(Col,1)};
         _ ->
             {error,Cs,{illegal,character},incr_column(Col, 1)}
@@ -1199,18 +1240,36 @@ float_end(Cs, St, Line, Col, Toks, Ncs0) ->
             scan_error({illegal,float}, Line, Col, Line, Ncol, Cs)
     end.
 
-skip_comment([C|Cs], St, Line, Col, Toks, N) when C =/= $\n, ?CHAR(C) ->
-    skip_comment(Cs, St, Line, Col, Toks, N+1);
-skip_comment([]=Cs, _St, Line, Col, Toks, N) ->
-    {more,{Cs,Col,Toks,Line,N,fun skip_comment/6}};
 skip_comment(Cs, St, Line, Col, Toks, N) ->
+    skip_comment(Cs, St, Line, Col, Toks, N, St#erl_scan.unicode).
+
+skip_comment([C|Cs], St, Line, Col, Toks, N, U) when C =/= $\n, ?CHAR(C) ->
+    case ?UNI255(C) orelse U andalso ?UNICODE(C) of
+        true ->
+            skip_comment(Cs, St, Line, Col, Toks, N+1, U);
+        false ->
+            Ncol = incr_column(Col, N+1),
+            scan_error({illegal,character}, Line, Col, Line, Ncol, Cs)
+    end;
+skip_comment([]=Cs, _St, Line, Col, Toks, N, _U) ->
+    {more,{Cs,Col,Toks,Line,N,fun skip_comment/6}};
+skip_comment(Cs, St, Line, Col, Toks, N, _U) ->
     scan1(Cs, St, Line, incr_column(Col, N), Toks).
 
-scan_comment([C|Cs], St, Line, Col, Toks, Ncs) when C =/= $\n, ?CHAR(C) ->
-    scan_comment(Cs, St, Line, Col, Toks, [C|Ncs]);
-scan_comment([]=Cs, _St, Line, Col, Toks, Ncs) ->
+scan_comment(Cs, St, Line, Col, Toks, Ncs) ->
+    scan_comment(Cs, St, Line, Col, Toks, Ncs, St#erl_scan.unicode).
+
+scan_comment([C|Cs], St, Line, Col, Toks, Ncs, U) when C =/= $\n, ?CHAR(C) ->
+    case ?UNI255(C) orelse U andalso ?UNICODE(C) of
+        true ->
+            scan_comment(Cs, St, Line, Col, Toks, [C|Ncs], U);
+        false ->
+            Ncol = incr_column(Col, length(Ncs)+1),
+            scan_error({illegal,character}, Line, Col, Line, Ncol, Cs)
+    end;
+scan_comment([]=Cs, _St, Line, Col, Toks, Ncs, _U) ->
     {more,{Cs,Col,Toks,Line,Ncs,fun scan_comment/6}};
-scan_comment(Cs, St, Line, Col, Toks, Ncs0) ->
+scan_comment(Cs, St, Line, Col, Toks, Ncs0, _U) ->
     Ncs = lists:reverse(Ncs0),
     tok3(Cs, St, Line, Col, Toks, comment, Ncs, Ncs).
 
@@ -1345,7 +1404,6 @@ reserved_word('fun') -> true;
 reserved_word('if') -> true;
 reserved_word('let') -> true;
 reserved_word('of') -> true;
-reserved_word('query') -> true;
 reserved_word('receive') -> true;
 reserved_word('when') -> true;
 reserved_word('bnot') -> true;
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 498d850df3..99a9d138ac 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -710,7 +710,7 @@ epp_parse_file2(Epp, S, Forms, Parsed) ->
                     epp_parse_file(Epp, S, [Form | Forms])
             end;
         {error,{Ln,Mod,Args}} = Form ->
-            io:format("~s:~w: ~s\n",
+            io:format("~s:~w: ~ts\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} = Eof ->
@@ -780,10 +780,10 @@ report_errors(Errors) ->
                   Errors).
 
 list_errors(F, [{Line,Mod,E}|Es]) ->
-    io:fwrite("~s:~w: ~s\n", [F,Line,Mod:format_error(E)]),
+    io:fwrite("~s:~w: ~ts\n", [F,Line,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(F, [{Mod,E}|Es]) ->
-    io:fwrite("~s: ~s\n", [F,Mod:format_error(E)]),
+    io:fwrite("~s: ~ts\n", [F,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(_F, []) -> ok.
 
@@ -795,10 +795,10 @@ report_warnings(Ws0) ->
     lists:foreach(fun({_,Str}) -> io:put_chars(Str) end, Ws).
 
 format_message(F, [{Line,Mod,E}|Es]) ->
-    M = {{F,Line},io_lib:format("~s:~w: Warning: ~s\n", [F,Line,Mod:format_error(E)])},
+    M = {{F,Line},io_lib:format("~s:~w: Warning: ~ts\n", [F,Line,Mod:format_error(E)])},
     [M|format_message(F, Es)];
 format_message(F, [{Mod,E}|Es]) ->
-    M = {none,io_lib:format("~s: Warning: ~s\n", [F,Mod:format_error(E)])},
+    M = {none,io_lib:format("~s: Warning: ~ts\n", [F,Mod:format_error(E)])},
     [M|format_message(F, Es)];
 format_message(_, []) -> [].
 
@@ -851,12 +851,27 @@ eval_exprs([E|Es], Bs0, Lf, Ef, RBs) ->
     eval_exprs(Es, Bs, Lf, Ef, RBs).
 
 format_exception(Class, Reason) ->
+    Enc = encoding(),
+    P = case Enc of
+            latin1 -> "P";
+            _ -> "tP"
+        end,
     PF = fun(Term, I) ->
-                 io_lib:format("~." ++ integer_to_list(I) ++ "P", [Term, 50])
+                 io_lib:format("~." ++ integer_to_list(I) ++ P, [Term, 50])
          end,
     StackTrace = erlang:get_stacktrace(),
     StackFun = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
-    lib:format_exception(1, Class, Reason, StackTrace, StackFun, PF).
+    lib:format_exception(1, Class, Reason, StackTrace, StackFun, PF, Enc).
+
+encoding() ->
+    [{encoding, Encoding}] = enc(),
+    Encoding.
+
+enc() ->
+    case lists:keyfind(encoding, 1, io:getopts()) of
+        false -> [{encoding,latin1}]; % should never happen
+        Enc -> [Enc]
+    end.
 
 fatal(Str) ->
     throw(Str).
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index 59d6de5d10..0c50eb34e6 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -878,7 +878,7 @@ filter_options(_Base, [], Result) ->
 %% Gets the source file given path of object code and module name.
 
 get_source_file(Obj, Mod, Rules) ->
-    source_by_rules(dirname(Obj), packages:last(Mod), Rules).
+    source_by_rules(dirname(Obj), atom_to_list(Mod), Rules).
 
 source_by_rules(Dir, Base, [{From, To}|Rest]) ->
     case try_rule(Dir, Base, From, To) of
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl
index 391f1cff64..ba35a7170a 100644
--- a/lib/stdlib/src/gb_sets.erl
+++ b/lib/stdlib/src/gb_sets.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -165,7 +166,7 @@
 -export([new/0, is_element/2, add_element/2, del_element/2,
 	 subtract/2]).
 
-%% GB-trees adapted from Sven-Olof Nystr�m's implementation for
+%% GB-trees adapted from Sven-Olof Nyström's implementation for
 %% representation of sets.
 %%
 %% Data structures:
diff --git a/lib/stdlib/src/gb_trees.erl b/lib/stdlib/src/gb_trees.erl
index 258713c90f..de0c239e26 100644
--- a/lib/stdlib/src/gb_trees.erl
+++ b/lib/stdlib/src/gb_trees.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -19,7 +20,7 @@
 %% =====================================================================
 %% General Balanced Trees - highly efficient dictionaries.
 %%
-%% Copyright (C) 1999-2001 Sven-Olof Nystr�m, Richard Carlsson
+%% Copyright (C) 1999-2001 Sven-Olof Nyström, Richard Carlsson
 %%
 %% An efficient implementation of Prof. Arne Andersson's General
 %% Balanced Trees. These have no storage overhead compared to plain
diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index 9f65bbfa3a..ecf2aeb375 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %%
 %% The 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,28 +22,28 @@
 	 get_chars/2,get_chars/3,get_line/1,get_line/2,
 	 get_password/0, get_password/1,
 	 setopts/1, setopts/2, getopts/0, getopts/1]).
--export([write/1,write/2,read/1,read/2,read/3]).
+-export([write/1,write/2,read/1,read/2,read/3,read/4]).
 -export([columns/0,columns/1,rows/0,rows/1]).
 -export([fwrite/1,fwrite/2,fwrite/3,fread/2,fread/3,
 	 format/1,format/2,format/3]).
--export([scan_erl_exprs/1,scan_erl_exprs/2,scan_erl_exprs/3,
-	 scan_erl_form/1,scan_erl_form/2,scan_erl_form/3,
+-export([scan_erl_exprs/1,scan_erl_exprs/2,scan_erl_exprs/3,scan_erl_exprs/4,
+	 scan_erl_form/1,scan_erl_form/2,scan_erl_form/3,scan_erl_form/4,
 	 parse_erl_exprs/1,parse_erl_exprs/2,parse_erl_exprs/3,
-	 parse_erl_form/1,parse_erl_form/2,parse_erl_form/3]).
+         parse_erl_exprs/4,parse_erl_form/1,parse_erl_form/2,
+         parse_erl_form/3,parse_erl_form/4]).
 -export([request/1,request/2,requests/1,requests/2]).
 
--export_type([device/0, format/0]).
+-export_type([device/0, format/0, server_no_data/0]).
 
 %%-------------------------------------------------------------------------
 
 -type device() :: atom() | pid().
 -type prompt() :: atom() | string().
 
--type error_description() :: term(). % Whatever the io-server sends.
--type request_error() :: {'error',error_description()}.
+%% ErrorDescription is whatever the I/O-server sends.
+-type server_no_data() :: {'error', ErrorDescription :: term()} | 'eof'.
 
-%% XXX: Some uses of line() in this file may need to read erl_scan:location()
--type line()   :: pos_integer().
+-type location() :: erl_scan:location().
 
 %%-------------------------------------------------------------------------
 
@@ -73,9 +73,9 @@ o_request(Io, Request, Func) ->
 put_chars(Chars) ->
     put_chars(default_output(), Chars).
 
--spec put_chars(IoDevice, IoData) -> 'ok' when
+-spec put_chars(IoDevice, CharData) -> 'ok' when
       IoDevice :: device(),
-      IoData :: unicode:chardata().
+      CharData :: unicode:chardata().
 
 put_chars(Io, Chars) ->
     o_request(Io, {put_chars,unicode,Chars}, put_chars).
@@ -124,7 +124,7 @@ rows(Io) ->
 	    {error,enotsup}
     end.    
 
--spec get_chars(Prompt, Count) -> Data | 'eof' when
+-spec get_chars(Prompt, Count) -> Data | server_no_data() when
       Prompt :: prompt(),
       Count :: non_neg_integer(),
       Data :: [unicode:unicode_char()] | unicode:unicode_binary().
@@ -132,25 +132,23 @@ rows(Io) ->
 get_chars(Prompt, N) ->
     get_chars(default_input(), Prompt, N).
 
--spec get_chars(IoDevice, Prompt, Count) -> Data | 'eof' | {error, Reason} when
+-spec get_chars(IoDevice, Prompt, Count) -> Data | server_no_data() when
       IoDevice :: device(),
       Prompt :: prompt(),
       Count :: non_neg_integer(),
-      Reason :: term(),
       Data :: [unicode:unicode_char()] | unicode:unicode_binary().
 
 get_chars(Io, Prompt, N) when is_integer(N), N >= 0 ->
     request(Io, {get_chars,unicode,Prompt,N}).
 
--spec get_line(Prompt) -> Data | 'eof' | {'error', Reason} when
+-spec get_line(Prompt) -> Data | server_no_data() when
       Prompt :: prompt(),
-      Reason :: term(),
       Data :: [unicode:unicode_char()] | unicode:unicode_binary().
 
 get_line(Prompt) ->
     get_line(default_input(), Prompt).
 
--spec get_line(IoDevice, Prompt) -> Data | 'eof' | {'error', term()} when
+-spec get_line(IoDevice, Prompt) -> Data | server_no_data() when
       IoDevice :: device(),
       Prompt :: prompt(),
       Data :: [unicode:unicode_char()] | unicode:unicode_binary().
@@ -219,8 +217,9 @@ write(Io, Term) ->
 -spec read(Prompt) -> Result when
       Prompt :: prompt(),
       Result :: {'ok', Term :: term()}
-              | 'eof'
-              | {'error', ErrorInfo :: erl_scan:error_info()}.
+              | server_no_data()
+              | {'error', ErrorInfo},
+      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info().
 
 % Read does not use get_until as erl_scan does not work with unicode
 % XXX:PaN fixme?
@@ -231,8 +230,9 @@ read(Prompt) ->
       IoDevice :: device(),
       Prompt :: prompt(),
       Result :: {'ok', Term :: term()}
-              | 'eof'
-              | {'error', ErrorInfo :: erl_scan:error_info()}.
+              | server_no_data()
+              | {'error', ErrorInfo},
+      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info().
 
 read(Io, Prompt) ->
     case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[1]}) of
@@ -248,24 +248,41 @@ read(Io, Prompt) ->
 	    Other
     end.
 
--spec read(IoDevice, Prompt, StartLine) -> Result when
+-spec read(IoDevice, Prompt, StartLocation) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLocation :: location(),
+      Result :: {'ok', Term :: term(), EndLocation :: location()}
+              | {'eof', EndLocation :: location()}
+              | server_no_data()
+              | {'error', ErrorInfo, ErrorLocation :: location()},
+      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info().
+
+read(Io, Prompt, Pos0) ->
+    read(Io, Prompt, Pos0, []).
+
+-spec read(IoDevice, Prompt, StartLocation, Options) -> Result when
       IoDevice :: device(),
       Prompt :: prompt(),
-      StartLine :: line(),
-      Result :: {'ok', Term :: term(), EndLine :: line()}
-              | {'eof', EndLine :: line()}
-              | {'error', ErrorInfo :: erl_scan:error_info(), ErrorLine :: line()}.
-
-read(Io, Prompt, StartLine) when is_integer(StartLine) ->
-    case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[StartLine]}) of
-	{ok,Toks,EndLine} ->
+      StartLocation :: location(),
+      Options :: erl_scan:options(),
+      Result :: {'ok', Term :: term(), EndLocation :: location()}
+              | {'eof', EndLocation :: location()}
+              | server_no_data()
+              | {'error', ErrorInfo, ErrorLocation :: location()},
+      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info().
+
+read(Io, Prompt, Pos0, Options) ->
+    Args = [Pos0,Options],
+    case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,Args}) of
+	{ok,Toks,EndLocation} ->
             case erl_parse:parse_term(Toks) of
-                {ok,Term} -> {ok,Term,EndLine};
-                {error,ErrorInfo} -> {error,ErrorInfo,EndLine}
+                {ok,Term} -> {ok,Term,EndLocation};
+                {error,ErrorInfo} -> {error,ErrorInfo,EndLocation}
             end;
-	{error,_E,_EndLine} = Error ->
+	{error,_E,_EndLocation} = Error ->
 	    Error;
-	{eof,_EndLine} = Eof ->
+	{eof,_EndLocation} = Eof ->
 	    Eof;
 	Other ->
 	    Other
@@ -313,7 +330,9 @@ fread(Prompt, Format) ->
       IoDevice :: device(),
       Prompt :: prompt(),
       Format :: format(),
-      Result :: {'ok', Terms :: [term()]} | 'eof' | {'error', What :: term()}.
+      Result :: {'ok', Terms :: [term()]}
+              | {'error', FreadError :: io_lib:fread_error()}
+              | server_no_data().
 
 fread(Io, Prompt, Format) ->
     case request(Io, {fread,Prompt,Format}) of
@@ -348,7 +367,7 @@ format(Io, Format, Args) ->
 
 -spec scan_erl_exprs(Prompt) -> Result when
       Prompt :: prompt(),
-      Result :: erl_scan:tokens_result() | request_error().
+      Result :: erl_scan:tokens_result() | server_no_data().
  
 scan_erl_exprs(Prompt) ->
     scan_erl_exprs(default_input(), Prompt, 1).
@@ -356,23 +375,33 @@ scan_erl_exprs(Prompt) ->
 -spec scan_erl_exprs(Device, Prompt) -> Result when
       Device :: device(),
       Prompt :: prompt(),
-      Result :: erl_scan:tokens_result() | request_error().
+      Result :: erl_scan:tokens_result() | server_no_data().
 
 scan_erl_exprs(Io, Prompt) ->
     scan_erl_exprs(Io, Prompt, 1).
 
--spec scan_erl_exprs(Device, Prompt, StartLine) -> Result when
+-spec scan_erl_exprs(Device, Prompt, StartLocation) -> Result when
       Device :: device(),
       Prompt :: prompt(),
-      StartLine :: line(),
-      Result :: erl_scan:tokens_result() | request_error().
+      StartLocation :: location(),
+      Result :: erl_scan:tokens_result() | server_no_data().
 
 scan_erl_exprs(Io, Prompt, Pos0) ->
-    request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}).
+    scan_erl_exprs(Io, Prompt, Pos0, []).
+
+-spec scan_erl_exprs(Device, Prompt, StartLocation, Options) -> Result when
+      Device :: device(),
+      Prompt :: prompt(),
+      StartLocation :: location(),
+      Options :: erl_scan:options(),
+      Result :: erl_scan:tokens_result() | server_no_data().
+
+scan_erl_exprs(Io, Prompt, Pos0, Options) ->
+    request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0,Options]}).
 
 -spec scan_erl_form(Prompt) -> Result when
       Prompt :: prompt(),
-      Result :: erl_scan:tokens_result() | request_error().
+      Result :: erl_scan:tokens_result() | server_no_data().
 
 scan_erl_form(Prompt) ->
     scan_erl_form(default_input(), Prompt, 1).
@@ -380,26 +409,41 @@ scan_erl_form(Prompt) ->
 -spec scan_erl_form(IoDevice, Prompt) -> Result when
       IoDevice :: device(),
       Prompt :: prompt(),
-      Result :: erl_scan:tokens_result() | request_error().
+      Result :: erl_scan:tokens_result() | server_no_data().
 
 scan_erl_form(Io, Prompt) ->
     scan_erl_form(Io, Prompt, 1).
 
--spec scan_erl_form(IoDevice, Prompt, StartLine) -> Result when
+-spec scan_erl_form(IoDevice, Prompt, StartLocation) -> Result when
       IoDevice :: device(),
       Prompt :: prompt(),
-      StartLine :: line(),
-      Result :: erl_scan:tokens_result() | request_error().
+      StartLocation :: location(),
+      Result :: erl_scan:tokens_result() | server_no_data().
 
 scan_erl_form(Io, Prompt, Pos0) ->
-    request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}).
+    scan_erl_form(Io, Prompt, Pos0, []).
+
+-spec scan_erl_form(IoDevice, Prompt, StartLocation, Options) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLocation :: location(),
+      Options :: erl_scan:options(),
+      Result :: erl_scan:tokens_result() | server_no_data().
+
+scan_erl_form(Io, Prompt, Pos0, Options) ->
+    request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0,Options]}).
 
 %% Parsing Erlang code.
 
--type parse_ret() :: {'ok', ExprList :: erl_parse:abstract_expr(), EndLine :: line()}
-                   | {'eof', EndLine :: line()}
-                   | {'error', ErrorInfo :: erl_scan:error_info(), ErrorLine :: line()}
-                   | request_error().
+-type parse_ret() :: {'ok',
+                      ExprList :: erl_parse:abstract_expr(),
+                      EndLocation :: location()}
+                   | {'eof', EndLocation :: location()}
+                   | {'error',
+                      ErrorInfo :: erl_scan:error_info()
+                                 | erl_parse:error_info(),
+                      ErrorLocation :: location()}
+                   | server_no_data().
 
 -spec parse_erl_exprs(Prompt) -> Result when
       Prompt :: prompt(),
@@ -416,14 +460,24 @@ parse_erl_exprs(Prompt) ->
 parse_erl_exprs(Io, Prompt) ->
     parse_erl_exprs(Io, Prompt, 1).
 
--spec parse_erl_exprs(IoDevice, Prompt, StartLine) -> Result when
+-spec parse_erl_exprs(IoDevice, Prompt, StartLocation) -> Result when
       IoDevice :: device(),
       Prompt :: prompt(),
-      StartLine :: line(),
+      StartLocation :: location(),
       Result :: parse_ret().
 
 parse_erl_exprs(Io, Prompt, Pos0) ->
-    case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}) of
+    parse_erl_exprs(Io, Prompt, Pos0, []).
+
+-spec parse_erl_exprs(IoDevice, Prompt, StartLocation, Options) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLocation :: location(),
+      Options :: erl_scan:options(),
+      Result :: parse_ret().
+
+parse_erl_exprs(Io, Prompt, Pos0, Options) ->
+    case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0,Options]}) of
 	{ok,Toks,EndPos} ->
 	    case erl_parse:parse_exprs(Toks) of
 		{ok,Exprs} -> {ok,Exprs,EndPos};
@@ -433,10 +487,15 @@ parse_erl_exprs(Io, Prompt, Pos0) ->
 	    Other
     end.
 
--type parse_form_ret() :: {'ok', AbsForm :: erl_parse:abstract_form(), EndLine :: line()}
-                        | {'eof', EndLine :: line()}
-                        | {'error', ErrorInfo :: erl_scan:error_info(), ErrorLine :: line()}
-                        | request_error().
+-type parse_form_ret() :: {'ok',
+                           AbsForm :: erl_parse:abstract_form(),
+                           EndLocation :: location()}
+                        | {'eof', EndLocation :: location()}
+                        | {'error',
+                           ErrorInfo :: erl_scan:error_info()
+                                      | erl_parse:error_info(),
+                           ErrorLocation :: location()}
+                        | server_no_data().
 
 -spec parse_erl_form(Prompt) -> Result when
       Prompt :: prompt(),
@@ -453,14 +512,25 @@ parse_erl_form(Prompt) ->
 parse_erl_form(Io, Prompt) ->
     parse_erl_form(Io, Prompt, 1).
 
--spec parse_erl_form(IoDevice, Prompt, StartLine) -> Result when
+-spec parse_erl_form(IoDevice, Prompt, StartLocation) -> Result when
       IoDevice :: device(),
       Prompt :: prompt(),
-      StartLine :: line(),
+      StartLocation :: location(),
       Result :: parse_form_ret().
 
 parse_erl_form(Io, Prompt, Pos0) ->
-    case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}) of
+    parse_erl_form(Io, Prompt, Pos0, []).
+
+-spec parse_erl_form(IoDevice, Prompt, StartLocation, Options) -> Result when
+      IoDevice :: device(),
+      Prompt :: prompt(),
+      StartLocation :: location(),
+      Options :: erl_scan:options(),
+      Result :: parse_form_ret().
+
+parse_erl_form(Io, Prompt, Pos0, Options) ->
+    Args = [Pos0, Options],
+    case request(Io, {get_until,unicode,Prompt,erl_scan,tokens,Args}) of
 	{ok,Toks,EndPos} ->
 	    case erl_parse:parse_form(Toks) of
 		{ok,Exprs} -> {ok,Exprs,EndPos};
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 513d904c39..5ad505f683 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -46,25 +47,28 @@
 %% 173 - 176	{ - ~		punctuation
 %% 177		DEL		control
 %% 200 - 237			control
-%% 240 - 277	NBSP - �	punctuation
-%% 300 - 326	� - �		uppercase
-%% 327		�		punctuation
-%% 330 - 336	� - �		uppercase
-%% 337 - 366	� - �		lowercase
-%% 367		�		punctuation
-%% 370 - 377	� - �		lowercase
+%% 240 - 277	NBSP - ¿	punctuation
+%% 300 - 326	À - Ö		uppercase
+%% 327		×		punctuation
+%% 330 - 336	Ø - Þ		uppercase
+%% 337 - 366	ß - ö		lowercase
+%% 367		÷		punctuation
+%% 370 - 377	ø - ÿ		lowercase
 %%
 %% Many punctuation characters region have special meaning.  Must
-%% watch using � \327, very close to x \170
+%% watch using × \327, very close to x \170
 
 -module(io_lib).
 
 -export([fwrite/2,fread/2,fread/3,format/2]).
 -export([print/1,print/4,indentation/2]).
 
--export([write/1,write/2,write/3,nl/0,format_prompt/1]).
+-export([write/1,write/2,write/3,nl/0,format_prompt/1,format_prompt/2]).
 -export([write_atom/1,write_string/1,write_string/2,write_unicode_string/1,
-	 write_unicode_string/2, write_char/1, write_unicode_char/1]).
+         write_unicode_string/2, write_char/1, write_unicode_char/1]).
+
+-export([write_unicode_string_as_latin1/1, write_unicode_string_as_latin1/2,
+         write_unicode_char_as_latin1/1]).
 
 -export([quote_atom/2, char_list/1, unicode_char_list/1,
 	 deep_char_list/1, deep_unicode_char_list/1,
@@ -75,11 +79,14 @@
 	 collect_line/2, collect_line/3, collect_line/4,
 	 get_until/3, get_until/4]).
 
--export_type([chars/0, continuation/0]).
+-export_type([chars/0, unicode_chars/0, unicode_string/0, continuation/0,
+              fread_error/0]).
 
 %%----------------------------------------------------------------------
 
 -type chars() :: [char() | chars()].
+-type unicode_chars() :: [unicode:unicode_char() | unicode_chars()].
+-type unicode_string() :: [unicode:unicode_char()].
 -type depth() :: -1 | non_neg_integer().
 
 -opaque continuation() :: {Format :: string(),
@@ -87,6 +94,16 @@
                            Nchars :: non_neg_integer(),
                            Results :: [term()]}.
 
+-type fread_error() :: 'atom'
+                     | 'based'
+                     | 'character'
+                     | 'float'
+                     | 'format'
+                     | 'input'
+                     | 'integer'
+                     | 'string'
+                     | 'unsigned'.
+
 %%----------------------------------------------------------------------
 
 %% Interface calls to sub-modules.
@@ -107,7 +124,7 @@ fwrite(Format, Args) ->
               | {'more', RestFormat :: string(),
                  Nchars :: non_neg_integer(),
                  InputStack :: chars()}
-              | {'error', What :: term()}.
+              | {'error', What :: fread_error()}.
 
 fread(Chars, Format) ->
     io_lib_fread:fread(Chars, Format).
@@ -120,7 +137,7 @@ fread(Chars, Format) ->
               | {'done', Result, LeftOverChars :: string()},
       Result :: {'ok', InputList :: [term()]}
               | 'eof'
-              | {'error', What :: term()}.
+              | {'error', What :: fread_error()}.
 
 fread(Cont, Chars, Format) ->
     io_lib_fread:fread(Cont, Chars, Format).
@@ -162,27 +179,34 @@ indentation(Chars, Current) ->
 
 
 %% Format an IO-request prompt (handles formatting errors safely).
-%% Atoms, binaries, and iolists can be used as-is, and will be
-%% printed without any additional quotes.
-%% Note that the output is a deep string, and not an iolist (i.e.,
-%% it may be deep, but never contains binaries, due to the "~s").
+%% Atoms, binaries, and iolists (or unicode:charlist()) can be used
+%% as-is, and will be printed without any additional quotes.
 
 -spec format_prompt(term()) -> chars().
 
-format_prompt({format,Format,Args}) ->
-    format_prompt(Format,Args);
-format_prompt(Prompt)
-  when is_list(Prompt); is_atom(Prompt); is_binary(Prompt) ->
-    format_prompt("~ts", [Prompt]);
 format_prompt(Prompt) ->
-    format_prompt("~tp", [Prompt]).
+    format_prompt(Prompt, latin1).
+
+-spec format_prompt(term(), atom()) -> chars().
+
+format_prompt({format,Format,Args}, _Encoding) ->
+    do_format_prompt(Format, Args);
+format_prompt(Prompt, Encoding)
+  when is_list(Prompt); is_atom(Prompt); is_binary(Prompt) ->
+    do_format_prompt(add_modifier(Encoding, "s"), [Prompt]);
+format_prompt(Prompt, Encoding) ->
+    do_format_prompt(add_modifier(Encoding, "p"), [Prompt]).
 
-format_prompt(Format, Args) ->
+do_format_prompt(Format, Args) ->
     case catch io_lib:format(Format, Args) of
 	{'EXIT',_} -> "???";
 	List -> List
     end.
 
+add_modifier(latin1, C) ->
+    "~"++C;
+add_modifier(_, C) ->
+    "~t"++C.
 
 %% write(Term)
 %% write(Term, Depth)
@@ -294,7 +318,7 @@ quote_atom(Atom, Cs0) ->
 	    case Cs0 of
 		[C|Cs] when C >= $a, C =< $z ->
 		    not name_chars(Cs);
-		[C|Cs] when C >= $�, C =< $�, C =/= $� ->
+		[C|Cs] when C >= $ß, C =< $ÿ, C =/= $÷ ->
 		    not name_chars(Cs);
 		_ -> true
 	    end
@@ -308,9 +332,9 @@ name_chars([C|Cs]) ->
 name_chars([]) -> true.
 
 name_char(C) when C >= $a, C =< $z -> true;
-name_char(C) when C >= $�, C =< $�, C =/= $� -> true;
+name_char(C) when C >= $ß, C =< $ÿ, C =/= $÷ -> true;
 name_char(C) when C >= $A, C =< $Z -> true;
-name_char(C) when C >= $�, C =< $�, C =/= $� -> true;
+name_char(C) when C >= $À, C =< $Þ, C =/= $× -> true;
 name_char(C) when C >= $0, C =< $9 -> true;
 name_char($_) -> true;
 name_char($@) -> true;
@@ -330,11 +354,32 @@ write_string(S) ->
 write_string(S, Q) ->
     [Q|write_string1(latin1, S, Q)].
 
+%%% There are two functions to write Unicode strings:
+%%% - they both escape control characters < 160;
+%%% - write_unicode_string() never escapes characters >= 160;
+%%% - write_unicode_string_as_latin1() also escapes characters >= 255.
+
+-spec write_unicode_string(UnicodeString) -> unicode_string() when
+      UnicodeString :: unicode_string().
+
 write_unicode_string(S) ->
     write_unicode_string(S, $").   %"
 
+-spec write_unicode_string(unicode_string(), char()) -> unicode_string().
+
 write_unicode_string(S, Q) ->
-    [Q|write_string1(unicode, S, Q)].
+    [Q|write_string1(unicode_as_unicode, S, Q)].
+
+-spec write_unicode_string_as_latin1(UnicodeString) -> string() when
+      UnicodeString :: unicode_string().
+
+write_unicode_string_as_latin1(S) ->
+    write_unicode_string_as_latin1(S, $").   %"
+
+-spec write_unicode_string_as_latin1(unicode_string(), char()) -> string().
+
+write_unicode_string_as_latin1(S, Q) ->
+    [Q|write_string1(unicode_as_latin1, S, Q)].
 
 write_string1(_,[], Q) ->
     [Q];
@@ -347,7 +392,11 @@ string_char(_,C, _, Tail) when C >= $\s, C =< $~ ->
     [C|Tail];
 string_char(latin1,C, _, Tail) when C >= $\240, C =< $\377 ->
     [C|Tail];
-string_char(unicode,C, _, Tail) when C >= $\240 ->
+string_char(unicode_as_unicode,C, _, Tail) when C >= $\240 ->
+    [C|Tail];
+string_char(unicode_as_latin1,C, _, Tail) when C >= $\240, C =< $\377 ->
+    [C|Tail];
+string_char(unicode_as_latin1,C, _, Tail) when C >= $\377 ->
     "\\x{"++erlang:integer_to_list(C, 16)++"}"++Tail;
 string_char(_,$\n, _, Tail) -> [$\\,$n|Tail];	%\n = LF
 string_char(_,$\r, _, Tail) -> [$\\,$r|Tail];	%\r = CR
@@ -374,10 +423,22 @@ write_char($\s) -> "$\\s";			%Must special case this.
 write_char(C) when is_integer(C), C >= $\000, C =< $\377 ->
     [$$|string_char(latin1,C, -1, [])].
 
-write_unicode_char(Ch) when Ch =< 255 ->
-    write_char(Ch);
-write_unicode_char(Uni) ->
-    [$$|string_char(unicode,Uni, -1, [])].
+%%% There are two functions to write a Unicode character:
+%%% - they both escape control characters < 160;
+%%% - write_unicode_char() never escapes characters >= 160;
+%%% - write_unicode_char_as_latin1() also escapes characters >= 255.
+
+-spec write_unicode_char(UnicodeChar) -> unicode_string() when
+      UnicodeChar :: unicode:unicode_char().
+
+write_unicode_char(Uni) when is_integer(Uni), Uni >= $\000 ->
+    [$$|string_char(unicode_as_unicode,Uni, -1, [])].
+
+-spec write_unicode_char_as_latin1(UnicodeChar) -> string() when
+      UnicodeChar :: unicode:unicode_char().
+
+write_unicode_char_as_latin1(Uni) when is_integer(Uni), Uni >= $\000 ->
+    [$$|string_char(unicode_as_latin1,Uni, -1, [])].
 
 %% char_list(CharList)
 %% deep_char_list(CharList)
@@ -392,7 +453,8 @@ char_list([C|Cs]) when is_integer(C), C >= $\000, C =< $\377 ->
 char_list([]) -> true;
 char_list(_) -> false.			%Everything else is false
 
--spec unicode_char_list(term()) -> boolean().
+-spec unicode_char_list(Term) -> boolean() when
+      Term :: term().
 
 unicode_char_list([C|Cs]) when is_integer(C), C >= 0, C < 16#D800; 
        is_integer(C), C > 16#DFFF, C < 16#FFFE;
@@ -417,7 +479,8 @@ deep_char_list([], []) -> true;
 deep_char_list(_, _More) ->			%Everything else is false
     false.
 
--spec deep_unicode_char_list(term()) -> boolean().
+-spec deep_unicode_char_list(Term) -> boolean() when
+      Term :: term().
 
 deep_unicode_char_list(Cs) ->
     deep_unicode_char_list(Cs, []).
@@ -462,7 +525,8 @@ printable_list(_) -> false.			%Everything else is false
 %%  Everything that is not a control character and not invalid unicode 
 %%  will be considered printable.
 
--spec printable_unicode_list(term()) -> boolean().
+-spec printable_unicode_list(Term) -> boolean() when
+      Term :: term().
 
 printable_unicode_list([C|Cs]) when is_integer(C), C >= $\040, C =< $\176 ->
     printable_unicode_list(Cs);
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl
index 49a00a4ec7..5680f83ab6 100644
--- a/lib/stdlib/src/io_lib_format.erl
+++ b/lib/stdlib/src/io_lib_format.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The 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 @@
 
 -export([fwrite/2,fwrite_g/1,indentation/2]).
 
-%% fwrite(Format, ArgList) -> [Char].
+%% fwrite(Format, ArgList) -> [unicode:unicode:char()].
 %%  Format the arguments in ArgList after string Format. Just generate
 %%  an error if there is an error in the arguments.
 %%
@@ -133,7 +133,7 @@ pcount([{$P,_As,_F,_Ad,_P,_Pad,_Enc}|Cs], Acc) -> pcount(Cs, Acc+1);
 pcount([_|Cs], Acc) -> pcount(Cs, Acc);
 pcount([], Acc) -> Acc.
 
-%% build([Control], Pc, Indentation) -> [Char].
+%% build([Control], Pc, Indentation) -> [unicode:unicode_char()].
 %%  Interpret the control structures. Count the number of print
 %%  remaining and only calculate indentation when necessary. Must also
 %%  be smart when calculating indentation for characters in format.
@@ -154,7 +154,7 @@ decr_pc($p, Pc) -> Pc - 1;
 decr_pc($P, Pc) -> Pc - 1;
 decr_pc(_, Pc) -> Pc.
 
-%% indentation([Char], Indentation) -> Indentation.
+%% indentation([unicode:unicode_char()], Indentation) -> Indentation.
 %%  Calculate the indentation of the end of a string given its start
 %%  indentation. We assume tabs at 8 cols.
 
@@ -167,19 +167,19 @@ indentation([C|Cs], I) ->
 indentation([], I) -> I.
 
 %% control(FormatChar, [Argument], FieldWidth, Adjust, Precision, PadChar,
-%%	   Indentation) ->
-%%	[Char]
+%%	   Encoding, Indentation) ->
+%%	[unicode:unicode_char()]
 %%  This is the main dispatch function for the various formatting commands.
 %%  Field widths and precisions have already been calculated.
 
 control($w, [A], F, Adj, P, Pad, _Enc,_I) ->
     term(io_lib:write(A, -1), F, Adj, P, Pad);
-control($p, [A], F, Adj, P, Pad, _Enc, I) ->
-    print(A, -1, F, Adj, P, Pad, I);
+control($p, [A], F, Adj, P, Pad, Enc, I) ->
+    print(A, -1, F, Adj, P, Pad, Enc, I);
 control($W, [A,Depth], F, Adj, P, Pad, _Enc, _I) when is_integer(Depth) ->
     term(io_lib:write(A, Depth), F, Adj, P, Pad);
-control($P, [A,Depth], F, Adj, P, Pad, _Enc, I) when is_integer(Depth) ->
-    print(A, Depth, F, Adj, P, Pad, I);
+control($P, [A,Depth], F, Adj, P, Pad, Enc, I) when is_integer(Depth) ->
+    print(A, Depth, F, Adj, P, Pad, Enc, I);
 control($s, [A], F, Adj, P, Pad, _Enc, _I) when is_atom(A) ->
     string(atom_to_list(A), F, Adj, P, Pad);
 control($s, [L0], F, Adj, P, Pad, latin1, _I) ->
@@ -187,6 +187,7 @@ control($s, [L0], F, Adj, P, Pad, latin1, _I) ->
     string(L, F, Adj, P, Pad);
 control($s, [L0], F, Adj, P, Pad, unicode, _I) ->
     L = unicode:characters_to_list(L0),
+    true = is_list(L),
     uniconv(string(L, F, Adj, P, Pad));
 control($e, [A], F, Adj, P, Pad, _Enc, _I) when is_float(A) ->
     fwrite_e(A, F, Adj, P, Pad);
@@ -256,13 +257,17 @@ term(T, F, Adj, P0, Pad) ->
 	    adjust(T, chars(Pad, F-L), Adj)
     end.
 
-%% print(Term, Depth, Field, Adjust, Precision, PadChar, Indentation)
+%% print(Term, Depth, Field, Adjust, Precision, PadChar, Encoding,
+%%       Indentation)
 %%  Print a term.
 
-print(T, D, none, Adj, P, Pad, I) -> print(T, D, 80, Adj, P, Pad, I);
-print(T, D, F, Adj, none, Pad, I) -> print(T, D, F, Adj, I+1, Pad, I);
-print(T, D, F, right, P, _Pad, _I) ->
-    io_lib_pretty:print(T, P, F, D).
+print(T, D, none, Adj, P, Pad, E, I) -> print(T, D, 80, Adj, P, Pad, E, I);
+print(T, D, F, Adj, none, Pad, E, I) -> print(T, D, F, Adj, I+1, Pad, E, I);
+print(T, D, F, right, P, _Pad, latin1, _I) ->
+    io_lib_pretty:print(T, P, F, D);
+print(T, D, F, right, P, _Pad, Enc, _I) ->
+    Options = [{column, P}, {line_length, F}, {depth, D}, {encoding, Enc}],
+    io_lib_pretty:print(T, Options).
 
 %% fwrite_e(Float, Field, Adjust, Precision, PadChar)
 
@@ -608,7 +613,7 @@ prefixed_integer(Int, F, Adj, Base, Pad, Prefix, Lowercase)
 	    term([Prefix|S], F, Adj, none, Pad)
     end.
 
-%% char(Char, Field, Adjust, Precision, PadChar) -> [Char].
+%% char(Char, Field, Adjust, Precision, PadChar) -> [unicode:unicode_char()].
 
 char(C, none, _Adj, none, _Pad) -> [C];
 char(C, F, _Adj, none, _Pad) -> chars(C, F);
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index ded1346097..84d4b8bba0 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -43,7 +43,7 @@
               | {'done', Result, LeftOverChars :: string()},
       Result :: {'ok', InputList :: io_lib:chars()}
               | 'eof'
-              | {'error', What :: term()}.
+              | {'error', What :: io_lib:fread_error()}.
 
 fread([], Chars, Format) ->
     %%io:format("FREAD: ~w `~s'~n", [Format,Chars]),
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 169410796b..99ad281a9b 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The 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,43 +33,76 @@
 %% print(Term, Column, LineLength, Depth) -> [Chars]
 %% Depth = -1 gives unlimited print depth. Use io_lib:write for atomic terms.
 
+-spec print(term()) -> io_lib:chars().
+
 print(Term) ->
     print(Term, 1, 80, -1).
 
 %% print(Term, RecDefFun) -> [Chars]
 %% print(Term, Depth, RecDefFun) -> [Chars]
 %% RecDefFun = fun(Tag, NoFields) -> [FieldTag] | no
-%% Used by the shell for printing records.
+%% Used by the shell for printing records and for Unicode.
+
+-type rec_print_fun() :: fun((Tag :: atom(), NFields :: non_neg_integer()) ->
+                                  no | [FieldName :: atom()]).
+-type column() :: integer().
+-type line_length() :: pos_integer().
+-type depth() :: integer().
+-type max_chars() :: integer().
+
+-type chars() :: io_lib:chars().
+-type unicode_chars() :: io_lib:unicode_chars().
+-type option() :: {column, column()}
+                | {line_length, line_length()}
+                | {depth, depth()}
+                | {max_chars, max_chars()}
+                | {record_print_fun, rec_print_fun()}
+                | {encoding, latin1 | utf8 | unicode}.
+-type options() :: [option()].
+
+-spec print(term(), rec_print_fun()) -> chars() | unicode_chars();
+           (term(), options()) -> chars() | unicode_chars().
+
+print(Term, Options) when is_list(Options) ->
+    Col = proplists:get_value(column, Options, 1),
+    Ll = proplists:get_value(line_length, Options, 80),
+    D = proplists:get_value(depth, Options, -1),
+    M = proplists:get_value(max_chars, Options, -1),
+    RecDefFun = proplists:get_value(record_print_fun, Options, no_fun),
+    Encoding = proplists:get_value(encoding, Options, epp:default_encoding()),
+    print(Term, Col, Ll, D, M, RecDefFun, Encoding);
 print(Term, RecDefFun) ->
     print(Term, -1, RecDefFun).
 
+-spec print(term(), depth(), rec_print_fun()) -> chars() | unicode_chars().
+
 print(Term, Depth, RecDefFun) ->
     print(Term, 1, 80, Depth, RecDefFun).
 
+-spec print(term(), column(), line_length(), depth()) ->
+                   chars() | unicode_chars().
+
 print(Term, Col, Ll, D) ->
-    print(Term, Col, Ll, D, _M=-1, no_fun).
+    print(Term, Col, Ll, D, _M=-1, no_fun, latin1).
 
+-spec print(term(), column(), line_length(), depth(), rec_print_fun()) ->
+                   chars() | unicode_chars().
 print(Term, Col, Ll, D, RecDefFun) ->
     print(Term, Col, Ll, D, _M=-1, RecDefFun).
 
-print(_, _, _, 0, _M, _RF) -> "...";
-print(Term, Col, Ll, D, M, RecDefFun) when Col =< 0 ->
-    print(Term, 1, Ll, D, M, RecDefFun);
-print(Term, Col, Ll, D, M0, RecDefFun) when is_tuple(Term); 
-                                            is_list(Term) ->
-    If = {_S, Len} = print_length(Term, D, RecDefFun),
-    M = max_cs(M0, Len),
-    if
-        Len < Ll - Col, Len =< M ->
-            write(If);
-        true ->
-            TInd = while_fail([-1, 4], 
-                              fun(I) -> cind(If, Col, Ll, M, I, 0, 0) end, 
-                              1),
-            pp(If, Col, Ll, M, TInd, indent(Col), 0, 0)
-    end;
-print(<<_/bitstring>>=Term, Col, Ll, D, M0, RecDefFun) ->
-    If = {_S, Len} = print_length(Term, D, RecDefFun),
+-spec print(term(), column(), line_length(), depth(), max_chars(),
+            rec_print_fun()) -> chars() | unicode_chars().
+
+print(Term, Col, Ll, D, M, RecDefFun) ->
+    print(Term, Col, Ll, D, M, RecDefFun, latin1).
+
+print(_, _, _, 0, _M, _RF, _Enc) -> "...";
+print(Term, Col, Ll, D, M, RecDefFun, Enc) when Col =< 0 ->
+    print(Term, 1, Ll, D, M, RecDefFun, Enc);
+print(Term, Col, Ll, D, M0, RecDefFun, Enc) when is_tuple(Term);
+                                                 is_list(Term);
+                                                 is_bitstring(Term) ->
+    If = {_S, Len} = print_length(Term, D, RecDefFun, Enc),
     M = max_cs(M0, Len),
     if
         Len < Ll - Col, Len =< M ->
@@ -80,7 +113,7 @@ print(<<_/bitstring>>=Term, Col, Ll, D, M0, RecDefFun) ->
                               1),
             pp(If, Col, Ll, M, TInd, indent(Col), 0, 0)
     end;
-print(Term, _Col, _Ll, _D, _M, _RF) ->
+print(Term, _Col, _Ll, _D, _M, _RF, _Enc) ->
     io_lib:write(Term).
 
 %%%
@@ -294,50 +327,56 @@ write_tail(E, S) ->
 %% counted but need to be added later.
 
 %% D =/= 0
-print_length([], _D, _RF) ->
+print_length([], _D, _RF, _Enc) ->
     {"[]", 2};
-print_length({}, _D, _RF) ->
+print_length({}, _D, _RF, _Enc) ->
     {"{}", 2};
-print_length(List, D, RF) when is_list(List) ->
-    case printable_list(List, D) of
+print_length(List, D, RF, Enc) when is_list(List) ->
+    case printable_list(List, D, Enc) of
         true ->
-            S = io_lib:write_string(List, $"), %"
+            S = write_string(List, Enc),
             {S, length(S)};
         %% Truncated lists could break some existing code.
         % {true, Prefix} ->
-        %    S = io_lib:write_string(Prefix, $"), %"
+        %    S = write_string(Prefix, Enc),
         %    {[S | "..."], 3 + length(S)};
         false ->
-            print_length_list(List, D, RF)
+            print_length_list(List, D, RF, Enc)
     end;
-print_length(Fun, _D, _RF) when is_function(Fun) ->
+print_length(Fun, _D, _RF, _Enc) when is_function(Fun) ->
     S = io_lib:write(Fun),
     {S, iolist_size(S)};
-print_length(R, D, RF) when is_atom(element(1, R)), 
-                            is_function(RF) ->
+print_length(R, D, RF, Enc) when is_atom(element(1, R)),
+                                 is_function(RF) ->
     case RF(element(1, R), tuple_size(R) - 1) of
         no -> 
-            print_length_tuple(R, D, RF);
+            print_length_tuple(R, D, RF, Enc);
         RDefs ->
-            print_length_record(R, D, RF, RDefs)
+            print_length_record(R, D, RF, RDefs, Enc)
     end;
-print_length(Tuple, D, RF) when is_tuple(Tuple) ->
-    print_length_tuple(Tuple, D, RF);
-print_length(<<>>, _D, _RF) ->
+print_length(Tuple, D, RF, Enc) when is_tuple(Tuple) ->
+    print_length_tuple(Tuple, D, RF, Enc);
+print_length(<<>>, _D, _RF, _Enc) ->
     {"<<>>", 4};
-print_length(<<_/bitstring>>, 1, _RF) ->
+print_length(<<_/bitstring>>, 1, _RF, _Enc) ->
     {"<<...>>", 7};
-print_length(<<_/bitstring>>=Bin, D, _RF) ->
+print_length(<<_/bitstring>>=Bin, D, _RF, Enc) ->
     case bit_size(Bin) rem 8 of
         0 ->
 	    D1 = D - 1, 
-	    case printable_bin(Bin, D1) of
-	        List when is_list(List) ->
-                    S = io_lib:write_string(List, $"),
+	    case printable_bin(Bin, D1, Enc) of
+                {true, List} when is_list(List) ->
+                    S = io_lib:write_string(List, $"), %"
 	            {[$<,$<,S,$>,$>], 4 + length(S)};
-	        {true, Prefix} -> 
-	            S = io_lib:write_string(Prefix, $"), 
-	            {[$<,$<, S | "...>>"], 4 + length(S)};
+                {false, List} when is_list(List) ->
+                    S = io_lib:write_unicode_string(List, $"), %"
+	            {[$<,$<,S,"/utf8>>"], 9 + length(S)};
+	        {true, true, Prefix} ->
+	            S = io_lib:write_string(Prefix, $"), %"
+	            {[$<,$<, S | "...>>"], 7 + length(S)};
+	        {false, true, Prefix} ->
+                    S = io_lib:write_unicode_string(Prefix, $"), %"
+	            {[$<,$<, S | "/utf8...>>"], 12 + length(S)};
 	        false ->
 	            S = io_lib:write(Bin, D),
 	            {{bin,S}, iolist_size(S)}
@@ -346,51 +385,51 @@ print_length(<<_/bitstring>>=Bin, D, _RF) ->
            S = io_lib:write(Bin, D),
 	   {{bin,S}, iolist_size(S)}
     end;    
-print_length(Term, _D, _RF) ->
+print_length(Term, _D, _RF, _Enc) ->
     S = io_lib:write(Term),
     {S, iolist_size(S)}.
 
-print_length_tuple(_Tuple, 1, _RF) ->
+print_length_tuple(_Tuple, 1, _RF, _Enc) ->
     {"{...}", 5};
-print_length_tuple(Tuple, D, RF) ->
-    L = print_length_list1(tuple_to_list(Tuple), D, RF),
+print_length_tuple(Tuple, D, RF, Enc) ->
+    L = print_length_list1(tuple_to_list(Tuple), D, RF, Enc),
     IsTagged = is_atom(element(1, Tuple)) and (tuple_size(Tuple) > 1),
     {{tuple,IsTagged,L}, list_length(L, 2)}.
 
-print_length_record(_Tuple, 1, _RF, _RDefs) ->
+print_length_record(_Tuple, 1, _RF, _RDefs, _Enc) ->
     {"{...}", 5};
-print_length_record(Tuple, D, RF, RDefs) ->
+print_length_record(Tuple, D, RF, RDefs, Enc) ->
     Name = [$# | io_lib:write_atom(element(1, Tuple))],
     NameL = length(Name),
-    L = print_length_fields(RDefs, D - 1, tl(tuple_to_list(Tuple)), RF),
+    L = print_length_fields(RDefs, D - 1, tl(tuple_to_list(Tuple)), RF, Enc),
     {{record, [{Name,NameL} | L]}, list_length(L, NameL + 2)}.
 
-print_length_fields([], _D, [], _RF) ->
+print_length_fields([], _D, [], _RF, _Enc) ->
     [];
-print_length_fields(_, 1, _, _RF) -> 
+print_length_fields(_, 1, _, _RF, _Enc) ->
     {dots, 3};
-print_length_fields([Def | Defs], D, [E | Es], RF) ->
-    [print_length_field(Def, D - 1, E, RF) | 
-     print_length_fields(Defs, D - 1, Es, RF)].
+print_length_fields([Def | Defs], D, [E | Es], RF, Enc) ->
+    [print_length_field(Def, D - 1, E, RF, Enc) |
+     print_length_fields(Defs, D - 1, Es, RF, Enc)].
 
-print_length_field(Def, D, E, RF) ->
+print_length_field(Def, D, E, RF, Enc) ->
     Name = io_lib:write_atom(Def),
-    {S, L} = print_length(E, D, RF),
+    {S, L} = print_length(E, D, RF, Enc),
     NameL = length(Name) + 3,
     {{field, Name, NameL, {S, L}}, NameL + L}.
 
-print_length_list(List, D, RF) -> 
-    L = print_length_list1(List, D, RF),
+print_length_list(List, D, RF, Enc) ->
+    L = print_length_list1(List, D, RF, Enc),
     {{list, L}, list_length(L, 2)}.
 
-print_length_list1([], _D, _RF) ->
+print_length_list1([], _D, _RF, _Enc) ->
     [];
-print_length_list1(_, 1, _RF) ->
+print_length_list1(_, 1, _RF, _Enc) ->
     {dots, 3};
-print_length_list1([E | Es], D, RF) ->
-    [print_length(E, D - 1, RF) | print_length_list1(Es, D - 1, RF)];
-print_length_list1(E, D, RF) ->
-    print_length(E, D - 1, RF).
+print_length_list1([E | Es], D, RF, Enc) ->
+    [print_length(E, D - 1, RF, Enc) | print_length_list1(Es, D - 1, RF, Enc)];
+print_length_list1(E, D, RF, Enc) ->
+    print_length(E, D - 1, RF, Enc).
 
 list_length([], Acc) ->
     Acc;
@@ -409,16 +448,16 @@ list_length_tail({_, Len}, Acc) ->
 %% ?CHARS printable characters has depth 1.
 -define(CHARS, 4).
 
-printable_list(L, D) when D < 0 ->
-    io_lib:printable_list(L);
-printable_list(_L, 1) ->
+printable_list(_L, 1, _Enc) ->
     false;
-printable_list(L, _D) ->
-    io_lib:printable_list(L).
+printable_list(L, _D, latin1) ->
+    io_lib:printable_list(L);
+printable_list(L, _D, _Uni) ->
+    io_lib:printable_unicode_list(L).
 %% Truncated lists could break some existing code.
-% printable_list(L, D) ->
+% printable_list(L, D, Enc) when D >= 0 ->
 %     Len = ?CHARS * (D - 1),
-%     case printable_list1(L, Len) of
+%     case printable_list1(L, Len, Enc) of
 %         all ->
 %             true;
 %         N when is_integer(N), Len - N >= D - 1 ->
@@ -428,32 +467,41 @@ printable_list(L, _D) ->
 %             false
 %     end.
 
-printable_bin(Bin, D) when D >= 0, ?CHARS * D =< byte_size(Bin) ->
-    printable_bin(Bin, erlang:min(?CHARS * D, byte_size(Bin)), D);
-printable_bin(Bin, D) ->
-    printable_bin(Bin, byte_size(Bin), D).
+printable_bin(Bin, D, Enc) when D >= 0, ?CHARS * D =< byte_size(Bin) ->
+    printable_bin(Bin, erlang:min(?CHARS * D, byte_size(Bin)), D, Enc);
+printable_bin(Bin, D, Enc) ->
+    printable_bin(Bin, byte_size(Bin), D, Enc).
 
-printable_bin(Bin, Len, D) ->
+printable_bin(Bin, Len, D, latin1) ->
     N = erlang:min(20, Len),
     L = binary_to_list(Bin, 1, N),
     case printable_list1(L, N) of
         all when N =:= byte_size(Bin)  ->
-            L;
-        all when N =:= Len -> % N < byte_size(Bin)
             {true, L};
+        all when N =:= Len -> % N < byte_size(Bin)
+            {true, true, L};
         all ->
             case printable_bin1(Bin, 1 + N, Len - N) of
                 0 when byte_size(Bin) =:= Len ->
-                    binary_to_list(Bin);
+                    {true, binary_to_list(Bin)};
                 NC when D > 0, Len - NC >= D ->
-                    {true, binary_to_list(Bin, 1, Len - NC)};
+                    {true, true, binary_to_list(Bin, 1, Len - NC)};
                 NC when is_integer(NC) ->
                     false
             end;
         NC when is_integer(NC), D > 0, N - NC >= D ->
-            {true, binary_to_list(Bin, 1, N - NC)};
+            {true, true, binary_to_list(Bin, 1, N - NC)};
         NC when is_integer(NC) ->
             false
+    end;
+printable_bin(Bin, Len, D, _Uni) ->
+    case printable_unicode(Bin, Len, []) of
+        {_, <<>>, L} ->
+            {byte_size(Bin) =:= length(L), L};
+        {NC, Bin1, L} when D > 0, Len - NC >= D ->
+            {byte_size(Bin)-byte_size(Bin1) =:= length(L), true, L};
+        {_NC, _Bin, _L} ->
+            false
     end.
 
 printable_bin1(_Bin, _Start, 0) ->
@@ -484,6 +532,16 @@ printable_list1([$\e | Cs], N) -> printable_list1(Cs, N - 1);
 printable_list1([], _) -> all;
 printable_list1(_, N) -> N.
 
+printable_unicode(<<C/utf8, R/binary>>, I, L) when I > 0 ->
+    printable_unicode(R, I - 1, [C | L]);
+printable_unicode(Bin, I, L) ->
+    {I, Bin, lists:reverse(L)}.
+
+write_string(S, latin1) ->
+    io_lib:write_string(S, $"); %"
+write_string(S, _Uni) ->
+    io_lib:write_unicode_string(S, $"). %"
+
 %% Throw 'no_good' if the indentation exceeds half the line length
 %% unless there is room for M characters on the line.
 
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index cf4b87d7eb..b2ce2a5a8f 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -21,8 +21,9 @@
 -export([flush_receive/0, error_message/2, progname/0, nonl/1, send/2,
 	 sendw/2, eval_str/1]).
 
--export([format_exception/6, format_stacktrace/4, 
-         format_call/4, format_fun/1]).
+-export([format_exception/6, format_exception/7,
+         format_stacktrace/4, format_stacktrace/5,
+         format_call/4, format_call/5, format_fun/1]).
 
 -spec flush_receive() -> 'ok'.
 
@@ -128,32 +129,49 @@ all_white(_)       -> false.
 %%   as indentation whenever newline has been inserted);
 %% Class, Reason and StackTrace are the exception;
 %% FormatFun = fun(Term, I) -> iolist() formats terms;
-%% StackFun = fun(Mod, Fun, Arity) -> bool() is used for trimming the
+%% StackFun = fun(Mod, Fun, Arity) -> boolean() is used for trimming the
 %%   end of the stack (typically calls to erl_eval are skipped).
-format_exception(I, Class, Reason, StackTrace, StackFun, FormatFun) 
+format_exception(I, Class, Reason, StackTrace, StackFun, FormatFun) ->
+    format_exception(I, Class, Reason, StackTrace, StackFun, FormatFun,
+                     latin1).
+
+%% -> iolist() | unicode:charlist() (no \n at end)
+%% FormatFun = fun(Term, I) -> iolist() | unicode:charlist().
+format_exception(I, Class, Reason, StackTrace, StackFun, FormatFun, Encoding)
             when is_integer(I), I >= 1, is_function(StackFun, 3), 
                  is_function(FormatFun, 2) ->
     S = n_spaces(I-1),
     {Term,Trace1,Trace} = analyze_exception(Class, Reason, StackTrace),
-    Expl0 = explain_reason(Term, Class, Trace1, FormatFun, S),
-    Expl = io_lib:fwrite(<<"~s~s">>, [exited(Class), Expl0]),
-    case format_stacktrace1(S, Trace, FormatFun, StackFun) of
+    Expl0 = explain_reason(Term, Class, Trace1, FormatFun, S, Encoding),
+    FormatString = case Encoding of
+                       latin1 -> "~s~s";
+                       _ -> "~s~ts"
+                   end,
+    Expl = io_lib:fwrite(FormatString, [exited(Class), Expl0]),
+    case format_stacktrace1(S, Trace, FormatFun, StackFun, Encoding) of
         [] -> Expl;
         Stack -> [Expl, $\n, Stack]
     end.
 
 %% -> iolist() (no \n at end)
-format_stacktrace(I, StackTrace, StackFun, FormatFun) 
+format_stacktrace(I, StackTrace, StackFun, FormatFun) ->
+    format_stacktrace(I, StackTrace, StackFun, FormatFun, latin1).
+
+%% -> iolist() | unicode:charlist()  (no \n at end)
+format_stacktrace(I, StackTrace, StackFun, FormatFun, Encoding)
             when is_integer(I), I >= 1, is_function(StackFun, 3), 
                  is_function(FormatFun, 2) ->
     S = n_spaces(I-1),
-    format_stacktrace1(S, StackTrace, FormatFun, StackFun).
+    format_stacktrace1(S, StackTrace, FormatFun, StackFun, Encoding).
 
 %% -> iolist() (no \n at end)
-format_call(I, ForMForFun, As, FormatFun) when is_integer(I), I >= 1,
-                                               is_list(As),
-                                               is_function(FormatFun, 2) ->
-    format_call("", n_spaces(I-1), ForMForFun, As, FormatFun).
+format_call(I, ForMForFun, As, FormatFun) ->
+    format_call(I, ForMForFun, As, FormatFun, latin1).
+
+%% -> iolist() | unicode:charlist()  (no \n at end)
+format_call(I, ForMForFun, As, FormatFun, Enc)
+       when is_integer(I), I >= 1, is_list(As), is_function(FormatFun, 2) ->
+    format_call("", n_spaces(I-1), ForMForFun, As, FormatFun, Enc).
 
 %% -> iolist() (no \n at end)
 format_fun(Fun) when is_function(Fun) ->
@@ -204,79 +222,80 @@ is_stacktrace(_) ->
     false.
 
 %% ERTS exit codes (some of them are also returned by erl_eval):
-explain_reason(badarg, error, [], _PF, _S) ->
+explain_reason(badarg, error, [], _PF, _S, _Enc) ->
     <<"bad argument">>;
-explain_reason({badarg,V}, error=Cl, [], PF, S) -> % orelse, andalso
+explain_reason({badarg,V}, error=Cl, [], PF, S, _Enc) -> % orelse, andalso
     format_value(V, <<"bad argument: ">>, Cl, PF, S);
-explain_reason(badarith, error, [], _PF, _S) ->
+explain_reason(badarith, error, [], _PF, _S, _Enc) ->
     <<"an error occurred when evaluating an arithmetic expression">>;
-explain_reason({badarity,{Fun,As}}, error, [], _PF, _S) 
+explain_reason({badarity,{Fun,As}}, error, [], _PF, _S, _Enc)
                                       when is_function(Fun) ->
     %% Only the arity is displayed, not the arguments As.
     io_lib:fwrite(<<"~s called with ~s">>, 
                   [format_fun(Fun), argss(length(As))]);
-explain_reason({badfun,Term}, error=Cl, [], PF, S) ->
+explain_reason({badfun,Term}, error=Cl, [], PF, S, _Enc) ->
     format_value(Term, <<"bad function ">>, Cl, PF, S);
-explain_reason({badmatch,Term}, error=Cl, [], PF, S) ->
-    format_value(Term, <<"no match of right hand side value ">>, Cl, PF, S);
-explain_reason({case_clause,V}, error=Cl, [], PF, S) ->
+explain_reason({badmatch,Term}, error=Cl, [], PF, S, _Enc) ->
+    Str = <<"no match of right hand side value ">>,
+    format_value(Term, Str, Cl, PF, S);
+explain_reason({case_clause,V}, error=Cl, [], PF, S, _Enc) ->
     %% "there is no case clause with a true guard sequence and a
     %% pattern matching..."
     format_value(V, <<"no case clause matching ">>, Cl, PF, S);
-explain_reason(function_clause, error, [{F,A}], _PF, _S) ->
+explain_reason(function_clause, error, [{F,A}], _PF, _S, _Enc) ->
     %% Shell commands
     FAs = io_lib:fwrite(<<"~w/~w">>, [F, A]),
     [<<"no function clause matching call to ">> | FAs];
-explain_reason(function_clause, error=Cl, [{M,F,As,Loc}], PF, S) ->
+explain_reason(function_clause, error=Cl, [{M,F,As,Loc}], PF, S, Enc) ->
     Str = <<"no function clause matching ">>,
-    [format_errstr_call(Str, Cl, {M,F}, As, PF, S),$\s|location(Loc)];
-explain_reason(if_clause, error, [], _PF, _S) ->
+    [format_errstr_call(Str, Cl, {M,F}, As, PF, S, Enc),$\s|location(Loc)];
+explain_reason(if_clause, error, [], _PF, _S, _Enc) ->
     <<"no true branch found when evaluating an if expression">>;
-explain_reason(noproc, error, [], _PF, _S) ->
+explain_reason(noproc, error, [], _PF, _S, _Enc) ->
     <<"no such process or port">>;
-explain_reason(notalive, error, [], _PF, _S) ->
+explain_reason(notalive, error, [], _PF, _S, _Enc) ->
     <<"the node cannot be part of a distributed system">>;
-explain_reason(system_limit, error, [], _PF, _S) ->
+explain_reason(system_limit, error, [], _PF, _S, _Enc) ->
     <<"a system limit has been reached">>;
-explain_reason(timeout_value, error, [], _PF, _S) ->
+explain_reason(timeout_value, error, [], _PF, _S, _Enc) ->
     <<"bad receive timeout value">>;
-explain_reason({try_clause,V}, error=Cl, [], PF, S) ->
+explain_reason({try_clause,V}, error=Cl, [], PF, S, _Enc) ->
     %% "there is no try clause with a true guard sequence and a
     %% pattern matching..."
     format_value(V, <<"no try clause matching ">>, Cl, PF, S);
-explain_reason(undef, error, [{M,F,A,_}], _PF, _S) ->
+explain_reason(undef, error, [{M,F,A,_}], _PF, _S, _Enc) ->
     %% Only the arity is displayed, not the arguments, if there are any.
     io_lib:fwrite(<<"undefined function ~s">>, 
                   [mfa_to_string(M, F, n_args(A))]);
-explain_reason({shell_undef,F,A,_}, error, [], _PF, _S) ->
+explain_reason({shell_undef,F,A,_}, error, [], _PF, _S, _Enc) ->
     %% Give nicer reports for undefined shell functions
     %% (but not when the user actively calls shell_default:F(...)).
     io_lib:fwrite(<<"undefined shell command ~s/~w">>, [F, n_args(A)]);
 %% Exit codes returned by erl_eval only:
-explain_reason({argument_limit,_Fun}, error, [], _PF, _S) ->
+explain_reason({argument_limit,_Fun}, error, [], _PF, _S, _Enc) ->
     io_lib:fwrite(<<"limit of number of arguments to interpreted function"
                     " exceeded">>, []);
-explain_reason({bad_filter,V}, error=Cl, [], PF, S) ->
+explain_reason({bad_filter,V}, error=Cl, [], PF, S, _Enc) ->
     format_value(V, <<"bad filter ">>, Cl, PF, S);
-explain_reason({bad_generator,V}, error=Cl, [], PF, S) ->
+explain_reason({bad_generator,V}, error=Cl, [], PF, S, _Enc) ->
     format_value(V, <<"bad generator ">>, Cl, PF, S);
-explain_reason({unbound,V}, error, [], _PF, _S) ->
+explain_reason({unbound,V}, error, [], _PF, _S, _Enc) ->
     io_lib:fwrite(<<"variable ~w is unbound">>, [V]);
 %% Exit codes local to the shell module (restricted shell):
-explain_reason({restricted_shell_bad_return, V}, exit=Cl, [], PF, S) ->
+explain_reason({restricted_shell_bad_return, V}, exit=Cl, [], PF, S, _Enc) ->
     Str = <<"restricted shell module returned bad value ">>,
     format_value(V, Str, Cl, PF, S);
 explain_reason({restricted_shell_disallowed,{ForMF,As}}, 
-               exit=Cl, [], PF, S) ->
+               exit=Cl, [], PF, S, Enc) ->
     %% ForMF can be a fun, but not a shell fun.
     Str = <<"restricted shell does not allow ">>,
-    format_errstr_call(Str, Cl, ForMF, As, PF, S);
-explain_reason(restricted_shell_started, exit, [], _PF, _S) ->
+    format_errstr_call(Str, Cl, ForMF, As, PF, S, Enc);
+explain_reason(restricted_shell_started, exit, [], _PF, _S, _Enc) ->
     <<"restricted shell starts now">>;
-explain_reason(restricted_shell_stopped, exit, [], _PF, _S) ->
+explain_reason(restricted_shell_stopped, exit, [], _PF, _S, _Enc) ->
     <<"restricted shell stopped">>;
 %% Other exit code:
-explain_reason(Reason, Class, [], PF, S) ->
+explain_reason(Reason, Class, [], PF, S, _Enc) ->
     PF(Reason, (iolist_size(S)+1) + exited_size(Class)).
 
 n_args(A) when is_integer(A) ->
@@ -293,28 +312,28 @@ argss(2) ->
 argss(I) ->
     io_lib:fwrite(<<"~w arguments">>, [I]).
 
-format_stacktrace1(S0, Stack0, PF, SF) ->
+format_stacktrace1(S0, Stack0, PF, SF, Enc) ->
     Stack1 = lists:dropwhile(fun({M,F,A,_}) -> SF(M, F, A)
                              end, lists:reverse(Stack0)),
     S = ["  " | S0],
     Stack = lists:reverse(Stack1),
-    format_stacktrace2(S, Stack, 1, PF).
+    format_stacktrace2(S, Stack, 1, PF, Enc).
 
-format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF) when is_integer(A) ->
+format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF, Enc) when is_integer(A) ->
     [io_lib:fwrite(<<"~s~s ~s ~s">>,
                    [sep(N, S), origin(N, M, F, A),
 		    mfa_to_string(M, F, A),
 		    location(L)])
-     | format_stacktrace2(S, Fs, N + 1, PF)];
-format_stacktrace2(S, [{M,F,As,_}|Fs], N, PF) when is_list(As) ->
+     | format_stacktrace2(S, Fs, N + 1, PF, Enc)];
+format_stacktrace2(S, [{M,F,As,_}|Fs], N, PF, Enc) when is_list(As) ->
     A = length(As),
     CalledAs = [S,<<"   called as ">>],
-    C = format_call("", CalledAs, {M,F}, As, PF),
-    [io_lib:fwrite(<<"~s~s ~s\n~s~s">>,
+    C = format_call("", CalledAs, {M,F}, As, PF, Enc),
+    [io_lib:fwrite(<<"~s~s ~s\n~s~ts">>,
 		   [sep(N, S), origin(N, M, F, A), mfa_to_string(M, F, A),
                     CalledAs, C])
-     | format_stacktrace2(S, Fs, N + 1, PF)];
-format_stacktrace2(_S, [], _N, _PF) ->
+     | format_stacktrace2(S, Fs, N + 1, PF, Enc)];
+format_stacktrace2(_S, [], _N, _PF, _Enc) ->
     "".
 
 location(L) ->
@@ -338,22 +357,22 @@ origin(1, M, F, A) ->
 origin(_N, _M, _F, _A) ->
     <<"in call from">>.
 
-format_errstr_call(ErrStr, Class, ForMForFun, As, PF, Pre0) ->
+format_errstr_call(ErrStr, Class, ForMForFun, As, PF, Pre0, Enc) ->
     Pre1 = [Pre0 | n_spaces(exited_size(Class))],
-    format_call(ErrStr, Pre1, ForMForFun, As, PF).
+    format_call(ErrStr, Pre1, ForMForFun, As, PF, Enc).
 
-format_call(ErrStr, Pre1, ForMForFun, As, PF) ->
+format_call(ErrStr, Pre1, ForMForFun, As, PF, Enc) ->
     Arity = length(As),
     [ErrStr |
      case is_op(ForMForFun, Arity) of
          {yes,Op} -> 
-             format_op(ErrStr, Pre1, Op, As, PF);
+             format_op(ErrStr, Pre1, Op, As, PF, Enc);
          no ->
              MFs = mf_to_string(ForMForFun, Arity),
              I1 = iolist_size([Pre1,ErrStr|MFs]),
-             S1 = pp_arguments(PF, As, I1),
-             S2 = pp_arguments(PF, As, iolist_size([Pre1|MFs])),
-             Long = count_nl(pp_arguments(PF, [a2345,b2345], I1)) > 0,
+             S1 = pp_arguments(PF, As, I1, Enc),
+             S2 = pp_arguments(PF, As, iolist_size([Pre1|MFs]), Enc),
+             Long = count_nl(pp_arguments(PF, [a2345,b2345], I1, Enc)) > 0,
              case Long or (count_nl(S2) < count_nl(S1)) of
                  true ->
                      [$\n, Pre1, MFs, S2];
@@ -362,11 +381,11 @@ format_call(ErrStr, Pre1, ForMForFun, As, PF) ->
              end
     end].
 
-format_op(ErrStr, Pre, Op, [A1], PF) ->
+format_op(ErrStr, Pre, Op, [A1], PF, _Enc) ->
     OpS = io_lib:fwrite(<<"~s ">>, [Op]),
     I1 = iolist_size([ErrStr,Pre,OpS]),
     [OpS | PF(A1, I1+1)];
-format_op(ErrStr, Pre, Op, [A1, A2], PF) ->
+format_op(ErrStr, Pre, Op, [A1, A2], PF, Enc) ->
     I1 = iolist_size([ErrStr,Pre]),
     S1 = PF(A1, I1+1),
     S2 = PF(A2, I1+1),
@@ -377,33 +396,40 @@ format_op(ErrStr, Pre, Op, [A1, A2], PF) ->
             [S1,Pre1,OpS,Pre1|S2];
         false ->
             OpS2 = io_lib:fwrite(<<" ~s ">>, [Op]),
-            S2_2 = PF(A2, iolist_size([ErrStr,Pre,S1|OpS2])+1),
+            Size1 = iolist_size([ErrStr,Pre|OpS2]),
+            {Size2,S1_2} = size(Enc, S1),
+            S2_2 = PF(A2, Size1+Size2+1),
             case count_nl(S2) < count_nl(S2_2) of
                 true ->
-                    [S1,Pre1,OpS,Pre1|S2];
+                    [S1_2,Pre1,OpS,Pre1|S2];
                 false ->
-                    [S1,OpS2|S2_2]
+                    [S1_2,OpS2|S2_2]
             end
     end.
 
-pp_arguments(PF, As, I) ->
-    case {As, io_lib:printable_list(As)} of
+pp_arguments(PF, As, I, Enc) ->
+    case {As, printable_list(Enc, As)} of
         {[Int | T], true} ->
             L = integer_to_list(Int),
             Ll = length(L),
             A = list_to_atom(lists:duplicate(Ll, $a)),
-            S0 = binary_to_list(iolist_to_binary(PF([A | T], I+1))),
-            brackets_to_parens([$[,L,string:sub_string(S0, 2+Ll)]);
+            S0 = unicode:characters_to_list(PF([A | T], I+1), Enc),
+            brackets_to_parens([$[,L,string:sub_string(S0, 2+Ll)], Enc);
         _ -> 
-            brackets_to_parens(PF(As, I+1))
+            brackets_to_parens(PF(As, I+1), Enc)
     end.
 
-brackets_to_parens(S) ->
-    B = iolist_to_binary(S),
+brackets_to_parens(S, Enc) ->
+    B = unicode:characters_to_binary(S, Enc),
     Sz = byte_size(B) - 2,
     <<$[,R:Sz/binary,$]>> = B,
     [$(,R,$)].
 
+printable_list(latin1, As) ->
+    io_lib:printable_list(As);
+printable_list(_, As) ->
+    io_lib:printable_unicode_list(As).
+
 mfa_to_string(M, F, A) ->
     io_lib:fwrite(<<"~s/~w">>, [mf_to_string({M, F}, A), A]).
 
@@ -472,3 +498,10 @@ exited(exit) ->
     <<"exception exit: ">>;
 exited(throw) ->
     <<"exception throw: ">>.
+
+size(latin1, S) ->
+    {iolist_size(S),S};
+size(_, S0) ->
+    S = unicode:characters_to_list(S0, unicode),
+    true = is_list(S),
+    {length(S),S}.
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index cddf345c76..9257953071 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
 %%
 %% The 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,89 +78,89 @@ obsolete_1(snmp, N, A) ->
     end;
 
 obsolete_1(snmpm, agent_info, 3) ->
-    {deprecated, {snmpm, agent_info, 2}, "R16B"};
+    {removed, {snmpm, agent_info, 2}, "R16B"};
 obsolete_1(snmpm, update_agent_info, 5) ->
-    {deprecated, {snmpm, update_agent_info, 4}, "R16B"};
+    {removed, {snmpm, update_agent_info, 4}, "R16B"};
 obsolete_1(snmpm, g, 3) ->
-    {deprecated, {snmpm, sync_get, 3}, "R16B"};
+    {removed, {snmpm, sync_get, 3}, "R16B"};
 obsolete_1(snmpm, g, 4) ->
-    {deprecated, {snmpm, sync_get, [3,4]}, "R16B"};
+    {removed, {snmpm, sync_get, [3,4]}, "R16B"};
 obsolete_1(snmpm, g, 5) ->
-    {deprecated, {snmpm, sync_get, [4,5]}, "R16B"};
+    {removed, {snmpm, sync_get, [4,5]}, "R16B"};
 obsolete_1(snmpm, g, 6) ->
-    {deprecated, {snmpm, sync_get, [5,6]}, "R16B"};
+    {removed, {snmpm, sync_get, [5,6]}, "R16B"};
 obsolete_1(snmpm, g, 7) ->
-    {deprecated, {snmpm, sync_get, 6}, "R16B"};
+    {removed, {snmpm, sync_get, 6}, "R16B"};
 obsolete_1(snmpm, ag, 3) ->
-    {deprecated, {snmpm, async_get, 3}, "R16B"};
+    {removed, {snmpm, async_get, 3}, "R16B"};
 obsolete_1(snmpm, ag, 4) ->
-    {deprecated, {snmpm, async_get, [3,4]}, "R16B"};
+    {removed, {snmpm, async_get, [3,4]}, "R16B"};
 obsolete_1(snmpm, ag, 5) ->
-    {deprecated, {snmpm, async_get, [4,5]}, "R16B"};
+    {removed, {snmpm, async_get, [4,5]}, "R16B"};
 obsolete_1(snmpm, ag, 6) ->
-    {deprecated, {snmpm, async_get, [5,6]}, "R16B"};
+    {removed, {snmpm, async_get, [5,6]}, "R16B"};
 obsolete_1(snmpm, ag, 7) ->
-    {deprecated, {snmpm, async_get, 6}, "R16B"};
+    {removed, {snmpm, async_get, 6}, "R16B"};
 obsolete_1(snmpm, gn, 3) ->
-    {deprecated, {snmpm, sync_get_next, 3}, "R16B"};
+    {removed, {snmpm, sync_get_next, 3}, "R16B"};
 obsolete_1(snmpm, gn, 4) ->
-    {deprecated, {snmpm, sync_get_next, [3,4]}, "R16B"};
+    {removed, {snmpm, sync_get_next, [3,4]}, "R16B"};
 obsolete_1(snmpm, gn, 5) ->
-    {deprecated, {snmpm, sync_get_next, [4,5]}, "R16B"};
+    {removed, {snmpm, sync_get_next, [4,5]}, "R16B"};
 obsolete_1(snmpm, gn, 6) ->
-    {deprecated, {snmpm, sync_get_next, [5,6]}, "R16B"};
+    {removed, {snmpm, sync_get_next, [5,6]}, "R16B"};
 obsolete_1(snmpm, gn, 7) ->
-    {deprecated, {snmpm, sync_get_next, 6}, "R16B"};
+    {removed, {snmpm, sync_get_next, 6}, "R16B"};
 obsolete_1(snmpm, agn, 3) ->
-    {deprecated, {snmpm, async_get_next, 3}, "R16B"};
+    {removed, {snmpm, async_get_next, 3}, "R16B"};
 obsolete_1(snmpm, agn, 4) ->
-    {deprecated, {snmpm, async_get_next, [3,4]}, "R16B"};
+    {removed, {snmpm, async_get_next, [3,4]}, "R16B"};
 obsolete_1(snmpm, agn, 5) ->
-    {deprecated, {snmpm, async_get_next, [4,5]}, "R16B"};
+    {removed, {snmpm, async_get_next, [4,5]}, "R16B"};
 obsolete_1(snmpm, agn, 6) ->
-    {deprecated, {snmpm, async_get_next, [5,6]}, "R16B"};
+    {removed, {snmpm, async_get_next, [5,6]}, "R16B"};
 obsolete_1(snmpm, agn, 7) ->
-    {deprecated, {snmpm, async_get_next, 6}, "R16B"};
+    {removed, {snmpm, async_get_next, 6}, "R16B"};
 obsolete_1(snmpm, s, 3) ->
-    {deprecated, {snmpm, sync_set, 3}, "R16B"};
+    {removed, {snmpm, sync_set, 3}, "R16B"};
 obsolete_1(snmpm, s, 4) ->
-    {deprecated, {snmpm, sync_set, [3,4]}, "R16B"};
+    {removed, {snmpm, sync_set, [3,4]}, "R16B"};
 obsolete_1(snmpm, s, 5) ->
-    {deprecated, {snmpm, sync_set, [4,5]}, "R16B"};
+    {removed, {snmpm, sync_set, [4,5]}, "R16B"};
 obsolete_1(snmpm, s, 6) ->
-    {deprecated, {snmpm, sync_set, [5,6]}, "R16B"};
+    {removed, {snmpm, sync_set, [5,6]}, "R16B"};
 obsolete_1(snmpm, s, 7) ->
-    {deprecated, {snmpm, sync_set, 6}, "R16B"};
+    {removed, {snmpm, sync_set, 6}, "R16B"};
 obsolete_1(snmpm, as, 3) ->
-    {deprecated, {snmpm, async_set, 3}, "R16B"};
+    {removed, {snmpm, async_set, 3}, "R16B"};
 obsolete_1(snmpm, as, 4) ->
-    {deprecated, {snmpm, async_set, [3,4]}, "R16B"};
+    {removed, {snmpm, async_set, [3,4]}, "R16B"};
 obsolete_1(snmpm, as, 5) ->
-    {deprecated, {snmpm, async_set, [4,5]}, "R16B"};
+    {removed, {snmpm, async_set, [4,5]}, "R16B"};
 obsolete_1(snmpm, as, 6) ->
-    {deprecated, {snmpm, async_set, [5,6]}, "R16B"};
+    {removed, {snmpm, async_set, [5,6]}, "R16B"};
 obsolete_1(snmpm, as, 7) ->
-    {deprecated, {snmpm, async_set, 6}, "R16B"};
+    {removed, {snmpm, async_set, 6}, "R16B"};
 obsolete_1(snmpm, gb, 5) ->
-    {deprecated, {snmpm, sync_get_bulk, 5}, "R16B"};
+    {removed, {snmpm, sync_get_bulk, 5}, "R16B"};
 obsolete_1(snmpm, gb, 6) ->
-    {deprecated, {snmpm, sync_get_bulk, [5,6]}, "R16B"};
+    {removed, {snmpm, sync_get_bulk, [5,6]}, "R16B"};
 obsolete_1(snmpm, gb, 7) ->
-    {deprecated, {snmpm, sync_get_bulk, [6,7]}, "R16B"};
+    {removed, {snmpm, sync_get_bulk, [6,7]}, "R16B"};
 obsolete_1(snmpm, gb, 8) ->
-    {deprecated, {snmpm, sync_get_bulk, [7,8]}, "R16B"};
+    {removed, {snmpm, sync_get_bulk, [7,8]}, "R16B"};
 obsolete_1(snmpm, gb, 9) ->
-    {deprecated, {snmpm, sync_get_bulk, 8}, "R16B"};
+    {removed, {snmpm, sync_get_bulk, 8}, "R16B"};
 obsolete_1(snmpm, agb, 5) ->
-    {deprecated, {snmpm, async_get_bulk, 5}, "R16B"};
+    {removed, {snmpm, async_get_bulk, 5}, "R16B"};
 obsolete_1(snmpm, agb, 6) ->
-    {deprecated, {snmpm, async_get_bulk, [5,6]}, "R16B"};
+    {removed, {snmpm, async_get_bulk, [5,6]}, "R16B"};
 obsolete_1(snmpm, agb, 7) ->
-    {deprecated, {snmpm, async_get_bulk, [6,7]}, "R16B"};
+    {removed, {snmpm, async_get_bulk, [6,7]}, "R16B"};
 obsolete_1(snmpm, agb, 8) ->
-    {deprecated, {snmpm, async_get_bulk, [7,8]}, "R16B"};
+    {removed, {snmpm, async_get_bulk, [7,8]}, "R16B"};
 obsolete_1(snmpm, agb, 9) ->
-    {deprecated, {snmpm, async_get_bulk, 8}, "R16B"};
+    {removed, {snmpm, async_get_bulk, 8}, "R16B"};
 
 
 %% *** MEGACO ***
@@ -347,7 +347,7 @@ obsolete_1(docb_xml_check, _, _) ->
 obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver ->
     {deprecated,"deprecated (will be removed in R16A); has no effect as drivers are no longer used."};
 obsolete_1(ssl, pid, 1) ->
-    {deprecated,"deprecated (will be removed in R17); is no longer needed"};
+    {removed,"was removed in R16; is no longer needed"};
 obsolete_1(inviso, _, _) ->
     {removed,"the inviso application was removed in R16"};
 
@@ -359,6 +359,45 @@ obsolete_1(ssh, sign_data, 2) ->
      "and public_key:sign/3 instead"};
 obsolete_1(ssh, verify_data, 3) ->
     {deprecated,"deprecated (will be removed in R16A); use public_key:ssh_decode/1, and public_key:verify/4 instead"};
+
+%% Added in R16
+obsolete_1(wxCalendarCtrl, enableYearChange, _) -> %% wx bug documented?
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxDC, computeScaleAndOrigin, 1) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxClientDC, new, 0) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxPaintDC, new, 0) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxWindowDC, new, 0) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxGraphicsContext, createLinearGradientBrush, 7) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxGraphicsContext, createRadialGradientBrush, 8) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxGraphicsRenderer, createLinearGradientBrush, 7) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxGraphicsRenderer, createRadialGradientBrush, 8) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxGridCellEditor, endEdit, 4) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxGridCellEditor, paintBackground, 3) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxIdleEvent, canSend, 1) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxMDIClientWindow, new, 1) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxMDIClientWindow, new, 2) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxPostScriptDC, getResolution, 0) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxPostScriptDC, setResolution, 1) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxCursor, new, 3) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+obsolete_1(wxCursor, new, 4) ->
+    {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
+
 obsolete_1(_, _, _) ->
     no.
 
diff --git a/lib/stdlib/src/proplists.erl b/lib/stdlib/src/proplists.erl
index e3eda5d932..204f8e128c 100644
--- a/lib/stdlib/src/proplists.erl
+++ b/lib/stdlib/src/proplists.erl
@@ -51,20 +51,21 @@
 
 -export_type([property/0, proplist/0]).
 
--type property()   :: atom() | tuple().
+-type property()  :: atom() | tuple().
 -type proplist()  :: [property()].
 
 %% ---------------------------------------------------------------------
 
 %% @doc Creates a normal form (minimal) representation of a property. If
-%% <code>P</code> is <code>{Key, true}</code> where <code>Key</code> is
-%% an atom, this returns <code>Key</code>, otherwise the whole term
-%% <code>P</code> is returned.
+%% <code>PropertyIn</code> is <code>{Key, true}</code> where
+%% <code>Key</code> is an atom, this returns <code>Key</code>, otherwise
+%% the whole term <code>PropertyIn</code> is returned.
 %%
 %% @see property/2
 
--spec property(Property) -> Property when
-      Property :: property().
+-spec property(PropertyIn) -> PropertyOut when
+      PropertyIn :: property(),
+      PropertyOut :: property().
 
 property({Key, true}) when is_atom(Key) ->
     Key;
@@ -92,13 +93,14 @@ property(Key, Value) ->
 
 %% ---------------------------------------------------------------------
 
-%% @doc Unfolds all occurences of atoms in <code>List</code> to tuples
+%% @doc Unfolds all occurences of atoms in <code>ListIn</code> to tuples
 %% <code>{Atom, true}</code>.
 %%
 %% @see compact/1
 
--spec unfold(List) -> List when
-      List :: [term()].
+-spec unfold(ListIn) -> ListOut when
+      ListIn :: [term()],
+      ListOut :: [term()].
 
 unfold([P | Ps]) ->
     if is_atom(P) ->
@@ -110,16 +112,17 @@ unfold([]) ->
     [].
 
 %% @doc Minimizes the representation of all entries in the list. This is
-%% equivalent to <code>[property(P) || P &lt;- List]</code>.
+%% equivalent to <code>[property(P) || P &lt;- ListIn]</code>.
 %%
 %% @see unfold/1
 %% @see property/1
 
--spec compact(List) -> List when
-      List :: [property()].
+-spec compact(ListIn) -> ListOut when
+      ListIn :: [property()],
+      ListOut :: [property()].
 
-compact(List) ->
-    [property(P) || P <- List].
+compact(ListIn) ->
+    [property(P) || P <- ListIn].
 
 
 %% ---------------------------------------------------------------------
@@ -199,7 +202,7 @@ is_defined(_Key, []) ->
 
 -spec get_value(Key, List) -> term() when
       Key :: term(),
-      List :: List::[term()].
+      List :: [term()].
 
 get_value(Key, List) ->
     get_value(Key, List, undefined).
@@ -272,9 +275,10 @@ get_all_values(_Key, []) ->
 %%
 %% @see get_all_values/2
 
--spec append_values(Key, List) -> List when
+-spec append_values(Key, ListIn) -> ListOut when
       Key :: term(),
-      List :: [term()].
+      ListIn :: [term()],
+      ListOut :: [term()].
 
 append_values(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -357,7 +361,7 @@ get_keys([], Keys) ->
 
 -spec delete(Key, List) -> List when
       Key :: term(),
-      List::[term()].
+      List :: [term()].
 
 delete(Key, [P | Ps]) ->
     if is_atom(P), P =:= Key ->
@@ -374,7 +378,7 @@ delete(_, []) ->
 %% ---------------------------------------------------------------------
 
 %% @doc Substitutes keys of properties. For each entry in
-%% <code>List</code>, if it is associated with some key <code>K1</code>
+%% <code>ListIn</code>, if it is associated with some key <code>K1</code>
 %% such that <code>{K1, K2}</code> occurs in <code>Aliases</code>, the
 %% key of the entry is changed to <code>Key2</code>. If the same
 %% <code>K1</code> occurs more than once in <code>Aliases</code>, only
@@ -388,10 +392,11 @@ delete(_, []) ->
 %% @see substitute_negations/2
 %% @see normalize/2
 
--spec substitute_aliases(Aliases, List) -> List when
+-spec substitute_aliases(Aliases, ListIn) -> ListOut when
       Aliases :: [{Key, Key}],
       Key :: term(),
-      List::[term()].
+      ListIn :: [term()],
+      ListOut :: [term()].
 
 substitute_aliases(As, Props) ->
     [substitute_aliases_1(As, P) || P <- Props].
@@ -411,13 +416,13 @@ substitute_aliases_1([], P) ->
 %% ---------------------------------------------------------------------
 
 %% @doc Substitutes keys of boolean-valued properties and simultaneously
-%% negates their values. For each entry in <code>List</code>, if it is
+%% negates their values. For each entry in <code>ListIn</code>, if it is
 %% associated with some key <code>K1</code> such that <code>{K1,
 %% K2}</code> occurs in <code>Negations</code>, then if the entry was
 %% <code>{K1, true}</code> it will be replaced with <code>{K2,
 %% false}</code>, otherwise it will be replaced with <code>{K2,
 %% true}</code>, thus changing the name of the option and simultaneously
-%% negating the value given by <code>get_bool(List)</code>. If the same
+%% negating the value given by <code>get_bool(ListIn)</code>. If the same
 %% <code>K1</code> occurs more than once in <code>Negations</code>, only
 %% the first occurrence is used.
 %%
@@ -431,10 +436,11 @@ substitute_aliases_1([], P) ->
 %% @see substitute_aliases/2
 %% @see normalize/2
 
--spec substitute_negations(Negations, List) -> List when
+-spec substitute_negations(Negations, ListIn) -> ListOut when
       Negations :: [{Key, Key}],
       Key :: term(),
-      List :: [term()].
+      ListIn :: [term()],
+      ListOut :: [term()].
 
 substitute_negations(As, Props) ->
     [substitute_negations_1(As, P) || P <- Props].
@@ -466,11 +472,11 @@ substitute_negations_1([], P) ->
 %% @doc Expands particular properties to corresponding sets of
 %% properties (or other terms). For each pair <code>{Property,
 %% Expansion}</code> in <code>Expansions</code>, if <code>E</code> is
-%% the first entry in <code>List</code> with the same key as
+%% the first entry in <code>ListIn</code> with the same key as
 %% <code>Property</code>, and <code>E</code> and <code>Property</code>
 %% have equivalent normal forms, then <code>E</code> is replaced with
 %% the terms in <code>Expansion</code>, and any following entries with
-%% the same key are deleted from <code>List</code>.
+%% the same key are deleted from <code>ListIn</code>.
 %%
 %% <p>For example, the following expressions all return <code>[fie, bar,
 %% baz, fum]</code>:
@@ -497,9 +503,10 @@ substitute_negations_1([], P) ->
 %%
 %% @see normalize/2
 
--spec expand(Expansions, List) -> List when
+-spec expand(Expansions, ListIn) -> ListOut when
       Expansions :: [{Property :: property(), Expansion :: [term()]}],
-      List :: [term()].
+      ListIn :: [term()],
+      ListOut :: [term()].
 
 expand(Es, Ps) when is_list(Ps) ->
     Es1 = [{property(P), V} || {P, V} <- Es],
@@ -599,15 +606,16 @@ flatten([]) ->
 %% @see expand/2
 %% @see compact/1
 
--spec normalize(List, Stages) -> List when
-      List :: [term()],
+-spec normalize(ListIn, Stages) -> ListOut when
+      ListIn :: [term()],
       Stages :: [Operation],
       Operation :: {'aliases', Aliases}
                  | {'negations', Negations}
                  | {'expand', Expansions},
       Aliases :: [{Key, Key}],
       Negations :: [{Key, Key}],
-      Expansions :: [{Property :: property(), Expansion :: [term()]}].
+      Expansions :: [{Property :: property(), Expansion :: [term()]}],
+      ListOut :: [term()].
 
 normalize(L, [{aliases, As} | Xs]) ->
     normalize(substitute_aliases(As, L), Xs);
diff --git a/lib/stdlib/src/qlc_pt.erl b/lib/stdlib/src/qlc_pt.erl
index ad25fd559c..d441f38e44 100644
--- a/lib/stdlib/src/qlc_pt.erl
+++ b/lib/stdlib/src/qlc_pt.erl
@@ -31,9 +31,6 @@
 %% Also in qlc.erl.
 -define(QLC_Q(L1, L2, L3, L4, LC, Os), 
         {call,L1,{remote,L2,{atom,L3,?APIMOD},{atom,L4,?Q}},[LC | Os]}).
--define(QLC_QQ(L1, L2, L3, L4, L5, L6, LC, Os), % packages...
-        {call,L1,{remote,L2,{record_field,L3,{atom,L4,''},
-                             {atom,L5,?APIMOD}},{atom,L6,?Q}},[LC | Os]}).
 -define(IMP_Q(L1, L2, LC, Os), {call,L,{atom,L2,?Q},[LC | Os]}).
 
 %% Also in qlc.erl.
@@ -2475,13 +2472,6 @@ qlcmf(?QLC_Q(L1, L2, L3, L4, LC0, Os0), F, Imp, A0, No0) when length(Os0) < 2 ->
     NL = make_lcid(L1, No),
     {T, A} = F(NL, LC, A2),
     {?QLC_Q(L1, L2, L3, L4, T, Os), A, No + 1};
-qlcmf(?QLC_QQ(L1, L2, L3, L4, L5, L6, LC0, Os0),
-      F, Imp, A0, No0) when length(Os0) < 2 ->
-    {Os, A1, No1} = qlcmf(Os0, F, Imp, A0, No0),
-    {LC, A2, No} = qlcmf(LC0, F, Imp, A1, No1), % nested...
-    NL = make_lcid(L1, No),
-    {T, A} = F(NL, LC, A2),
-    {?QLC_QQ(L1, L2, L3, L4, L5, L6, T, Os), A, No + 1};
 qlcmf(?IMP_Q(L1, L2, LC0, Os0), F, Imp=true, A0, No0) when length(Os0) < 2 ->
     {Os, A1, No1} = qlcmf(Os0, F, Imp, A0, No0),
     {LC, A2, No} = qlcmf(LC0, F, Imp, A1, No1), % nested...
diff --git a/lib/stdlib/src/queue.erl b/lib/stdlib/src/queue.erl
index afe917b151..bc1bd06534 100644
--- a/lib/stdlib/src/queue.erl
+++ b/lib/stdlib/src/queue.erl
@@ -472,22 +472,24 @@ init(Q) -> drop_r(Q).
 
 -compile({inline, [{r2f,1},{f2r,1}]}).
 
-%% Move all but two from R to F, if there are at least three
+%% Move half of elements from R to F, if there are at least three
 r2f([]) ->
     {[],[]};
 r2f([_]=R) ->
     {[],R};
 r2f([X,Y]) ->
     {[X],[Y]};
-r2f([X,Y|R]) ->
-    {[X,Y],lists:reverse(R, [])}.
+r2f(List) ->
+    {FF,RR} = lists:split(length(List) div 2 + 1, List),
+    {FF,lists:reverse(RR, [])}.
 
-%% Move all but two from F to R, if there are enough
+%% Move half of elements from F to R, if there are enough
 f2r([]) ->
     {[],[]};
 f2r([_]=F) ->
     {F,[]};
 f2r([X,Y]) ->
     {[Y],[X]};
-f2r([X,Y|F]) ->
-    {lists:reverse(F, []),[X,Y]}.
+f2r(List) ->
+    {FF,RR} = lists:split(length(List) div 2 + 1, List),
+    {lists:reverse(RR, []),FF}.
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index 3fd6c81e5f..e6f05b71d4 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
 %% 
 %% The 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 +18,7 @@
 %% %CopyrightEnd%
 %%
 
-%% We use the dynamic hashing techniques by Per-�ke Larsson as
+%% We use the dynamic hashing techniques by Per-Åke Larsson as
 %% described in "The Design and Implementation of Dynamic Hashing for
 %% Sets and Tables in Icon" by Griswold and Townsend.  Much of the
 %% terminology comes from that paper as well.
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index dc450f0ee6..5c929d2f51 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -128,7 +128,7 @@ start_restricted(RShMod) when is_atom(RShMod) ->
 	    error_logger:error_report(
 	      lists:flatten(
 		io_lib:fwrite(
-		  <<"Restricted shell module ~w not found: ~p\n">>, 
+		  "Restricted shell module ~w not found: ~"++cs_p() ++"\n",
 		  [RShMod,What]))),
 	    Error
     end.
@@ -139,16 +139,6 @@ stop_restricted() ->
     application:unset_env(stdlib, restricted_shell),
     exit(restricted_shell_stopped).
 
-default_packages() ->
-    [].
-%%%     ['erl','erl.lang'].
-
-default_modules() ->
-    [].
-%%%     [{pdict, 'erl.lang.proc.pdict'},
-%%%      {keylist, 'erl.lang.list.keylist'},
-%%%      {debug, 'erl.system.debug'}].
-
 -spec server(boolean(), boolean()) -> 'terminated'.
 
 server(NoCtrlG, StartSync) ->
@@ -183,16 +173,7 @@ server(StartSync) ->
 	    end
     end,
     %% Our spawner has fixed the process groups.
-    Bs0 = erl_eval:new_bindings(),
-    Bs = lists:foldl(fun ({K, V}, D) ->
-			     erl_eval:add_binding({module,K}, V, D)
-		     end,
-		     lists:foldl(fun (P, D) ->
-					 import_all(P, D)
-				 end,
-				 Bs0, default_packages()),
-		     default_modules()),
-    %% io:fwrite("Imported modules: ~p.\n", [erl_eval:bindings(Bs)]),
+    Bs = erl_eval:new_bindings(),
 
     %% Use an Ets table for record definitions. It takes too long to
     %% send a huge term to and from the evaluator. Ets makes it
@@ -230,9 +211,10 @@ server(StartSync) ->
             ok;
 	{RShMod2,What2} -> 
             io:fwrite(
-              <<"Warning! Restricted shell module ~w not found: ~p.\n"
-                "Only the commands q() and init:stop() will be allowed!\n">>,
-                      [RShMod2,What2]),
+              ("Warning! Restricted shell module ~w not found: ~"
+               ++cs_p()++".\n"
+               "Only the commands q() and init:stop() will be allowed!\n"),
+              [RShMod2,What2]),
             application:set_env(stdlib, restricted_shell, ?MODULE)
     end,
 
@@ -244,7 +226,7 @@ server_loop(N0, Eval_0, Bs00, RT, Ds00, History0, Results0) ->
     {Eval_1,Bs0,Ds0,Prompt} = prompt(N, Eval_0, Bs00, RT, Ds00),
     {Res,Eval0} = get_command(Prompt, Eval_1, Bs0, RT, Ds0),
     case Res of 
-	{ok,Es0,_EndLine} ->
+	{ok,Es0} ->
             case expand_hist(Es0, N) of
                 {ok,Es} ->
                     {V,Eval,Bs,Ds} = shell_cmd(Es, Eval0, Bs0, RT, Ds0, cmd),
@@ -263,11 +245,11 @@ server_loop(N0, Eval_0, Bs00, RT, Ds00, History0, Results0) ->
                     end,
                     server_loop(N, Eval, Bs, RT, Ds, History, Results);
                 {error,E} ->
-                    fwrite_severity(benign, <<"~s">>, [E]),
+                    fwrite_severity(benign, <<"~ts">>, [E]),
                     server_loop(N0, Eval0, Bs0, RT, Ds0, History0, Results0)
             end;
-	{error,{Line,Mod,What},_EndLine} ->
-            fwrite_severity(benign, <<"~w: ~s">>, 
+	{error,{Line,Mod,What}} ->
+            fwrite_severity(benign, <<"~w: ~ts">>,
                             [Line, Mod:format_error(What)]),
 	    server_loop(N0, Eval0, Bs0, RT, Ds0, History0, Results0);
 	{error,terminated} ->			%Io process terminated
@@ -277,20 +259,35 @@ server_loop(N0, Eval_0, Bs00, RT, Ds00, History0, Results0) ->
 	    exit(Eval0, kill),
 	    {_,Eval,_,_} = shell_rep(Eval0, Bs0, RT, Ds0),
 	    server_loop(N0, Eval, Bs0, RT, Ds0, History0, Results0);
-	{error,tokens} ->			%Most probably unicode > 255
+	{error,tokens} ->			%Most probably character > 255
             fwrite_severity(benign, <<"~w: Invalid tokens.">>, 
                             [N]),
 	    server_loop(N0, Eval0, Bs0, RT, Ds0, History0, Results0);
-	{eof,_EndLine} ->
-            fwrite_severity(fatal, <<"Terminating erlang (~w)">>, [node()]),
-	    halt();
 	eof ->
             fwrite_severity(fatal, <<"Terminating erlang (~w)">>, [node()]),
 	    halt()
     end.
 
 get_command(Prompt, Eval, Bs, RT, Ds) ->
-    Parse = fun() -> exit(io:parse_erl_exprs(Prompt)) end,
+    Parse =
+        fun() ->
+                exit(
+                  case
+                      io:scan_erl_exprs(group_leader(), Prompt, 1, [unicode])
+                  of
+                      {ok,Toks,_EndPos} ->
+                          erl_parse:parse_exprs(Toks);
+                      {eof,_EndPos} ->
+                          eof;
+                      {error,ErrorInfo,_EndPos} ->
+                          %% Skip the rest of the line:
+                          _ = io:get_line(''),
+                          {error,ErrorInfo};
+                      Else ->
+                          Else
+                  end
+                )
+        end,
     Pid = spawn_link(Parse),
     get_command1(Pid, Eval, Bs, RT, Ds).
 
@@ -337,7 +334,7 @@ get_prompt_func() ->
     end.
 
 bad_prompt_func(M) ->
-    fwrite_severity(benign, <<"Bad prompt function: ~p">>, [M]).
+    fwrite_severity(benign, "Bad prompt function: ~"++cs_p(), [M]).
 
 default_prompt(N) ->
     %% Don't bother flattening the list irrespective of what the
@@ -453,7 +450,8 @@ expand_bin_elements([{bin_element,L,E,Sz,Ts}|Fs], C) ->
 
 no_command(N) ->
     throw({error,
-           io_lib:fwrite(<<"~s: command not found">>, [erl_pp:expr(N)])}).
+           io_lib:fwrite(<<"~ts: command not found">>,
+                         [erl_pp:expr(N, enc())])}).
 
 %% add_cmd(Number, Expressions, Value)
 %% get_cmd(Number, CurrentCommand)
@@ -518,7 +516,7 @@ shell_rep(Ev, Bs0, RT, Ds0) ->
 	{shell_rep,Ev,{value,V,Bs,Ds}} ->
 	    {V,Ev,Bs,Ds};
         {shell_rep,Ev,{command_error,{Line,M,Error}}} -> 
-            fwrite_severity(benign, <<"~w: ~s">>, 
+            fwrite_severity(benign, <<"~w: ~ts">>,
                             [Line, M:format_error(Error)]),
             {{'EXIT',Error},Ev,Bs0,Ds0};
 	{shell_req,Ev,get_cmd} ->
@@ -570,9 +568,10 @@ report_exception(Class, Severity, {Reason,Stacktrace}, RT) ->
     I = iolist_size(Tag) + 1,
     PF = fun(Term, I1) -> pp(Term, I1, RT) end,
     SF = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
-    io:requests([{put_chars, Tag},
-                 {put_chars, 
-                  lib:format_exception(I, Class, Reason, Stacktrace, SF, PF)},
+    Enc = encoding(),
+    Str = lib:format_exception(I, Class, Reason, Stacktrace, SF, PF, Enc),
+    io:requests([{put_chars, latin1, Tag},
+                 {put_chars, unicode, Str},
                  nl]).
 
 start_eval(Bs, RT, Ds) ->
@@ -671,7 +670,8 @@ exprs([E0|Es], Bs1, RT, Lf, Ef, Bs0, W) ->
             if
                 Es =:= [] ->
                     VS = pp(V0, 1, RT),
-                    [io:requests([{put_chars, VS}, nl]) || W =:= cmd],
+                    [io:requests([{put_chars, unicode, VS}, nl]) ||
+                        W =:= cmd],
                     %% Don't send the result back if it will be
                     %% discarded anyway.
                     V = if
@@ -753,7 +753,7 @@ used_records(E) ->
     {expr, E}.
 
 fwrite_severity(Severity, S, As) ->
-    io:fwrite(<<"~s\n">>, [format_severity(Severity, S, As)]).
+    io:fwrite(<<"~ts\n">>, [format_severity(Severity, S, As)]).
 
 format_severity(Severity, S, As) ->
     add_severity(Severity, io_lib:fwrite(S, As)).
@@ -958,13 +958,13 @@ local_func(rd, [{atom,_,RecName},RecDef0], Bs, _Shell, RT, _Lf, _Ef) ->
     RecDef = expand_value(RecDef0),
     RDs = lists:flatten(erl_pp:expr(RecDef)),
     Attr = lists:concat(["-record('", RecName, "',", RDs, ")."]),
-    {ok, Tokens, _} = erl_scan:string(Attr),
+    {ok, Tokens, _} = erl_scan:string(Attr, 1, [unicode]),
     case erl_parse:parse_form(Tokens) of
         {ok,AttrForm} ->
             [RN] = add_records([AttrForm], Bs, RT),
             {value,RN,Bs};
         {error,{_Line,M,ErrDesc}} ->
-            ErrStr = io_lib:fwrite(<<"~s">>, [M:format_error(ErrDesc)]),
+            ErrStr = io_lib:fwrite(<<"~ts">>, [M:format_error(ErrDesc)]),
             exit(lists:flatten(ErrStr))
     end;
 local_func(rd, [_,_], _Bs, _Shell, _RT, _Lf, _Ef) ->
@@ -988,11 +988,13 @@ local_func(rl, [A], Bs0, _Shell, RT, Lf, Ef) ->
     {value,list_records(record_defs(RT, listify(Recs))),Bs};
 local_func(rp, [A], Bs0, _Shell, RT, Lf, Ef) ->
     {[V],Bs} = expr_list([A], Bs0, Lf, Ef),
-    W = columns(),
-    io:requests([{put_chars, 
-                  io_lib_pretty:print(V, 1, W, -1, ?CHAR_MAX,
-                                      record_print_fun(RT))},
-                 nl]),
+    Cs = io_lib_pretty:print(V, ([{column, 1},
+                                  {line_length, columns()},
+                                  {depth, -1},
+                                  {max_chars, ?CHAR_MAX},
+                                  {record_print_fun, record_print_fun(RT)}]
+                                 ++ enc())),
+    io:requests([{put_chars, unicode, Cs}, nl]),
     {value,ok,Bs};
 local_func(rr, [A], Bs0, _Shell, RT, Lf, Ef) ->
     {[File],Bs} = expr_list([A], Bs0, Lf, Ef),
@@ -1012,38 +1014,6 @@ local_func(which, [{atom,_,M}], Bs, _Shell, _RT, _Lf, _Ef) ->
     end;
 local_func(which, [_Other], _Bs, _Shell, _RT, _Lf, _Ef) ->
     erlang:raise(error, function_clause, [{shell,which,1}]);
-local_func(import, [M], Bs, _Shell, _RT, _Lf, _Ef) ->
-    case erl_parse:package_segments(M) of
-	error -> erlang:raise(error, function_clause, [{shell,import,1}]);
-	M1 ->
-	    Mod = packages:concat(M1),
-	    case packages:is_valid(Mod) of
-		true ->
-		    Key = list_to_atom(packages:last(Mod)),
-		    Mod1 = list_to_atom(Mod),
-		    {value,ok,erl_eval:add_binding({module,Key}, Mod1, Bs)};
-		false ->
-		    exit({{bad_module_name, Mod}, [{shell,import,1}]})
-	    end
-    end;
-local_func(import_all, [P], Bs0, _Shell, _RT, _Lf, _Ef) ->
-    case erl_parse:package_segments(P) of
-	error -> erlang:raise(error, function_clause, [{shell,import_all,1}]);
-	P1 ->
-	    Name = packages:concat(P1),
-	    case packages:is_valid(Name) of
-		true ->
-		    Bs1 = import_all(Name, Bs0),
-		    {value,ok,Bs1};
-		false ->
-		    exit({{bad_package_name, Name},
-			  [{shell,import_all,1}]})
-	    end
-    end;
-local_func(use, [M], Bs, Shell, RT, Lf, Ef) ->
-    local_func(import, [M], Bs, Shell, RT, Lf, Ef);
-local_func(use_all, [M], Bs, Shell, RT, Lf, Ef) ->
-    local_func(import_all, [M], Bs, Shell, RT, Lf, Ef);
 local_func(history, [{integer,_,N}], Bs, _Shell, _RT, _Lf, _Ef) ->
     {value,history(N),Bs};
 local_func(history, [_Other], _Bs, _Shell, _RT, _Lf, _Ef) ->
@@ -1166,7 +1136,7 @@ add_records(RAs, Bs0, RT) ->
     case check_command([], Bs1) of
         {error,{_Line,M,ErrDesc}} ->
             %% A source file that has not been compiled.
-            ErrStr = io_lib:fwrite(<<"~s">>, [M:format_error(ErrDesc)]),
+            ErrStr = io_lib:fwrite(<<"~ts">>, [M:format_error(ErrDesc)]),
             exit(lists:flatten(ErrStr));
         ok ->
             true = ets:insert(RT, Recs),
@@ -1323,15 +1293,6 @@ record_attrs(Forms) ->
 
 %%% End of reading record information from file(s)
 
-import_all(P, Bs0) ->
-    Ms = packages:find_modules(P),
-    lists:foldl(fun (M, Bs) ->
-			Key = list_to_atom(M),
-			M1 = list_to_atom(packages:concat(P, M)),
-			erl_eval:add_binding({module,Key}, M1, Bs)
-		end,
-		Bs0, Ms).
-
 shell_req(Shell, Req) ->
     Shell ! {shell_req,self(),Req},
     receive
@@ -1343,25 +1304,25 @@ list_commands([{{N,command},Es0}, {{N,result}, V} |Ds], RT) ->
     VS = pp(V, 4, RT),
     Ns = io_lib:fwrite(<<"~w: ">>, [N]),
     I = iolist_size(Ns),
-    io:requests([{put_chars, Ns},
-                 {format,<<"~s\n">>,[erl_pp:exprs(Es, I, none)]},
+    io:requests([{put_chars, latin1, Ns},
+                 {format,<<"~ts\n">>,[erl_pp:exprs(Es, I, enc())]},
 		 {format,<<"-> ">>,[]},
-                 {put_chars, VS},
+                 {put_chars, unicode, VS},
                  nl]),
     list_commands(Ds, RT);
 list_commands([{{N,command},Es0} |Ds], RT) ->
     Es = prep_list_commands(Es0),
     Ns = io_lib:fwrite(<<"~w: ">>, [N]),
     I = iolist_size(Ns),
-    io:requests([{put_chars, Ns},
-                 {format,<<"~s\n">>,[erl_pp:exprs(Es, I, none)]}]),
+    io:requests([{put_chars, latin1, Ns},
+                 {format,<<"~ts\n">>,[erl_pp:exprs(Es, I, enc())]}]),
     list_commands(Ds, RT);
 list_commands([_D|Ds], RT) ->
     list_commands(Ds, RT);
 list_commands([], _RT) -> ok.
 
 list_bindings([{{module,M},Val}|Bs], RT) ->
-    io:fwrite(<<"~p is ~p\n">>, [M,Val]),
+    io:fwrite(<<"~w is ~w\n">>, [M,Val]),
     list_bindings(Bs, RT);
 list_bindings([{Name,Val}|Bs], RT) ->
     case erl_eval:fun_data(Val) of
@@ -1369,13 +1330,13 @@ list_bindings([{Name,Val}|Bs], RT) ->
             FCs = expand_value(FCs0), % looks nicer
             F = {'fun',0,{clauses,FCs}},
             M = {match,0,{var,0,Name},F},
-            io:fwrite(<<"~s\n">>, [erl_pp:expr(M)]);
+            io:fwrite(<<"~ts\n">>, [erl_pp:expr(M, enc())]);
         false ->
             Namel = io_lib:fwrite(<<"~s = ">>, [Name]),
             Nl = iolist_size(Namel)+1,
             ValS = pp(Val, Nl, RT),
-            io:requests([{put_chars, Namel},
-                         {put_chars, ValS},
+            io:requests([{put_chars, latin1, Namel},
+                         {put_chars, unicode, ValS},
                          nl])
     end,
     list_bindings(Bs, RT);
@@ -1384,7 +1345,7 @@ list_bindings([], _RT) ->
 
 list_records(Records) ->
     lists:foreach(fun({_Name,Attr}) -> 
-                          io:fwrite(<<"~s">>, [erl_pp:attribute(Attr)])
+                          io:fwrite(<<"~ts">>, [erl_pp:attribute(Attr, enc())])
                   end, Records).
 
 record_defs(RT, Names) ->
@@ -1427,8 +1388,20 @@ get_history_and_results() ->
     {History, erlang:min(Results, History)}.
 
 pp(V, I, RT) ->
-    io_lib_pretty:print(V, I, columns(), ?LINEMAX, ?CHAR_MAX,
-                        record_print_fun(RT)).
+    pp(V, I, RT, enc()).
+
+pp(V, I, RT, Enc) ->
+    io_lib_pretty:print(V, ([{column, I}, {line_length, columns()},
+                             {depth, ?LINEMAX}, {max_chars, ?CHAR_MAX},
+                             {record_print_fun, record_print_fun(RT)}]
+                            ++ Enc)).
+
+%% Control sequence 'p' possibly with Unicode translation modifier
+cs_p() ->
+    case encoding() of
+        latin1 -> "p";
+        unicode -> "tp"
+    end.
 
 columns() ->
     case io:columns() of
@@ -1436,9 +1409,20 @@ columns() ->
         _ -> 80
     end.
 
+encoding() ->
+    [{encoding, Encoding}] = enc(),
+    Encoding.
+
+enc() ->
+    case lists:keyfind(encoding, 1, io:getopts()) of
+        false -> [{encoding,latin1}]; % should never happen
+        Enc -> [Enc]
+    end.
+
 garb(Shell) ->
     erlang:garbage_collect(Shell),
     catch erlang:garbage_collect(whereis(user)),
+    catch erlang:garbage_collect(whereis(group)),
     catch erlang:garbage_collect(group_leader()),
     erlang:garbage_collect().
 
@@ -1458,7 +1442,8 @@ check_env(V) ->
 	    ok;
         {ok, Val} ->
             Txt = io_lib:fwrite(
-              <<"Invalid value of STDLIB configuration parameter ~p: ~p\n">>,
+                    ("Invalid value of STDLIB configuration parameter ~w: ~"
+                     ++cs_p()++"\n"),
                     [V, Val]),
 	    error_logger:info_report(lists:flatten(Txt))
     end.
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index fc029a582f..03f0a19f14 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -257,7 +258,7 @@ chars(C, N, Tail) when N > 0 ->
 chars(C, 0, Tail) when is_integer(C) ->
     Tail.
 
-%% Torbj�rn's bit.
+%% Torbjörn's bit.
 
 %%% COPIES %%%
 
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 4dd70ad425..2d6287814e 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -39,7 +39,18 @@
                       | {'in', Msg :: _, From :: _}
                       | {'out', Msg :: _, To :: _}
                         | term().
--opaque dbg_opt()    :: list().
+-opaque dbg_opt()    :: {'trace', 'true'}
+                      | {'log',
+                         {N :: non_neg_integer(),
+                          [{Event :: system_event(),
+                            FuncState :: _,
+                            FormFunc :: dbg_fun()}]}}
+                      | {'statistics', {file:date_time(),
+                                        {'reductions', non_neg_integer()},
+                                        MessagesIn :: non_neg_integer(),
+                                        MessagesOut :: non_neg_integer()}}
+                      | {'log_to_file', file:io_device()}
+                      | {Func :: dbg_fun(), FuncState :: term()}.
 -type dbg_fun()      :: fun((FuncState :: _,
                              Event :: system_event(),
                              ProcState :: _) -> 'done' | (NewFuncState :: _)).
@@ -47,24 +58,22 @@
 %%-----------------------------------------------------------------
 %% System messages
 %%-----------------------------------------------------------------
--spec suspend(Name) -> Void when
-      Name :: name(),
-      Void :: term().
+-spec suspend(Name) -> 'ok' when
+      Name :: name().
 suspend(Name) -> send_system_msg(Name, suspend).
--spec suspend(Name, Timeout) -> Void when
+
+-spec suspend(Name, Timeout) -> 'ok' when
       Name :: name(),
-      Timeout :: timeout(),
-      Void :: term().
+      Timeout :: timeout().
 suspend(Name, Timeout) -> send_system_msg(Name, suspend, Timeout).
 
--spec resume(Name) -> Void when
-      Name :: name(),
-      Void :: term().
+-spec resume(Name) -> 'ok' when
+      Name :: name().
 resume(Name) -> send_system_msg(Name, resume).
--spec resume(Name, Timeout) -> Void when
+
+-spec resume(Name, Timeout) -> 'ok' when
       Name :: name(),
-      Timeout :: timeout(),
-      Void :: term().
+      Timeout :: timeout().
 resume(Name, Timeout) -> send_system_msg(Name, resume, Timeout).
 
 -spec get_status(Name) -> Status when
@@ -73,9 +82,10 @@ resume(Name, Timeout) -> send_system_msg(Name, resume, Timeout).
       SItem :: (PDict :: [{Key :: term(), Value :: term()}])
              | (SysState :: 'running' | 'suspended')
              | (Parent :: pid())
-             | (Dbg :: dbg_opt())
+             | (Dbg :: [dbg_opt()])
              | (Misc :: term()).
 get_status(Name) -> send_system_msg(Name, get_status).
+
 -spec get_status(Name, Timeout) -> Status when
       Name :: name(),
       Timeout :: timeout(),
@@ -83,7 +93,7 @@ get_status(Name) -> send_system_msg(Name, get_status).
       SItem :: (PDict :: [{Key :: term(), Value :: term()}])
              | (SysState :: 'running' | 'suspended')
              | (Parent :: pid())
-             | (Dbg :: dbg_opt())
+             | (Dbg :: [dbg_opt()])
              | (Misc :: term()).
 get_status(Name, Timeout) -> send_system_msg(Name, get_status, Timeout).
 
@@ -95,6 +105,7 @@ get_status(Name, Timeout) -> send_system_msg(Name, get_status, Timeout).
       Reason :: term().
 change_code(Name, Mod, Vsn, Extra) ->
     send_system_msg(Name, {change_code, Mod, Vsn, Extra}).
+
 -spec change_code(Name, Module, OldVsn, Extra, Timeout) ->
                          'ok' | {error, Reason} when
       Name :: name(),
@@ -191,35 +202,33 @@ no_debug(Name) -> send_system_msg(Name, {debug, no_debug}).
       Timeout :: timeout().
 no_debug(Name, Timeout) -> send_system_msg(Name, {debug, no_debug}, Timeout).
 
--spec install(Name, FuncSpec) -> Void when
+-spec install(Name, FuncSpec) -> 'ok' when
       Name :: name(),
       FuncSpec :: {Func, FuncState},
       Func :: dbg_fun(),
-      FuncState :: term(),
-      Void :: term().
+      FuncState :: term().
 install(Name, {Func, FuncState}) ->
     send_system_msg(Name, {debug, {install, {Func, FuncState}}}).
--spec install(Name, FuncSpec, Timeout) -> Void when
+
+-spec install(Name, FuncSpec, Timeout) -> 'ok' when
       Name :: name(),
       FuncSpec :: {Func, FuncState},
       Func :: dbg_fun(),
       FuncState :: term(),
-      Timeout :: timeout(),
-      Void :: term().
+      Timeout :: timeout().
 install(Name, {Func, FuncState}, Timeout) ->
     send_system_msg(Name, {debug, {install, {Func, FuncState}}}, Timeout).
 
--spec remove(Name, Func) -> Void when
+-spec remove(Name, Func) -> 'ok' when
       Name :: name(),
-      Func :: dbg_fun(),
-      Void :: term().
+      Func :: dbg_fun().
 remove(Name, Func) ->
     send_system_msg(Name, {debug, {remove, Func}}).
--spec remove(Name, Func, Timeout) -> Void when
+
+-spec remove(Name, Func, Timeout) -> 'ok' when
       Name :: name(),
       Func :: dbg_fun(),
-      Timeout :: timeout(),
-      Void :: term().
+      Timeout :: timeout().
 remove(Name, Func, Timeout) ->
     send_system_msg(Name, {debug, {remove, Func}}, Timeout).
 
@@ -245,18 +254,13 @@ mfa(Name, {change_code, Mod, Vsn, Extra}) ->
     {sys, change_code, [Name, Mod, Vsn, Extra]};
 mfa(Name, Atom) ->
     {sys, Atom, [Name]}.
+
 mfa(Name, Req, Timeout) ->
     {M, F, A} = mfa(Name, Req),
     {M, F, A ++ [Timeout]}.
 
 %%-----------------------------------------------------------------
 %% Func: handle_system_msg/6
-%% Args: Msg    ::= term()
-%%       From   ::= {pid(),Ref} but don't count on that
-%%       Parent ::= pid()
-%%       Module ::= atom()
-%%       Debug  ::= [debug_opts()]
-%%       Misc   ::= term()
 %% Purpose: Used by a process module that wishes to take care of
 %%          system messages.  The process receives a {system, From,
 %%          Msg} message, and passes the Msg to this function.
@@ -268,14 +272,14 @@ mfa(Name, Req, Timeout) ->
 %%          The Module must export system_continue/3, system_terminate/4
 %%          and format_status/2 for status information.
 %%-----------------------------------------------------------------
--spec handle_system_msg(Msg, From, Parent, Module, Debug, Misc) -> Void when
+-spec handle_system_msg(Msg, From, Parent, Module, Debug, Misc) ->
+                               no_return() when
       Msg :: term(),
       From :: {pid(), Tag :: _},
       Parent :: pid(),
       Module :: module(),
       Debug :: [dbg_opt()],
-      Misc :: term(),
-      Void :: term().
+      Misc :: term().
 handle_system_msg(Msg, From, Parent, Module, Debug, Misc) ->
     handle_system_msg(running, Msg, From, Parent, Module, Debug, Misc, false).
 
@@ -294,10 +298,6 @@ handle_system_msg(SysState, Msg, From, Parent, Mod, Debug, Misc, Hib) ->
 
 %%-----------------------------------------------------------------
 %% Func: handle_debug/4
-%% Args: Debug ::= [debug_opts()]
-%%       Func  ::= {M,F} | fun()  arity 3
-%%       State ::= term()
-%%       Event ::= {in, Msg} | {in, Msg, From} | {out, Msg, To} | term()
 %% Purpose: Called by a process that wishes to debug an event.
 %%          Func is a formatting function, called as Func(Device, Event).
 %% Returns: [debug_opts()]
@@ -453,6 +453,7 @@ print_event(Dev, {Event, State, FormFunc}) ->
     FormFunc(Dev, Event, State).
 
 init_stat() -> {erlang:localtime(), process_info(self(), reductions), 0, 0}.
+
 get_stat({Time, {reductions, Reds}, In, Out}) ->
     {reductions, Reds2} = process_info(self(), reductions),
     [{start_time, Time}, {current_time, erlang:localtime()},
@@ -492,9 +493,8 @@ get_debug2(Item, Debug, Default) ->
 	_ -> Default
     end.
 
--spec print_log(Debug) -> Void when
-      Debug :: [dbg_opt()],
-      Void :: term().
+-spec print_log(Debug) -> 'ok' when
+      Debug :: [dbg_opt()].
 print_log(Debug) ->
     {_N, Logs} = get_debug(log, Debug, {0, []}),
     lists:foreach(fun print_event/1,
@@ -511,8 +511,6 @@ close_log_file(Debug) ->
 
 %%-----------------------------------------------------------------
 %% Func: debug_options/1
-%% Args: [trace|log|{log,N}|statistics|{log_to_file, FileName}|
-%%        {install, {Func, FuncState}}]
 %% Purpose: Initiate a debug structure.  Called by a process that
 %%          wishes to initiate the debug structure without the
 %%          system messages.
@@ -521,7 +519,11 @@ close_log_file(Debug) ->
 
 -spec debug_options(Options) -> [dbg_opt()] when
       Options :: [Opt],
-      Opt :: 'trace' | 'log' | 'statistics' | {'log_to_file', FileName}
+      Opt :: 'trace'
+           | 'log'
+           | {'log', pos_integer()}
+           | 'statistics'
+           | {'log_to_file', FileName}
            | {'install', FuncSpec},
       FileName :: file:name(),
       FuncSpec :: {Func, FuncState},
@@ -529,6 +531,7 @@ close_log_file(Debug) ->
       FuncState :: term().
 debug_options(Options) ->
     debug_options(Options, []).
+
 debug_options([trace | T], Debug) ->
     debug_options(T, install_debug(trace, true, Debug));
 debug_options([log | T], Debug) ->
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 29b8e28d3a..6aa09d7bd0 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -23,7 +23,6 @@ MODULES= \
 	dummy_via \
 	edlin_expand_SUITE \
 	epp_SUITE \
-	erl_eval_helper \
 	erl_eval_SUITE \
 	erl_expand_records_SUITE \
 	erl_internal_SUITE \
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index 7b8650f224..b28df94221 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -179,7 +180,7 @@ mime_decode(Config) when is_list(Config) ->
     <<"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=�=   ==">>),
+    <<"on">>  = base64:mime_decode(<<"\tb =2\"¤4=¤=   ==">>),
     <<"o">>   = base64:mime_decode(<<"\nb=w=====">>),
     %% Two pads
     <<"Aladdin:open sesame">> =
@@ -188,7 +189,7 @@ mime_decode(Config) when is_list(Config) ->
     <<"Hello World!!">> = base64:mime_decode(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     <<"Aladdin:open sesam">> =
-	base64:mime_decode("QWxhZGRpbjpvcG�\")(VuIHNlc2Ft"),
+	base64:mime_decode("QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft"),
     %% Encoded base 64 strings may be divided by non base 64 chars.
     %% In this cases whitespaces.
     <<"0123456789!@#0^&*();:<>,. []{}">> =
@@ -222,7 +223,7 @@ mime_decode_to_string(Config) when is_list(Config) ->
     "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=�=   ==">>),
+    "on"  = base64:mime_decode_to_string(<<"\tb =2\"¤4=¤=   ==">>),
     "o"   = base64:mime_decode_to_string(<<"\nb=w=====">>),
     %% Two pads
     "Aladdin:open sesame" =
@@ -231,7 +232,7 @@ mime_decode_to_string(Config) when is_list(Config) ->
     "Hello World!!" = base64:mime_decode_to_string(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     "Aladdin:open sesam" = 
-	base64:mime_decode_to_string("QWxhZGRpbjpvcG�\")(VuIHNlc2Ft"),
+	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^&*();:<>,. []{}" =
diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index bac59a3107..9b6f628aa9 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1331,9 +1332,9 @@ one_random_number(N) ->
 one_random(N) ->
     M = ((N - 1) rem 68) + 1,
     element(M,{$a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m,$n,$o,$p,$q,$r,$s,$t,
-	       $u,$v,$w,$x,$y,$z,$�,$�,$�,$A,$B,$C,$D,$E,$F,$G,$H,
-	       $I,$J,$K,$L,$M,$N,$O,$P,$Q,$R,$S,$T,$U,$V,$W,$X,$Y,$Z,$�,
-	       $�,$�,$0,$1,$2,$3,$4,$5,$6,$7,$8,$9}).
+	       $u,$v,$w,$x,$y,$z,$å,$ä,$ö,$A,$B,$C,$D,$E,$F,$G,$H,
+	       $I,$J,$K,$L,$M,$N,$O,$P,$Q,$R,$S,$T,$U,$V,$W,$X,$Y,$Z,$Å,
+	       $Ä,$Ö,$0,$1,$2,$3,$4,$5,$6,$7,$8,$9}).
 
 random_number({Min,Max}) -> % Min and Max are *length* of number in
                             % decimal positions
diff --git a/lib/stdlib/test/digraph_SUITE.erl b/lib/stdlib/test/digraph_SUITE.erl
index 1d1326d60e..ed01b32a59 100644
--- a/lib/stdlib/test/digraph_SUITE.erl
+++ b/lib/stdlib/test/digraph_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -400,7 +400,7 @@ sane1(G) ->
     lists:foreach(
       fun(V) ->
               InEs = digraph:in_edges(G, V),
-              %% Nu har man *alla* inkanter f�r V
+              %% *All* in-edoges of V
               lists:foreach(
                 fun(E) ->
                         case digraph:edge(G, E) of
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 77c615d6d9..606bbbcbb2 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -25,7 +25,7 @@
 	 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_8911/1]).
+         otp_8562/1, otp_8665/1, otp_8911/1, otp_10302/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -67,7 +67,7 @@ all() ->
      {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].
+     otp_8665, otp_8911, otp_10302].
 
 groups() -> 
     [{upcase_mac, [], [upcase_mac_1, upcase_mac_2]},
@@ -582,12 +582,13 @@ otp_8130(suite) ->
 otp_8130(Config) when is_list(Config) ->
     true = os:putenv("epp_inc1", "stdlib"),
     Ts = [{otp_8130_1,
-           %% The scanner handles UNICODE in a special way. Hopefully
-           %% temporarily.
            <<"-define(M(A), ??A). "
              "t() ->  "
-             "   \"{ 34 , [ $1 , 2730 ] , \\\"34\\\" , X . a , 2730 }\" = "
-             "        ?M({34,\"1\\x{aaa}\",\"34\",X.a,$\\x{aaa}}), ok. ">>,
+             "   L = \"{ 34 , \\\"1\\\\x{AAA}\\\" , \\\"34\\\" , X . a , $\\\\x{AAA} }\", "
+             "   R = ?M({34,\"1\\x{aaa}\",\"34\",X.a,$\\x{aaa}}),"
+             "   Lt = erl_scan:string(L, 1, [unicode]),"
+             "   Rt = erl_scan:string(R, 1, [unicode]),"
+             "   Lt = Rt, ok. ">>,
           ok},
 
           {otp_8130_2,
@@ -1284,6 +1285,75 @@ otp_8665(Config) when is_list(Config) ->
     ?line [] = compile(Config, Cs),
     ok.
 
+otp_10302(doc) ->
+    "OTP-10302. Unicode characters scanner/parser.";
+otp_10302(suite) ->
+    [];
+otp_10302(Config) when is_list(Config) ->
+    %% Two messages (one too many). Keeps otp_4871 happy.
+    Cs = [{otp_8562,
+           <<"%% coding: utf-8\n \n \x{E4}">>,
+           {errors,[{3,epp,cannot_parse},
+                    {3,file_io_server,invalid_unicode}],[]}}
+         ],
+    [] = compile(Config, Cs),
+    Dir = ?config(priv_dir, Config),
+    File = filename:join(Dir, "otp_10302.erl"),
+    utf8 = encoding("coding: utf-8", File),
+    utf8 = encoding("coding: UTF-8", File),
+    latin1 = encoding("coding: Latin-1", File),
+    latin1 = encoding("coding: latin-1", File),
+    none = encoding_com("coding: utf-8", File),
+    none = encoding_com("\n\n%% coding: utf-8", File),
+    none = encoding_nocom("\n\n coding: utf-8", File),
+    utf8 = encoding_com("\n%% coding: utf-8", File),
+    utf8 = encoding_nocom("\n coding: utf-8", File),
+    none = encoding("coding: \nutf-8", File),
+    latin1 = encoding("Encoding :  latin-1", File),
+    utf8 = encoding("ccoding: UTF-8", File),
+    utf8 = encoding("coding= utf-8", File),
+    utf8 = encoding_com(" %% coding= utf-8", File),
+    utf8 = encoding("coding  =  utf-8", File),
+    none = encoding("coding: utf-16 coding: utf-8", File), %first is bad
+    none = encoding("Coding: utf-8", File),    %capital c
+    utf8 = encoding("-*- coding: utf-8 -*-", File),
+    utf8 = encoding("-*-coding= utf-8-*-", File),
+    utf8 = encoding("codingcoding= utf-8", File),
+    ok = prefix("coding: utf-8", File, utf8),
+
+    "coding: latin-1" = epp:encoding_to_string(latin1),
+    "coding: utf-8" = epp:encoding_to_string(utf8),
+    true = lists:member(epp:default_encoding(), [latin1, utf8]),
+
+    ok.
+
+prefix(S, File, Enc) ->
+    prefix(0, S, File, Enc).
+
+prefix(100, _S, _File, _) ->
+    ok;
+prefix(N, S, File, Enc) ->
+    Enc = encoding(lists:duplicate(N, $\s) ++ S, File),
+    prefix(N+1, S, File, Enc).
+
+encoding(Enc, File) ->
+    E = encoding_com("%% " ++ Enc, File),
+    none = encoding_com(Enc, File),
+    E = encoding_nocom(Enc, File).
+
+encoding_com(Enc, File) ->
+    ok = file:write_file(File, Enc),
+    {ok, Fd} = file:open(File, [read]),
+    E = epp:set_encoding(Fd),
+    ok = file:close(Fd),
+    E = epp:read_encoding(File).
+
+encoding_nocom(Enc, File) ->
+    ok = file:write_file(File, Enc),
+    {ok, Fd} = file:open(File, [read]),
+    ok = file:close(Fd),
+    epp:read_encoding(File, [{in_comment_only, false}]).
+
 check(Config, Tests) ->
     eval_tests(Config, fun check_test/2, Tests).
 
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 47792d1052..04d49770cb 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1160,24 +1160,6 @@ do_funs(LFH, EFH) ->
                 concat(["begin F = fun(F, N) -> [", M, 
                        ":count_down(F,N) || X <-[1]] end, F(F,2) end."]),
                 [[[0]]], ['F'], LFH, EFH),
-
-    %% Tests for a bug found by the Dialyzer - used to crash.
-    case test_server:is_native(erl_eval) of
-	true ->
-	    %% Parameterized modules are not supported by HiPE.
-	    ok;
-	false ->
-	    check(fun() -> Pmod = erl_eval_helper:new(42), Pmod:add(5) end,
-		  "begin Pmod = erl_eval_helper:new(42), Pmod:add(5) end.",
-		  47,
-		  ['Pmod'], LFH, EFH),
-	    check(fun() -> Pmod = erl_eval_helper:new(42),
-			   B = Pmod:add(7), B end,
-		  "begin Pmod = erl_eval_helper:new(42), "
-		  "B = Pmod:add(7), B end.",
-		  49,
-		  ['B','Pmod'], LFH, EFH)
-    end,
     ok.
 
 count_down(F, N) when N > 0 ->
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index e248934e10..94b4397a9c 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -35,7 +35,7 @@
 	 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,
+-export([attributes/1, expr/1, guard/1,
          init/1, pattern/1, strict/1, update/1,
 	 otp_5915/1, otp_7931/1, otp_5990/1,
 	 otp_7078/1, otp_7101/1]).
@@ -55,7 +55,7 @@ end_per_testcase(_Case, _Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [abstract_module, attributes, expr, guard, init,
+    [attributes, expr, guard, init,
      pattern, strict, update, {group, tickets}].
 
 groups() -> 
@@ -75,40 +75,12 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-abstract_module(doc) ->
-    "Compile an abstract module.";
-abstract_module(suite) -> [];
-abstract_module(Config) when is_list(Config) ->
-    %% erl_expand_records does not handle abstract modules. But anyway...
-    File = filename("param.erl", Config),
-    Beam = filename("param.beam", Config),
-    Test = <<"-module(param, [A, B]).
-
-              -export([args/1]).
-
-              args(C) ->
-                  X = local(C),
-                  Z = new(A, B),
-                  {X, Z}.
-
-              local(C) ->
-                  module_info(C).
-             ">>,
-
-    ?line ok = file:write_file(File, Test),
-    ?line {ok, param} = compile:file(File, [{outdir,?privdir}]),
-
-    ?line ok = file:delete(File),
-    ?line ok = file:delete(Beam),
-    ok.
-
 attributes(doc) ->
     "Import module and functions.";
 attributes(suite) -> [];
 attributes(Config) when is_list(Config) ->
     Ts = [
-      <<"-import(erl_expand_records_SUITE).
-         -import(lists, [append/2, reverse/1]).
+      <<"-import(lists, [append/2, reverse/1]).
 
          -record(r, {a,b}).
 
@@ -158,12 +130,12 @@ expr(Config) when is_list(Config) ->
              2 = fun(X) -> X end(One + One),
              3 = fun exprec_test:f/1(3),
              4 = exprec_test:f(4),
-             5 = ''.f(5),
+             5 = f(5),
              L = receive 
                      {a,message,L0} ->
                          L0
                  end,
-             case catch a.b.c:foo(bar) of
+             case catch a:foo(bar) of
                  {'EXIT', _} -> ok
              end,
              _ = receive 			%Suppress warning.
@@ -197,7 +169,7 @@ guard(suite) -> [];
 guard(Config) when is_list(Config) ->
     File = filename("guard.erl", Config),
     Beam = filename("guard.beam", Config),
-    Test = <<"-module(guard, [A, B]).
+    Test = <<"-module(guard).
 
               -export([t/1]).
 
@@ -263,8 +235,7 @@ pattern(doc) ->
 pattern(suite) -> [];
 pattern(Config) when is_list(Config) ->
     Ts = [
-      <<"-import(erl_expand_records_SUITE).
-         -import(lists, [append/2, reverse/1]).
+      <<"-import(lists, [append/2, reverse/1]).
 
          -record(r, {a,b}).
 
@@ -292,10 +263,10 @@ pattern(Config) when is_list(Config) ->
              21 = t(#r{a = #r{}}),
              22 = t(2),
              23 = t(#r{a = #r{}, b = b}),
-             24 = t(a.b.c),
+             24 = t(abc),
              ok.
 
-         t(a.b.c) ->
+         t(abc) ->
              24;
          t($a) ->
              2;
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 90a37f6441..564f27a512 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1732,7 +1732,7 @@ otp_5362(Config) when is_list(Config) ->
           {otp_5362_2,
           <<"-export([inline/0]).
 
-             -import(lists.foo, [a/1,b/1]). % b/1 is not used
+             -import(lists, [a/1,b/1]). % b/1 is not used
 
              -compile([{inline,{inl,7}}]).    % undefined
              -compile([{inline,[{inl,17}]}]). % undefined
@@ -1764,7 +1764,7 @@ otp_5362(Config) when is_list(Config) ->
                    {6,erl_lint,{bad_inline,{inl,17}}},
                    {11,erl_lint,{undefined_function,{fipp,0}}},
                    {22,erl_lint,{bad_nowarn_unused_function,{and_not_used,2}}}],
-            [{3,erl_lint,{unused_import,{{b,1},'lists.foo'}}},
+            [{3,erl_lint,{unused_import,{{b,1},lists}}},
              {9,erl_lint,{unused_function,{foop,0}}},
              {19,erl_lint,{unused_function,{not_used,0}}},
              {23,erl_lint,{unused_function,{and_not_used,1}}}]}},
@@ -2187,27 +2187,9 @@ otp_5878(Config) when is_list(Config) ->
     ?line [] = run(Config, Ts),
 
     Abstr = <<"-module(lint_test, [A, B]).
-
-               -export([args/1]).
-
-               -record(r, {a = A, b = THIS}). % A and THIS are unbound
-
-               %% param:args(compile,param:new(1,2)).
-
-               args(C) ->
-                   X = local(C),
-                   Z = new(A, B),
-                   F = fun(THIS) -> {x, A} end, % THIS unused and shadowed
-                   {X, Z, THIS, F, #r{}}.
-
-               local(C) ->
-                   module_info(C).
             ">>,
-    ?line {error,[{5,erl_lint,{unbound_var,'A'}},
-                  {5,erl_lint,{unbound_var,'THIS'}}],
-           [{12,erl_lint,{unused_var,'THIS'}},
-            {12,erl_lint,{shadowed_var,'THIS','fun'}}]}
-        = run_test2(Config, Abstr, [warn_unused_record]),
+    {errors,[{1,erl_lint,pmod_unsupported}],[]} =
+        run_test2(Config, Abstr, [warn_unused_record]),
 
     QLC1 = <<"-module(lint_test).
               -include_lib(\"stdlib/include/qlc.hrl\").
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 64853ca078..37be61d665 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %%
 %% The 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 @@
 	 init_per_testcase/2, end_per_testcase/2]).
 
 -export([ func/1, call/1, recs/1, try_catch/1, if_then/1,
-	  receive_after/1, bits/1, head_tail/1, package/1,
+	  receive_after/1, bits/1, head_tail/1,
 	  cond1/1, block/1, case1/1, ops/1, messages/1,
 	  old_mnemosyne_syntax/1,
 	  import_export/1, misc_attrs/1,
@@ -48,7 +48,8 @@
 	  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, otp_9147/1]).
+	  otp_8473/1, otp_8522/1, otp_8567/1, otp_8664/1, otp_9147/1,
+          otp_10302/1]).
 
 %% Internal export.
 -export([ehook/6]).
@@ -74,12 +75,12 @@ all() ->
 groups() -> 
     [{expr, [],
       [func, call, recs, try_catch, if_then, receive_after,
-       bits, head_tail, package, cond1, block, case1, ops,
+       bits, head_tail, 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, otp_9147]}].
+       otp_8473, otp_8522, otp_8567, otp_8664, otp_9147, otp_10302]}].
 
 init_per_suite(Config) ->
     Config.
@@ -438,9 +439,6 @@ bits(Config) when is_list(Config) ->
     ?line ok = pp_expr(<<"<<{a,b}/binary>>">>),
     ?line ok = pp_expr(<<"<<{foo:bar(),b}/binary>>">>),
     ?line ok = pp_expr(<<"<<(foo:bar()):(foo:bar())/binary>>">>),
-    ?line ok = pp_expr(<<"<<(foo.bar)/binary>>">>),
-    ?line ok = pp_expr(<<"<<(foo.bar):all/binary>>">>),
-    ?line ok = pp_expr(<<"<<(foo.bar):(foo.bar)/binary>>">>),
     ok.
 
 head_tail(suite) ->
@@ -462,17 +460,6 @@ head_tail(Config) when is_list(Config) ->
     ?line compile(Config, Ts),
     ok.
 
-package(suite) ->
-    [];
-package(Config) when is_list(Config) ->
-    Ts = [{package_1,
-           <<"t() -> a.b:foo().">>},
-          {package_2,
-           <<"t() -> .lists:sort([]).">>}
-          ],
-    ?line compile(Config, Ts),
-    ok.
-
 cond1(suite) ->
     [];
 cond1(Config) when is_list(Config) ->
@@ -550,29 +537,9 @@ messages(Config) when is_list(Config) ->
     ?line true = "\n" =:= lists:flatten(erl_pp:form({eof,0})),
     ok.
 
-old_mnemosyne_syntax(suite) ->
-    [];
 old_mnemosyne_syntax(Config) when is_list(Config) ->
-    %% Since we have kept the 'query' syntax and ':-' token,
+    %% Since we have kept the ':-' token,
     %% better test that we can pretty print it.
-    Q = {'query',6,
-         {lc,6,
-          {var,6,'X'},
-          [{generate,6,
-            {var,6,'X'},
-            {call,6,{atom,6,table},[{atom,6,tab}]}},
-           {match,7,
-            {record_field,7,{var,7,'X'},{atom,7,foo}},
-            {atom,7,bar}}]}},
-    ?line "query\n"
-          "    [ \n" % extra space...
-          "     X ||\n"
-          "         X <- table(tab),\n"
-          "         X.foo = bar\n"
-          "    ]\n"
-          "end" =
-        lists:flatten(erl_pp:expr(Q)),
-
     R = {rule,12,sales,2,
          [{clause,12,
            [{var,12,'E'},{atom,12,employee}],
@@ -614,13 +581,11 @@ misc_attrs(suite) ->
     [];
 misc_attrs(Config) when is_list(Config) ->
     ?line ok = pp_forms(<<"-module(m). ">>),
-    ?line ok = pp_forms(<<"-module(m.p, [A,B]). ">>),
     ?line ok = pp_forms(<<"-module(m, [Aafjlksfjdlsjflsdfjlsdjflkdsfjlk,"
                           "Blsjfdlslfjsdf]). ">>),
     ?line ok = pp_forms(<<"-export([]). ">>),
     ?line ok = pp_forms(<<"-export([foo/2, bar/0]). ">>),
     ?line ok = pp_forms(<<"-export([bar/0]). ">>),
-    ?line ok = pp_forms(<<"-import(.lists). ">>),
     ?line ok = pp_forms(<<"-import(lists, []). ">>),
     ?line ok = pp_forms(<<"-import(lists, [map/2]). ">>),
     ?line ok = pp_forms(<<"-import(lists, [map/2, foreach/2]). ">>),
@@ -634,8 +599,12 @@ misc_attrs(Config) when is_list(Config) ->
 hook(suite) ->
     [];
 hook(Config) when is_list(Config) ->
+    F = fun(H) -> H end,
+    do_hook(F).
+
+do_hook(HookFun) ->
     Lc = parse_expr(binary_to_list(<<"[X || X <- [1,2,3]].">>)),
-    H = fun hook/4,
+    H = HookFun(fun hook/4),
     Expr = {call,0,{atom,0,fff},[{foo,Lc},{foo,Lc},{foo,Lc}]},
     EChars = lists:flatten(erl_pp:expr(Expr, 0, H)),
     Call = {call,0,{atom,0,foo},[Lc]},
@@ -692,7 +661,7 @@ hook(Config) when is_list(Config) ->
     GChars2 = erl_pp:guard(G2),
     ?line true = GChars =:= lists:flatten(GChars2),
 
-    EH = {?MODULE, ehook, [foo,bar]},
+    EH = HookFun({?MODULE, ehook, [foo,bar]}),
     XEChars = erl_pp:expr(Expr, -1, EH),
     ?line true = remove_indentation(EChars) =:= lists:flatten(XEChars),
     XEChars2 = erl_pp:expr(Expr, EH),
@@ -1068,6 +1037,43 @@ otp_9147(Config) when is_list(Config) ->
                      string:tokens(binary_to_list(Bin), "\n")),
     ok.
 
+otp_10302(doc) ->
+    "OTP-10302. Unicode characters scanner/parser.";
+otp_10302(suite) -> [];
+otp_10302(Config) when is_list(Config) ->
+    Ts = [{uni_1,
+           <<"t() -> <<(<<\"abc\\x{aaa}\">>):3/binary>>.">>}
+          ],
+    compile(Config, Ts),
+    ok = pp_expr(<<"$\\x{aaa}">>),
+    ok = pp_expr(<<"\"1\\x{aaa}\"">>),
+    ok = pp_expr(<<"<<<<\"hej\">>/binary>>">>),
+    ok = pp_expr(<<"<< <<\"1\\x{aaa}\">>/binary>>">>),
+
+    U = [{encoding,unicode}],
+
+    do_hook(fun(H) -> [{hook,H}] end),
+    do_hook(fun(H) -> [{hook,H}]++U end),
+
+    ok = pp_expr(<<"$\\x{aaa}">>, [{hook,fun hook/4}]),
+
+    Opts = [{hook, fun unicode_hook/4},{encoding,unicode}],
+    Lc = parse_expr("[X || X <- [\"\x{400}\",\"\xFF\"]]."),
+    Expr = {call,0,{atom,0,fff},[{foo,{foo,Lc}},{foo,{foo,Lc}}]},
+    EChars = lists:flatten(erl_pp:expr(Expr, 0, Opts)),
+    Call = {call,0,{atom,0,foo},[{call,0,{atom,0,foo},[Lc]}]},
+    Expr2 = {call,0,{atom,0,fff},[Call,Call]},
+    EChars2 = erl_pp:exprs([Expr2], U),
+    EChars = lists:flatten(EChars2),
+    [$\x{400},$\x{400}] = [C || C <- EChars, C > 255],
+
+    ok = pp_forms(<<"function() -> {\"\x{400}\",$\x{400}}. "/utf8>>, U),
+    ok = pp_forms("function() -> {\"\x{400}\",$\x{400}}. ", []),
+    ok.
+
+unicode_hook({foo,E}, I, P, H) ->
+    erl_pp:expr({call,0,{atom,0,foo},[E]}, I, P, H).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 compile(Config, Tests) ->
@@ -1137,9 +1143,11 @@ flat_expr(Expr) ->
 pp_forms(Bin) ->
     pp_forms(Bin, none).
 
-pp_forms(Bin, Hook) ->
-    PP1 = (catch parse_and_pp_forms(binary_to_list(Bin), Hook)),
-    PP2 = (catch parse_and_pp_forms(PP1, Hook)),
+pp_forms(Bin, Options) when is_binary(Bin) ->
+    pp_forms(to_list(Bin, Options), Options);
+pp_forms(List, Options) when is_list(List) ->
+    PP1 = (catch parse_and_pp_forms(List, Options)),
+    PP2 = (catch parse_and_pp_forms(PP1, Options)),
     case PP1 =:= PP2 of % same line numbers
         true ->
             test_max_line(PP1);
@@ -1147,8 +1155,8 @@ pp_forms(Bin, Hook) ->
             not_ok
     end.
 
-parse_and_pp_forms(String, Hook) ->
-    lists:append(lists:map(fun(AF) -> erl_pp:form(AF, Hook)
+parse_and_pp_forms(String, Options) ->
+    lists:append(lists:map(fun(AF) -> erl_pp:form(AF, Options)
                            end, parse_forms(String))).
 
 parse_forms(Chars) ->
@@ -1158,7 +1166,7 @@ parse_forms(Chars) ->
 parse_forms2([], _Cont, _Line, Forms) ->
     lists:reverse(Forms);
 parse_forms2(String, Cont0, Line, Forms) ->
-    case erl_scan:tokens(Cont0, String, Line) of
+    case erl_scan:tokens(Cont0, String, Line, [unicode]) of
         {done, {ok, Tokens, EndLine}, Chars} ->
             {ok, Form} = erl_parse:parse_form(Tokens),
             parse_forms2(Chars, [], EndLine, [Form | Forms]);
@@ -1174,10 +1182,12 @@ pp_expr(Bin) ->
     pp_expr(Bin, none).
 
 %% Final dot is added.
-pp_expr(Bin, Hook) ->
-    PP1 = (catch parse_and_pp_expr(binary_to_list(Bin), 0, Hook)),
-    PPneg = (catch parse_and_pp_expr(binary_to_list(Bin), -1, Hook)),
-    PP2 = (catch parse_and_pp_expr(PPneg, 0, Hook)),
+pp_expr(Bin, Options) when is_binary(Bin) ->
+    pp_expr(to_list(Bin, Options), Options);
+pp_expr(List, Options) when is_list(List) ->
+    PP1 = (catch parse_and_pp_expr(List, 0, Options)),
+    PPneg = (catch parse_and_pp_expr(List, -1, Options)),
+    PP2 = (catch parse_and_pp_expr(PPneg, 0, Options)),
     if
         PP1 =:= PP2 -> % same line numbers
             case
@@ -1192,15 +1202,24 @@ pp_expr(Bin, Hook) ->
             not_ok
     end.
 
-parse_and_pp_expr(String, Indent, Hook) ->
+parse_and_pp_expr(String, Indent, Options) ->
     StringDot = lists:flatten(String) ++ ".",
-    erl_pp:expr(parse_expr(StringDot), Indent, Hook).
+    erl_pp:expr(parse_expr(StringDot), Indent, Options).
 
 parse_expr(Chars) ->
-    {ok, Tokens, _} = erl_scan:string(Chars),
+    {ok, Tokens, _} = erl_scan:string(Chars, 1, [unicode]),
     {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
     Expr.
 
+to_list(Bin, Options) when is_list(Options) ->
+    case proplists:get_value(encoding, Options) of
+        unicode -> unicode:characters_to_list(Bin);
+        encoding -> binary_to_list(Bin);
+        undefined -> binary_to_list(Bin)
+    end;
+to_list(Bin, _Hook) ->
+    binary_to_list(Bin).
+
 test_new_line(String) ->
     case string:chr(String, $\n) of
         0 -> ok;
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 4298b2c701..9a6b2f8f34 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The 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 +21,7 @@
 -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/1, error_2/1, iso88591/1, otp_7810/1]).
+-export([ error_1/1, error_2/1, iso88591/1, otp_7810/1, otp_10302/1]).
 
 -import(lists, [nth/2,flatten/1]).
 -import(io_lib, [print/1]).
@@ -59,7 +60,7 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [{group, error}, iso88591, otp_7810].
+    [{group, error}, iso88591, otp_7810, otp_10302].
 
 groups() -> 
     [{error, [], [error_1, error_2]}].
@@ -131,10 +132,10 @@ iso88591(Config) when is_list(Config) ->
     ?line ok =
      case catch begin
 		   %% Some atom and variable names
-		   V1s = [$�,$�,$�,$�],
-		   V2s = [$N,$�,$r],
-		   A1s = [$h,$�,$r],
-		   A2s = [$�,$r,$e],
+		   V1s = [$Á,$á,$é,$ë],
+		   V2s = [$N,$ä,$r],
+		   A1s = [$h,$ä,$r],
+		   A2s = [$ö,$r,$e],
 		   %% Test parsing atom and variable characters.
 		   {ok,Ts1,_} = erl_scan:string(V1s ++ " " ++ V2s ++
 					       "\327" ++
@@ -196,7 +197,7 @@ otp_7810(Config) when is_list(Config) ->
 reserved_words() ->
     L = ['after', 'begin', 'case', 'try', 'cond', 'catch',
          'andalso', 'orelse', 'end', 'fun', 'if', 'let', 'of',
-         'query', 'receive', 'when', 'bnot', 'not', 'div',
+         'receive', 'when', 'bnot', 'not', 'div',
          'rem', 'band', 'and', 'bor', 'bxor', 'bsl', 'bsr',
          'or', 'xor'],
     [begin
@@ -214,8 +215,8 @@ atoms() ->
     ?line test_string("'a b'", [{atom,1,'a b'}]),
     ?line test_string("a", [{atom,1,a}]),
     ?line test_string("a@2", [{atom,1,a@2}]),
-    ?line test_string([39,65,200,39], [{atom,1,'A�'}]),
-    ?line test_string("�rlig �sten", [{atom,1,�rlig},{atom,1,�sten}]),
+    ?line test_string([39,65,200,39], [{atom,1,'AÈ'}]),
+    ?line test_string("ärlig östen", [{atom,1,ärlig},{atom,1,östen}]),
     ?line {ok,[{atom,_,'$a'}],{1,6}} =
         erl_scan:string("'$\\a'", {1,1}),
     ?line test("'$\\a'"),
@@ -289,7 +290,7 @@ errors() ->
     ?line {error,{1,erl_scan,{string,$","str"}},1} = %"
         erl_scan:string("\"str"), %"
     ?line {error,{1,erl_scan,char},1} = erl_scan:string("$"),
-    ?line test_string([34,65,200,34], [{string,1,"A�"}]),
+    ?line test_string([34,65,200,34], [{string,1,"AÈ"}]),
     ?line test_string("\\", [{'\\',1}]),
     ?line {'EXIT',_} =
         (catch {foo, erl_scan:string('$\\a', {1,1})}), % type error
@@ -354,7 +355,7 @@ dots() ->
            {".\n",  {ok,[{dot,1}],2}},
            {".%",   {ok,[{dot,1}],1}},
            {".\210",{ok,[{dot,1}],1}},
-           {".% �h",{ok,[{dot,1}],1}},
+           {".% öh",{ok,[{dot,1}],1}},
            {".%\n", {ok,[{dot,1}],2}},
            {".$",   {error,{1,erl_scan,char},1}},
            {".$\\", {error,{1,erl_scan,char},1}},
@@ -369,7 +370,7 @@ dots() ->
     ?line [{column,1},{length,1},{line,1},{text,"."}] =
         erl_scan:token_info(T2, [column, length, line, text]),
     ?line {ok,[{dot,_}=T3],{1,6}} =
-        erl_scan:string(".% �h", {1,1}, text),
+        erl_scan:string(".% öh", {1,1}, text),
     ?line [{column,1},{length,1},{line,1},{text,"."}] =
         erl_scan:token_info(T3, [column, length, line, text]),
     ?line {error,{{1,2},erl_scan,char},{1,3}} =
@@ -472,11 +473,11 @@ chars() ->
 
 
 variables() ->
-    ?line test_string("     \237_Aou�eiy��", [{var,1,'_Aou�eiy��'}]),
+    ?line test_string("     \237_Aouåeiyäö", [{var,1,'_Aouåeiyäö'}]),
     ?line test_string("A_b_c@", [{var,1,'A_b_c@'}]),
     ?line test_string("V@2", [{var,1,'V@2'}]),
-    ?line test_string("ABD�", [{var,1,'ABD�'}]),
-    ?line test_string("�rlig �sten", [{var,1,'�rlig'},{var,1,'�sten'}]),
+    ?line test_string("ABDÀ", [{var,1,'ABDÀ'}]),
+    ?line test_string("Ärlig Östen", [{var,1,'Ärlig'},{var,1,'Östen'}]),
     ok.
 
 eof() ->
@@ -823,7 +824,7 @@ unicode() ->
     ?line {ok,[{char,1,1}],1} = erl_scan:string([$$,$\\,$^,1089]),
 
     ?line {error,{1,erl_scan,Error},1} = erl_scan:string("\"qa\x{aaa}"),
-    ?line "unterminated string starting with \"qa\\x{AAA}\"" =
+    ?line "unterminated string starting with \"qa"++[2730]++"\"" =
         erl_scan:format_error(Error),
     ?line {error,{{1,1},erl_scan,_},{1,11}} =
         erl_scan:string("\"qa\\x{aaa}",{1,1}),
@@ -887,9 +888,10 @@ unicode() ->
                {char,_,$d},{']',_}],{1,8}} = erl_scan:string(Str1, {1,1}),
     ?line test(Str1),
     Comment = "%% "++[1089],
-    ?line {ok,[{comment,1,[$%,$%,$\s,1089]}],1} =
+    %% Returned a comment In R15B03:
+    {error,{1,erl_scan,{illegal,character}},1} =
         erl_scan:string(Comment, 1, return),
-    ?line {ok,[{comment,_,[$%,$%,$\s,1089]}],{1,5}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,5}} =
         erl_scan:string(Comment, {1,1}, return),
     ok.
 
@@ -958,6 +960,182 @@ more_chars() ->
         erl_scan:string("$\\xg", {1,1}),
     ok.
 
+otp_10302(doc) ->
+    "OTP-10302. Unicode characters scanner/parser.";
+otp_10302(suite) ->
+    [];
+otp_10302(Config) when is_list(Config) ->
+    %% From unicode():
+    {error,{1,erl_scan,{illegal,atom}},1} =
+        erl_scan:string("'a"++[1089]++"b'", 1, unicode),
+    {error,{{1,1},erl_scan,{illegal,atom}},{1,12}} =
+        erl_scan:string("'qa\\x{aaa}'",{1,1},unicode),
+
+    {ok,[{char,1,1089}],1} = erl_scan:string([$$,1089], 1, unicode),
+    {ok,[{char,1,1089}],1} = erl_scan:string([$$,$\\,1089],1,unicode),
+
+    Qs = "$\\x{aaa}",
+    {ok,[{char,1,2730}],1} = erl_scan:string(Qs,1,unicode),
+    {ok,[Q2],{1,9}} = erl_scan:string(Qs,{1,1},[unicode,text]),
+    [{category,char},{column,1},{length,8},
+     {line,1},{symbol,16#aaa},{text,Qs}] =
+        erl_scan:token_info(Q2),
+
+    Tags = [category, column, length, line, symbol, text],
+
+    U1 = "\"\\x{aaa}\"",
+    {ok,[T1],{1,10}} = erl_scan:string(U1, {1,1}, [unicode,text]),
+    [{category,string},{column,1},{length,9},{line,1},
+     {symbol,[16#aaa]},{text,U1}] = erl_scan:token_info(T1, Tags),
+
+    U2 = "\"\\x41\\x{fff}\\x42\"",
+    {ok,[{string,1,[65,4095,66]}],1} = erl_scan:string(U2, 1, unicode),
+
+    U3 = "\"a\n\\x{fff}\n\"",
+    {ok,[{string,1,[97,10,4095,10]}],3} = erl_scan:string(U3, 1,unicode),
+
+    U4 = "\"\\^\n\\x{aaa}\\^\n\"",
+    {ok,[{string,1,[10,2730,10]}],3} = erl_scan:string(U4, 1,[unicode]),
+
+    Str1 = "\"ab" ++ [1089] ++ "cd\"",
+    {ok,[{string,1,[97,98,1089,99,100]}],1} =
+        erl_scan:string(Str1,1,unicode),
+    {ok,[{string,{1,1},[97,98,1089,99,100]}],{1,8}} =
+        erl_scan:string(Str1, {1,1},unicode),
+
+    OK1 = 16#D800-1,
+    OK2 = 16#DFFF+1,
+    OK3 = 16#FFFE-1,
+    OK4 = 16#FFFF+1,
+    OKL = [OK1,OK2,OK3,OK4],
+
+    Illegal1 = 16#D800,
+    Illegal2 = 16#DFFF,
+    Illegal3 = 16#FFFE,
+    Illegal4 = 16#FFFF,
+    IllegalL = [Illegal1,Illegal2,Illegal3,Illegal4],
+
+    [{ok,[{comment,1,[$%,$%,$\s,OK]}],1} =
+         erl_scan:string("%% "++[OK], 1, [unicode,return]) ||
+        OK <- OKL],
+    {ok,[{comment,_,[$%,$%,$\s,OK1]}],{1,5}} =
+        erl_scan:string("%% "++[OK1], {1,1}, [unicode,return]),
+    [{error,{1,erl_scan,{illegal,character}},1} =
+         erl_scan:string("%% "++[Illegal], 1, [unicode,return]) ||
+        Illegal <- IllegalL],
+    {error,{{1,1},erl_scan,{illegal,character}},{1,5}} =
+        erl_scan:string("%% "++[Illegal1], {1,1}, [unicode,return]),
+
+    [{ok,[],1} = erl_scan:string("%% "++[OK], 1, [unicode]) ||
+        OK <- OKL],
+    {ok,[],{1,5}} = erl_scan:string("%% "++[OK1], {1,1}, [unicode]),
+    [{error,{1,erl_scan,{illegal,character}},1} =
+         erl_scan:string("%% "++[Illegal], 1, [unicode]) ||
+        Illegal <- IllegalL],
+    {error,{{1,1},erl_scan,{illegal,character}},{1,5}} =
+        erl_scan:string("%% "++[Illegal1], {1,1}, [unicode]),
+
+    [{ok,[{string,{1,1},[OK]}],{1,4}} =
+        erl_scan:string("\""++[OK]++"\"",{1,1},unicode) ||
+        OK <- OKL],
+    [{error,{{1,2},erl_scan,{illegal,character}},{1,3}} =
+         erl_scan:string("\""++[OK]++"\"",{1,1},unicode) ||
+        OK <- IllegalL],
+
+    [{error,{{1,1},erl_scan,{illegal,character}},{1,2}} =
+        erl_scan:string([Illegal],{1,1},unicode) ||
+        Illegal <- IllegalL],
+
+    {ok,[{char,{1,1},OK1}],{1,3}} =
+        erl_scan:string([$$,OK1],{1,1},unicode),
+    {error,{{1,1},erl_scan,{illegal,character}},{1,2}} =
+        erl_scan:string([$$,Illegal1],{1,1},unicode),
+
+    {ok,[{char,{1,1},OK1}],{1,4}} =
+        erl_scan:string([$$,$\\,OK1],{1,1},unicode),
+    {error,{{1,1},erl_scan,{illegal,character}},{1,4}} =
+        erl_scan:string([$$,$\\,Illegal1],{1,1},unicode),
+
+    {ok,[{string,{1,1},[55295]}],{1,5}} =
+        erl_scan:string("\"\\"++[OK1]++"\"",{1,1},unicode),
+    {error,{{1,2},erl_scan,{illegal,character}},{1,4}} =
+        erl_scan:string("\"\\"++[Illegal1]++"\"",{1,1},unicode),
+
+    {ok,[{char,{1,1},OK1}],{1,10}} =
+        erl_scan:string("$\\x{D7FF}",{1,1},unicode),
+    {error,{{1,1},erl_scan,{illegal,character}},{1,10}} =
+        erl_scan:string("$\\x{D800}",{1,1},unicode),
+
+    %% Not erl_scan, but erl_parse.
+    {integer,0,1} = erl_parse:abstract(1),
+    Float = 3.14, {float,0,Float} = erl_parse:abstract(Float),
+    {nil,0} = erl_parse:abstract([]),
+    {bin,0,
+     [{bin_element,0,{integer,0,1},default,default},
+      {bin_element,0,{integer,0,2},default,default}]} =
+        erl_parse:abstract(<<1,2>>),
+    {cons,0,{tuple,0,[{atom,0,a}]},{atom,0,b}} =
+        erl_parse:abstract([{a} | b]),
+    {string,0,"str"} = erl_parse:abstract("str"),
+    {cons,0,
+     {integer,0,$a},
+     {cons,0,{integer,0,1024},{string,0,"c"}}} =
+        erl_parse:abstract("a"++[1024]++"c"),
+
+    Line = 17,
+    {integer,Line,1} = erl_parse:abstract(1, Line),
+    Float = 3.14, {float,Line,Float} = erl_parse:abstract(Float, Line),
+    {nil,Line} = erl_parse:abstract([], Line),
+    {bin,Line,
+     [{bin_element,Line,{integer,Line,1},default,default},
+      {bin_element,Line,{integer,Line,2},default,default}]} =
+        erl_parse:abstract(<<1,2>>, Line),
+    {cons,Line,{tuple,Line,[{atom,Line,a}]},{atom,Line,b}} =
+        erl_parse:abstract([{a} | b], Line),
+    {string,Line,"str"} = erl_parse:abstract("str", Line),
+    {cons,Line,
+     {integer,Line,$a},
+     {cons,Line,{integer,Line,1024},{string,Line,"c"}}} =
+        erl_parse:abstract("a"++[1024]++"c", Line),
+
+    Opts1 = [{line,17}],
+    {integer,Line,1} = erl_parse:abstract(1, Opts1),
+    Float = 3.14, {float,Line,Float} = erl_parse:abstract(Float, Opts1),
+    {nil,Line} = erl_parse:abstract([], Opts1),
+    {bin,Line,
+     [{bin_element,Line,{integer,Line,1},default,default},
+      {bin_element,Line,{integer,Line,2},default,default}]} =
+        erl_parse:abstract(<<1,2>>, Opts1),
+    {cons,Line,{tuple,Line,[{atom,Line,a}]},{atom,Line,b}} =
+        erl_parse:abstract([{a} | b], Opts1),
+    {string,Line,"str"} = erl_parse:abstract("str", Opts1),
+    {cons,Line,
+     {integer,Line,$a},
+     {cons,Line,{integer,Line,1024},{string,Line,"c"}}} =
+        erl_parse:abstract("a"++[1024]++"c", Opts1),
+
+    [begin
+         {integer,Line,1} = erl_parse:abstract(1, Opts2),
+         Float = 3.14, {float,Line,Float} = erl_parse:abstract(Float, Opts2),
+         {nil,Line} = erl_parse:abstract([], Opts2),
+         {bin,Line,
+          [{bin_element,Line,{integer,Line,1},default,default},
+           {bin_element,Line,{integer,Line,2},default,default}]} =
+             erl_parse:abstract(<<1,2>>, Opts2),
+         {cons,Line,{tuple,Line,[{atom,Line,a}]},{atom,Line,b}} =
+             erl_parse:abstract([{a} | b], Opts2),
+         {string,Line,"str"} = erl_parse:abstract("str", Opts2),
+         {string,Line,[97,1024,99]} =
+             erl_parse:abstract("a"++[1024]++"c", Opts2)
+     end || Opts2 <- [[{encoding,unicode},{line,Line}],
+                      [{encoding,utf8},{line,Line}]]],
+
+    {cons,0,
+     {integer,0,97},
+     {cons,0,{integer,0,1024},{string,0,"c"}}} =
+        erl_parse:abstract("a"++[1024]++"c", [{encoding,latin1}]),
+    ok.
+
 test_string(String, Expected) ->
     {ok, Expected, _End} = erl_scan:string(String),
     test(String).
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 5b592c65cc..3749d594f2 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -26,6 +26,7 @@
 	 errors/1,
 	 strange_name/1,
 	 emulator_flags/1,
+	 emulator_flags_no_shebang/1,
 	 module_script/1,
 	 beam_script/1,
 	 archive_script/1,
@@ -34,7 +35,8 @@
 	 create_and_extract/1,
 	 foldl/1,
 	 overflow/1,
-	 verify_sections/3
+	 verify_sections/3,
+         unicode/1
 	]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -44,9 +46,10 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, errors, strange_name, emulator_flags,
+     emulator_flags_no_shebang,
      module_script, beam_script, archive_script, epp,
      create_and_extract, foldl, overflow,
-     archive_script_file_access].
+     archive_script_file_access, unicode].
 
 groups() -> 
     [].
@@ -149,6 +152,21 @@ emulator_flags(Config) when is_list(Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+emulator_flags_no_shebang(Config) when is_list(Config) ->
+    Data = ?config(data_dir, Config),
+    Dir = filename:absname(Data),		%Get rid of trailing slash.
+    %% Need run_with_opts, to always use "escript" explicitly
+    ?line run_with_opts(Dir, "", "emulator_flags_no_shebang -arg1 arg2 arg3",
+	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		"nostick:[{nostick,[]}]\n"
+		"mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
+		"ERL_FLAGS=false\n"
+		"unknown:[]\n"
+		"ExitCode:0">>]),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Pick the source code from the emulator_flags script
 %% Generate a new escript with a module header
 
@@ -810,6 +828,8 @@ normalize_sections(Sections) ->
 	end.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
+
 foldl(Config) when is_list(Config) ->
     {NewFile, _FileInfo,
      _EmuArg, _Source,
@@ -887,6 +907,20 @@ emulate_escript_foldl(Fun, Acc, File) ->
 	    {error, Reason}
     end.
 
+unicode(Config) when is_list(Config) ->
+    Data = ?config(data_dir, Config),
+    Dir = filename:absname(Data),		%Get rid of trailing slash.
+    run(Dir, "unicode1",
+        [<<"escript: exception error: an error occurred when evaluating"
+           " an arithmetic expression\n  in operator  '/'/2\n     "
+           "called as <<170>> / <<170>>\nExitCode:127">>]),
+    run(Dir, "unicode2",
+        [<<"escript: exception error: an error occurred when evaluating"
+           " an arithmetic expression\n  in operator  '/'/2\n     "
+           "called as <<\"\xaa\">> / <<\"\xaa\">>\nExitCode:127">>]),
+    run(Dir, "unicode3", [<<"ExitCode:0">>]),
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 overflow(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/escript_SUITE_data/emulator_flags_no_shebang b/lib/stdlib/test/escript_SUITE_data/emulator_flags_no_shebang
new file mode 100644
index 0000000000..47d843ebe1
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/emulator_flags_no_shebang
@@ -0,0 +1,10 @@
+%% -*- erlang -*-
+%%! -nostick -mnesia dir a/directory -mnesia debug verbose
+
+main(MainArgs) ->
+    io:format("main:~p\n",[MainArgs]),
+    ErlArgs = init:get_arguments(),
+    io:format("nostick:~p\n",[[E || E <- ErlArgs, element(1, E) =:= nostick]]),
+    io:format("mnesia:~p\n", [[E || E <- ErlArgs, element(1, E) =:= mnesia]]),
+    io:format("ERL_FLAGS=~p\n", [os:getenv("ERL_FLAGS")]),
+    io:format("unknown:~p\n",[[E || E <- ErlArgs, element(1, E) =:= unknown]]).
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode1 b/lib/stdlib/test/escript_SUITE_data/unicode1
new file mode 100755
index 0000000000..a77574625e
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/unicode1
@@ -0,0 +1,14 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+-export([main/1]).
+
+main(_) ->
+    ok = io:setopts([{encoding,unicode}]),
+    _D = erlang:system_flag(backtrace_depth, 0),
+    A = <<"\x{aa}">>,
+    S = lists:flatten(io_lib:format("~p/~p.", [A, A])),
+    {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+    {ok, Es} = erl_parse:parse_exprs(Ts),
+    B = erl_eval:new_bindings(),
+    erl_eval:exprs(Es, B).
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode2 b/lib/stdlib/test/escript_SUITE_data/unicode2
new file mode 100755
index 0000000000..495188f6f0
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/unicode2
@@ -0,0 +1,14 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+-export([main/1]).
+
+main(_) ->
+    ok = io:setopts([{encoding,latin1}]),
+    _D = erlang:system_flag(backtrace_depth, 0),
+    A = <<"\x{aa}">>,
+    S = lists:flatten(io_lib:format("~p/~p.", [A, A])),
+    {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+    {ok, Es} = erl_parse:parse_exprs(Ts),
+    B = erl_eval:new_bindings(),
+    erl_eval:exprs(Es, B).
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode3 b/lib/stdlib/test/escript_SUITE_data/unicode3
new file mode 100755
index 0000000000..944487dcae
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/unicode3
@@ -0,0 +1,13 @@
+#!/usr/bin/env escript
+%% -*- erlang; coding: utf-8 -*-
+
+-export([main/1]).
+
+main(_) ->
+    ok = io:setopts([{encoding,unicode}]),
+    Bin1 = <<"örn_Ѐ שלום-שלום+של 日本語">>,
+
+    L = [246,114,110,95,1024,32,1513,1500,1493,1501,45,1513,1500,1493,
+         1501,43,1513,1500,32,26085,26412,35486],
+    L = unicode:characters_to_list(Bin1, utf8),
+    ok.
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 74fcdcc7d2..521d7255ea 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
 %% 
 %% The 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 +29,7 @@
          manpage/1, otp_6708/1, otp_7084/1, otp_7421/1,
 	 io_lib_collect_line_3_wb/1, cr_whitespace_in_string/1,
 	 io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1,
-	 io_lib_print_binary_depth_one/1]).
+	 io_lib_print_binary_depth_one/1, otp_10302/1]).
 
 %-define(debug, true).
 
@@ -64,7 +65,7 @@ all() ->
      manpage, otp_6708, otp_7084, otp_7421,
      io_lib_collect_line_3_wb, cr_whitespace_in_string,
      io_fread_newlines, otp_8989, io_lib_fread_literal,
-     io_lib_print_binary_depth_one].
+     io_lib_print_binary_depth_one, otp_10302].
 
 groups() -> 
     [].
@@ -894,7 +895,7 @@ otp_6354(Config) when is_list(Config) ->
     ?line "\"\\b\\t\\n\\v\\f\\r\\e\250\"" = 
               p([8,9,10,11,12,13,27,168], 1, 40, -1),
     % ?line "\"\\b\\t\\n\"\n \"\\v\\f\\r\"\n \"\\e\250\"" =
-    ?line "\"\\b\\t\\n\\v\\f\\r\\e�\"" = 
+    ?line "\"\\b\\t\\n\\v\\f\\r\\e¨\"" =
               p([8,9,10,11,12,13,27,168], 1, 10, -1),
     ?line "\"\\b\\t\\n\\v\\f\\r\\e\250\"" = 
               p([8,9,10,11,12,13,27,168], 1, 40, 100),
@@ -2034,3 +2035,44 @@ io_lib_print_binary_depth_one(Suite) when is_list(Suite) ->
     ?line "<<...>>" = fmt("~W", [<<1:7>>, 1]),
     ?line "<<...>>" = fmt("~P", [<<1:7>>, 1]),
     ok.
+
+otp_10302(doc) ->
+    "OTP-10302. Unicode";
+otp_10302(Suite) when is_list(Suite) ->
+    "\"\x{400}\"" = pretty("\x{400}", -1),
+    "<<\"\x{400}\"/utf8>>" = pretty(<<"\x{400}"/utf8>>, -1),
+
+    "<<\"\x{400}foo\"/utf8>>" = pretty(<<"\x{400}foo"/utf8>>, 2),
+    "<<\"äppl\"/utf8>>" = pretty(<<"äppl"/utf8>>, 2),
+    "<<\"äppl\"/utf8...>>" = pretty(<<"äpple"/utf8>>, 2),
+    "<<\"apel\">>" = pretty(<<"apel">>, 2),
+    "<<\"apel\"...>>" = pretty(<<"apelsin">>, 2),
+    "<<228,112,112,108>>" = fmt("~tp", [<<"äppl">>]),
+    "<<228,...>>" = fmt("~tP", [<<"äppl">>, 2]),
+
+    Chars = lists:seq(0, 512), % just a few...
+    [] = [C || C <- Chars, S <- io_lib:write_unicode_char_as_latin1(C),
+               not is_latin1(S)],
+    L1 = [S || C <- Chars, S <- io_lib:write_unicode_char(C),
+               not is_latin1(S)],
+    L1 = lists:seq(256, 512),
+
+    [] = [C || C <- Chars, S <- io_lib:write_unicode_string_as_latin1([C]),
+               not is_latin1(S)],
+    L2 = [S || C <- Chars, S <- io_lib:write_unicode_string([C]),
+               not is_latin1(S)],
+    L2 = lists:seq(256, 512),
+
+    ok.
+
+pretty(Term, Depth) when is_integer(Depth) ->
+    Opts = [{column, 1}, {line_length, 20},
+            {depth, Depth}, {max_chars, 60},
+            {encoding, unicode}],
+    pretty(Term, Opts);
+pretty(Term, Opts) when is_list(Opts) ->
+    R = io_lib_pretty:print(Term, Opts),
+    lists:flatten(io_lib:format("~ts", [R])).
+
+is_latin1(S) ->
+    S >= 0 andalso S =< 255.
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 17e69f7c1c..299daf0e42 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -736,7 +736,7 @@ binary_options(Config) when is_list(Config) ->
 		  {getline_re, ".*<<\"hej\\\\n\">>"},
 		  {putline, "io:get_line('')."},
 		  {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
-		  {getline_re, ".*<<\""++binary_to_list(unicode:characters_to_binary(<<"\345\344\366"/utf8>>,latin1,utf8))++"\\\\n\">>"}
+		  {getline_re, ".*<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\\\n\"/utf8>>"}
 		  ],[],[],"-oldshell"),
     ok.
 
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index e3090e4a47..cac8309bd9 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -6062,21 +6062,6 @@ otp_6673(Config) when is_list(Config) ->
     ],
     ?line run(Config, Ts_RT),
 
-    %% Ulf Wiger provided a patch that makes QLC work with packages:
-    Dir = filename:join(?privdir, "p"),
-    ?line ok = filelib:ensure_dir(filename:join(Dir, ".")),
-    File = filename:join(Dir, "p.erl"),
-    ?line ok = file:write_file(File, 
-        <<"-module(p.p).\n"
-          "-export([q/0]).\n"
-          "-include_lib(\"stdlib/include/qlc.hrl\").\n"
-          "q() ->\n"
-          "    .qlc:q([X || X <- [1,2]]).">>),
-    ?line {ok, 'p.p'} = compile:file(File, [{outdir,Dir}]),
-    ?line code:purge('p.p'),
-    ?line {module, 'p.p'} = code:load_abs(filename:rootname(File), 'p.p'),
-    ?line [1,2] = qlc:e(p.p:q()),
-
     ok.
 
 otp_6964(doc) ->
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 8ee0a13f4c..500f5fadb9 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -291,10 +292,10 @@ global_capture(Config) when is_list(Config) ->
     ?line match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,index}]),
     ?line match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,binary}]),
     ?line match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,list}]),
-    ?line {match,[[<<195,133,98,99,100>>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABC�bcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,binary},unicode]),
-    ?line {match,[["�bcd","bcd"],["abcd","bcd"]]} = re:run(<<"ABC",8#303,8#205,"bcdABCabcdA">>,".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
-    ?line {match,[["�bcd","bcd"],["abcd","bcd"]]} = re:run("ABC�bcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
-    ?line {match,[[{3,5},{5,3}],[{11,4},{12,3}]]} = re:run("ABC�bcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,index},unicode]),
+    ?line {match,[[<<195,133,98,99,100>>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,binary},unicode]),
+    ?line {match,[["Åbcd","bcd"],["abcd","bcd"]]} = re:run(<<"ABC",8#303,8#205,"bcdABCabcdA">>,".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
+    ?line {match,[["Åbcd","bcd"],["abcd","bcd"]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
+    ?line {match,[[{3,5},{5,3}],[{11,4},{12,3}]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,index},unicode]),
     ?t:timetrap_cancel(Dog),
     ok.
 
@@ -314,17 +315,17 @@ replace_return(Config) when is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(3)),
     ?line {'EXIT',{badarg,_}} = (catch re:replace("na","(a","")),
     ?line <<"nasse">> = re:replace(<<"nisse">>,"i","a",[{return,binary}]),
-    ?line <<"ABC�XABCXA">> = re:replace("ABC\305abcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,binary}]),
+    ?line <<"ABCÅXABCXA">> = re:replace("ABC\305abcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,binary}]),
     
-    ?line [<<"ABC�">>,
+    ?line [<<"ABCÅ">>,
 	   <<"X">>,
 	   <<"ABC">>,
 	   <<"X">> | 
 	   <<"A">> ] = 
-	re:replace("ABC�abcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,iodata}]),
-    ?line "ABC�XABCXA" = re:replace("ABC�abcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,list},unicode]),
-    ?line <<65,66,67,195,133,88,65,66,67,88,65>> = re:replace("ABC�abcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,binary},unicode]),
-    ?line <<65,66,67,195,133,88,65,66,67,97,98,99,100,65>> = re:replace("ABC�abcdABCabcdA","a(?<FOO>bcd)","X",[{return,binary},unicode]),
+	re:replace("ABCÅabcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,iodata}]),
+    ?line "ABCÅXABCXA" = re:replace("ABCÅabcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,list},unicode]),
+    ?line <<65,66,67,195,133,88,65,66,67,88,65>> = re:replace("ABCÅabcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,binary},unicode]),
+    ?line <<65,66,67,195,133,88,65,66,67,97,98,99,100,65>> = re:replace("ABCÅabcdABCabcdA","a(?<FOO>bcd)","X",[{return,binary},unicode]),
     ?line <<"iXk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\9X",[{return,binary}]),
     ?line <<"jXk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\10X",[{return,binary}]),
     ?line <<"Xk">> = re:replace("abcdefghijk","(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)","\\11X",[{return,binary}]),
diff --git a/lib/stdlib/test/re_testoutput1_replacement_test.erl b/lib/stdlib/test/re_testoutput1_replacement_test.erl
index 69cb140e0d..8f8d8762ad 100644
--- a/lib/stdlib/test/re_testoutput1_replacement_test.erl
+++ b/lib/stdlib/test/re_testoutput1_replacement_test.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The 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,10 +275,10 @@ run() ->
 ?line <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^]cde]","y\\1I&MoqRPG&GQa\\1l",[global])), 
 ?line <<"ething">> = iolist_to_binary(re:replace("ething","^[^]cde]","AsxwUn\\1GqkWNdgRJk",[])), 
 ?line <<"ething">> = iolist_to_binary(re:replace("ething","^[^]cde]","AsxwUn\\1GqkWNdgRJk",[global])), 
-?line <<"RornKmOnaFr�tWgtW">> = iolist_to_binary(re:replace("�","^\\�","R\\1o\\1r\\1nKmOnaFr&tWgtW",[])), 
-?line <<"RornKmOnaFr�tWgtW">> = iolist_to_binary(re:replace("�","^\\�","R\\1o\\1r\\1nKmOnaFr&tWgtW",[global])), 
-?line <<"ufbmbfOYuK�wf�E�dx">> = iolist_to_binary(re:replace("�","^�","ufbmbfOYuK&wf&E&\\1dx",[])), 
-?line <<"ufbmbfOYuK�wf�E�dx">> = iolist_to_binary(re:replace("�","^�","ufbmbfOYuK&wf&E&\\1dx",[global])), 
+?line <<"RornKmOnaFrtWgtW">> = iolist_to_binary(re:replace("","^\\","R\\1o\\1r\\1nKmOnaFr&tWgtW",[])),
+?line <<"RornKmOnaFrtWgtW">> = iolist_to_binary(re:replace("","^\\","R\\1o\\1r\\1nKmOnaFr&tWgtW",[global])),
+?line <<"ufbmbfOYuKÿwfÿEÿdx">> = iolist_to_binary(re:replace("ÿ","^ÿ","ufbmbfOYuK&wf&E&\\1dx",[])),
+?line <<"ufbmbfOYuKÿwfÿEÿdx">> = iolist_to_binary(re:replace("ÿ","^ÿ","ufbmbfOYuK&wf&E&\\1dx",[global])),
 ?line <<"oAdJme0jw">> = iolist_to_binary(re:replace("0","^[0-9]+$","oAdJme\\1&jw",[])), 
 ?line <<"oAdJme0jw">> = iolist_to_binary(re:replace("0","^[0-9]+$","oAdJme\\1&jw",[global])), 
 ?line <<"1aoKN">> = iolist_to_binary(re:replace("1","^[0-9]+$","&aoKN",[])), 
@@ -14972,10 +14973,10 @@ def">> = iolist_to_binary(re:replace("abc
 def","abc$","M",[global])), 
 ?line <<"abcWCabcSYXGPjRugTabcVGabcSX">> = iolist_to_binary(re:replace("abcS","(abc)\\123","\\1WC&YXGPjRugT\\1VG&X",[])), 
 ?line <<"abcWCabcSYXGPjRugTabcVGabcSX">> = iolist_to_binary(re:replace("abcS","(abc)\\123","\\1WC&YXGPjRugT\\1VG&X",[global])), 
-?line <<"fabc�Uabc�UmiqabceCsabcabc�">> = iolist_to_binary(re:replace("abc�","(abc)\\223","f&U&Umiq\\1eCs\\1&",[])), 
-?line <<"fabc�Uabc�UmiqabceCsabcabc�">> = iolist_to_binary(re:replace("abc�","(abc)\\223","f&U&Umiq\\1eCs\\1&",[global])), 
-?line <<"JRFabcxnbabc�Vkabc�fWigQMuaY">> = iolist_to_binary(re:replace("abc�","(abc)\\323","JRF\\1xnb&Vk&fWigQMuaY",[])), 
-?line <<"JRFabcxnbabc�Vkabc�fWigQMuaY">> = iolist_to_binary(re:replace("abc�","(abc)\\323","JRF\\1xnb&Vk&fWigQMuaY",[global])), 
+?line <<"fabc“Uabc“UmiqabceCsabcabc“">> = iolist_to_binary(re:replace("abc“","(abc)\\223","f&U&Umiq\\1eCs\\1&",[])),
+?line <<"fabc“Uabc“UmiqabceCsabcabc“">> = iolist_to_binary(re:replace("abc“","(abc)\\223","f&U&Umiq\\1eCs\\1&",[global])),
+?line <<"JRFabcxnbabcÓVkabcÓfWigQMuaY">> = iolist_to_binary(re:replace("abcÓ","(abc)\\323","JRF\\1xnb&Vk&fWigQMuaY",[])),
+?line <<"JRFabcxnbabcÓVkabcÓfWigQMuaY">> = iolist_to_binary(re:replace("abcÓ","(abc)\\323","JRF\\1xnb&Vk&fWigQMuaY",[global])),
 ?line <<"vgabc@QQ">> = iolist_to_binary(re:replace("abc@","(abc)\\100","vg&QQ",[])), 
 ?line <<"vgabc@QQ">> = iolist_to_binary(re:replace("abc@","(abc)\\100","vg&QQ",[global])), 
 ?line <<"abc@OkvNytabc@abcabc@a">> = iolist_to_binary(re:replace("abc@","(abc)\\100","&OkvNyt&\\1&a",[])), 
@@ -18343,24 +18344,24 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
 ?line <<"cY">> = iolist_to_binary(re:replace("M","\\M","cY\\1",[global])), 
 ?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b","yWOTIFhIX\\1H",[])), 
 ?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b","yWOTIFhIX\\1H",[global])), 
-?line <<"NREGularsRREGularWEYrVRr">> = iolist_to_binary(re:replace("REGular","(?i)reg(?:ul(?:[a�]|ae)r|ex)","N&\\1sR&WEYrVRr",[])), 
-?line <<"NREGularsRREGularWEYrVRr">> = iolist_to_binary(re:replace("REGular","(?i)reg(?:ul(?:[a�]|ae)r|ex)","N&\\1sR&WEYrVRr",[global])), 
-?line <<"G">> = iolist_to_binary(re:replace("regulaer","(?i)reg(?:ul(?:[a�]|ae)r|ex)","G",[])), 
-?line <<"G">> = iolist_to_binary(re:replace("regulaer","(?i)reg(?:ul(?:[a�]|ae)r|ex)","G",[global])), 
-?line <<"PSsXtwlmy">> = iolist_to_binary(re:replace("Regex","(?i)reg(?:ul(?:[a�]|ae)r|ex)","PSsXtwlmy",[])), 
-?line <<"PSsXtwlmy">> = iolist_to_binary(re:replace("Regex","(?i)reg(?:ul(?:[a�]|ae)r|ex)","PSsXtwlmy",[global])), 
-?line <<"regul�rmiYTi">> = iolist_to_binary(re:replace("regul�r","(?i)reg(?:ul(?:[a�]|ae)r|ex)","&miYTi\\1\\1",[])), 
-?line <<"regul�rmiYTi">> = iolist_to_binary(re:replace("regul�r","(?i)reg(?:ul(?:[a�]|ae)r|ex)","&miYTi\\1\\1",[global])), 
-?line <<"W�����rxh�����yUoaLOIegmSA">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","W&rxh&yUoaL\\1OIegmS\\1A",[])), 
-?line <<"W�����rxh�����yUoaLOIegmSA">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","W&rxh&yUoaL\\1OIegmS\\1A",[global])), 
-?line <<"F�����gnWPyHeh�����tXTQ">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","F&gnWPyHe\\1h&tXTQ",[])), 
-?line <<"F�����gnWPyHeh�����tXTQ">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","F&gnWPyHe\\1h&tXTQ",[global])), 
-?line <<"sHerHnAhAdx">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","sHer\\1HnA\\1h\\1Adx",[])), 
-?line <<"sHerHnAhAdx">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","sHer\\1HnA\\1h\\1Adx",[global])), 
-?line <<"trobAQoU�����n">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","tr\\1obAQoU&n",[])), 
-?line <<"trobAQoU�����n">> = iolist_to_binary(re:replace("�����","����[�-��-�]+","tr\\1obAQoU&n",[global])), 
-?line <<"�XAZSd">> = iolist_to_binary(re:replace("�XAZXB","(?<=Z)X.","Sd",[])), 
-?line <<"�XAZSd">> = iolist_to_binary(re:replace("�XAZXB","(?<=Z)X.","Sd",[global])), 
+?line <<"NREGularsRREGularWEYrVRr">> = iolist_to_binary(re:replace("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)","N&\\1sR&WEYrVRr",[])),
+?line <<"NREGularsRREGularWEYrVRr">> = iolist_to_binary(re:replace("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)","N&\\1sR&WEYrVRr",[global])),
+?line <<"G">> = iolist_to_binary(re:replace("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)","G",[])),
+?line <<"G">> = iolist_to_binary(re:replace("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)","G",[global])),
+?line <<"PSsXtwlmy">> = iolist_to_binary(re:replace("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)","PSsXtwlmy",[])),
+?line <<"PSsXtwlmy">> = iolist_to_binary(re:replace("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)","PSsXtwlmy",[global])),
+?line <<"regulärmiYTi">> = iolist_to_binary(re:replace("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)","&miYTi\\1\\1",[])),
+?line <<"regulärmiYTi">> = iolist_to_binary(re:replace("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)","&miYTi\\1\\1",[global])),
+?line <<"WÅæåäàrxhÅæåäàyUoaLOIegmSA">> = iolist_to_binary(re:replace("Åæåäà","Åæåä[à-ÿÀ-ß]+","W&rxh&yUoaL\\1OIegmS\\1A",[])),
+?line <<"WÅæåäàrxhÅæåäàyUoaLOIegmSA">> = iolist_to_binary(re:replace("Åæåäà","Åæåä[à-ÿÀ-ß]+","W&rxh&yUoaL\\1OIegmS\\1A",[global])),
+?line <<"FÅæåäÿgnWPyHehÅæåäÿtXTQ">> = iolist_to_binary(re:replace("Åæåäÿ","Åæåä[à-ÿÀ-ß]+","F&gnWPyHe\\1h&tXTQ",[])),
+?line <<"FÅæåäÿgnWPyHehÅæåäÿtXTQ">> = iolist_to_binary(re:replace("Åæåäÿ","Åæåä[à-ÿÀ-ß]+","F&gnWPyHe\\1h&tXTQ",[global])),
+?line <<"sHerHnAhAdx">> = iolist_to_binary(re:replace("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+","sHer\\1HnA\\1h\\1Adx",[])),
+?line <<"sHerHnAhAdx">> = iolist_to_binary(re:replace("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+","sHer\\1HnA\\1h\\1Adx",[global])),
+?line <<"trobAQoUÅæåäßn">> = iolist_to_binary(re:replace("Åæåäß","Åæåä[à-ÿÀ-ß]+","tr\\1obAQoU&n",[])),
+?line <<"trobAQoUÅæåäßn">> = iolist_to_binary(re:replace("Åæåäß","Åæåä[à-ÿÀ-ß]+","tr\\1obAQoU&n",[global])),
+?line <<"„XAZSd">> = iolist_to_binary(re:replace("„XAZXB","(?<=Z)X.","Sd",[])),
+?line <<"„XAZSd">> = iolist_to_binary(re:replace("„XAZXB","(?<=Z)X.","Sd",[global])),
 ?line <<"A">> = iolist_to_binary(re:replace("ab cd defg","ab cd (?x) de fg","\\1A\\1",[])), 
 ?line <<"A">> = iolist_to_binary(re:replace("ab cd defg","ab cd (?x) de fg","\\1A\\1",[global])), 
 ?line <<"fab cddefgLdtKCtPab cddefgxvVUHDah">> = iolist_to_binary(re:replace("ab cddefg","ab cd(?x) de fg","f&LdtKC\\1\\1tP&xvVUHDah",[])), 
diff --git a/lib/stdlib/test/re_testoutput1_split_test.erl b/lib/stdlib/test/re_testoutput1_split_test.erl
index e86a04b008..4fc85b95c0 100644
--- a/lib/stdlib/test/re_testoutput1_split_test.erl
+++ b/lib/stdlib/test/re_testoutput1_split_test.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -524,14 +525,14 @@ run() ->
 ?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[{parts,
                                                                                                                                                                               2}]))), 
 ?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("�","^\\�",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�","^\\�",[{parts,
+?line <<"">> = iolist_to_binary(join(re:split("","^\\",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("","^\\",[{parts,
                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�","^\\�",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("�","^�",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�","^�",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("","^\\",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("ÿ","^ÿ",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("ÿ","^ÿ",[{parts,
                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�","^�",[]))), 
+?line <<":">> = iolist_to_binary(join(re:split("ÿ","^ÿ",[]))),
 ?line <<"">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[trim]))), 
 ?line <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[{parts,
                                                                                                                                                                      2}]))), 
@@ -22879,14 +22880,14 @@ def","abc$",[]))),
 ?line <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[{parts,
                                                                                                                                                                                2}]))), 
 ?line <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc�","(abc)\\223",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc�","(abc)\\223",[{parts,
+?line <<":abc">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[trim]))),
+?line <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc�","(abc)\\223",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc�","(abc)\\323",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc�","(abc)\\323",[{parts,
+?line <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[]))),
+?line <<":abc">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[trim]))),
+?line <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc�","(abc)\\323",[]))), 
+?line <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[]))),
 ?line <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
 ?line <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
                                                                                                                                                                                2}]))), 
@@ -28929,42 +28930,42 @@ xb","(?!^)x",[multiline]))),
 ?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[{parts,
                                                                                                                                                                                                                                                                                                           2}]))), 
 ?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[{parts,
+?line <<"">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
                                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
                                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
                                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("regul�r","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("regul�r","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
                                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("regul�r","(?i)reg(?:ul(?:[a�]|ae)r|ex)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("Åæåäà","Åæåä[à-ÿÀ-ß]+",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("Åæåäà","Åæåä[à-ÿÀ-ß]+",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("Åæåäà","Åæåä[à-ÿÀ-ß]+",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("Åæåäÿ","Åæåä[à-ÿÀ-ß]+",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("Åæåäÿ","Åæåä[à-ÿÀ-ß]+",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("Åæåäÿ","Åæåä[à-ÿÀ-ß]+",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+",[]))),
+?line <<"">> = iolist_to_binary(join(re:split("Åæåäß","Åæåä[à-ÿÀ-ß]+",[trim]))),
+?line <<":">> = iolist_to_binary(join(re:split("Åæåäß","Åæåä[à-ÿÀ-ß]+",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("�����","����[�-��-�]+",[]))), 
-?line <<"�XAZ">> = iolist_to_binary(join(re:split("�XAZXB","(?<=Z)X.",[trim]))), 
-?line <<"�XAZ:">> = iolist_to_binary(join(re:split("�XAZXB","(?<=Z)X.",[{parts,
+?line <<":">> = iolist_to_binary(join(re:split("Åæåäß","Åæåä[à-ÿÀ-ß]+",[]))),
+?line <<"„XAZ">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[trim]))),
+?line <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"�XAZ:">> = iolist_to_binary(join(re:split("�XAZXB","(?<=Z)X.",[]))), 
+?line <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[]))),
 ?line <<"">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[trim]))), 
 ?line <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[{parts,
                                                                                                                                                                                                       2}]))), 
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index d49416c150..f22df96697 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -28,8 +28,8 @@
 	 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]).
+	 otp_5990/1, otp_6166/1, otp_6554/1,
+	 otp_7184/1, otp_7232/1, otp_8393/1, otp_10302/1]).
 
 -export([ start_restricted_from_shell/1, 
 	  start_restricted_on_command_line/1,restricted_local/1]).
@@ -92,8 +92,8 @@ groups() ->
       [progex_bit_syntax, progex_records, progex_lc,
        progex_funs]},
      {tickets, [],
-      [otp_5990, otp_6166, otp_6554, otp_6785, otp_7184,
-       otp_7232, otp_8393]}].
+      [otp_5990, otp_6166, otp_6554, otp_7184,
+       otp_7232, otp_8393, otp_10302]}].
 
 init_per_suite(Config) ->
     Config.
@@ -108,7 +108,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
--record(state, {bin, reply, leader}).
+-record(state, {bin, reply, leader, unic = latin1}).
 
 
 start_restricted_from_shell(doc) ->
@@ -374,15 +374,18 @@ records(Config) when is_list(Config) ->
     MS = ?MODULE_STRING,
     RR1 = "rr(" ++ MS ++ "). #state{}.",
     ?line "[state]\n"
-          "#state{bin = undefined,reply = undefined,leader = undefined}.\n" =
+          "#state{bin = undefined,reply = undefined,leader = undefined,\n"
+          "       unic = latin1}.\n" =
         t(RR1),
     RR2 = "rr(" ++ MS ++ ",[state]). #state{}.",
     ?line "[state]\n"
-          "#state{bin = undefined,reply = undefined,leader = undefined}.\n" =
+          "#state{bin = undefined,reply = undefined,leader = undefined,\n"
+          "       unic = latin1}.\n" =
         t(RR2),
     RR3 = "rr(" ++ MS ++ ",'_'). #state{}.",
     ?line "[state]\n"
-          "#state{bin = undefined,reply = undefined,leader = undefined}.\n" =
+          "#state{bin = undefined,reply = undefined,leader = undefined,\n"
+          "       unic = latin1}.\n" =
         t(RR3),
     RR4 = "rr(" ++ MS ++ ", '_', {d,test1}).",
     ?line [[state]] = scan(RR4),
@@ -2540,19 +2543,6 @@ otp_6554(Config) when is_list(Config) ->
 
     ok.
 
-otp_6785(doc) ->
-    "OTP-6785. Parameterized modules.";
-otp_6785(suite) -> [];
-otp_6785(Config) when is_list(Config) ->
-    MFile = filename:join(?config(priv_dir, Config), "parameterized.erl"),
-    Contents = <<"-module(parameterized, [A]). "
-                 "-export([test/0]). "
-                 "test() -> A. ">>,
-    ?line ok = compile_file(Config, MFile, Contents, []),
-    ?line (parameterized:new(adsf)):test(),
-    file:delete(MFile),
-    ok.
-
 otp_7184(doc) ->
     "OTP-7184. Propagate exit signals from dying evaluator process.";
 otp_7184(suite) -> [];
@@ -2748,6 +2738,143 @@ prompt_err(B) ->
     S = string:strip(S2, both, $"),
     string:strip(S, right, $.).
 
+otp_10302(doc) ->
+    "OTP-10302. Unicode.";
+otp_10302(suite) -> [];
+otp_10302(Config) when is_list(Config) ->
+    Test1 =
+        <<"begin
+               io:setopts([{encoding,utf8}]),
+               [1024] = \"\\x{400}\",
+               rd(rec, {a = \"\\x{400}\"}),
+               ok = rl(rec)
+            end.">>,
+    "-record(rec,{a = \"\x{400}\"}).\nok.\n" = t(Test1),
+
+    Test3 =
+        <<"io:setopts([{encoding,utf8}]).
+           rd(rec, {a = \"\\x{400}\"}).
+           ok = rp(#rec{}).">>,
+    "ok.\nrec\n#rec{a = \"\x{400}\"}.\nok.\n" = t(Test3),
+
+    Test4 =
+        <<"io:setopts([{encoding,utf8}]).
+           A = [1024] = \"\\x{400}\".
+           b().
+           h().">>,
+
+    "ok.\n\"\x{400}\"\nA = \"\x{400}\".\nok.\n"
+    "1: io:setopts([{encoding,utf8}])\n-> ok.\n"
+    "2: A = [1024] = \"\x{400}\"\n-> \"\x{400}\"\n"
+    "3: b()\n-> ok.\nok.\n" = t(Test4),
+
+    Test5 =
+        <<"begin
+               io:setopts([{encoding,utf8}]),
+               results(0),
+               A = [1024] = \"\\x{400}\",
+               b(),
+               h()
+           end.">>,
+    "A = \"\x{400}\".\nok.\n" = t(Test5),
+
+    %% One $" is "lost":
+    true =
+       "\x{400}\": command not found" =:=
+       prompt_err({<<"io:setopts([{encoding,utf8}]). v(\"\x{400}\")."/utf8>>,
+                   unicode}),
+
+    "ok.\ndefault\n* Bad prompt function: \"\x{400}\".\n" =
+        t({<<"io:setopts([{encoding,utf8}]). "
+             "shell:prompt_func(\"\x{400}\")."/utf8>>,
+           unicode}),
+    _ = shell:prompt_func(default),
+
+    %% Test lib:format_exception() (cf. OTP-6554)
+    Test6 =
+        <<"begin
+               A = <<\"\\xaa\">>,
+               S = lists:flatten(io_lib:format(\"~p/~p.\", [A, A])),
+               {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+               {ok, Es} = erl_parse:parse_exprs(Ts),
+               B = erl_eval:new_bindings(),
+               erl_eval:exprs(Es, B)
+           end.">>,
+
+    "** exception error: an error occurred when evaluating"
+        " an arithmetic expression\n     in operator  '/'/2\n"
+        "        called as <<\"\xaa\">> / <<\"\xaa\">>.\n" = t(Test6),
+    Test7 =
+        <<"io:setopts([{encoding,utf8}]).
+           A = <<\"\\xaa\">>,
+           S = lists:flatten(io_lib:format(\"~p/~p.\", [A, A])),
+           {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+           {ok, Es} = erl_parse:parse_exprs(Ts),
+           B = erl_eval:new_bindings(),
+           erl_eval:exprs(Es, B).">>,
+
+    "ok.\n** exception error: an error occurred when evaluating"
+        " an arithmetic expression\n     in operator  '/'/2\n"
+        "        called as <<170>> / <<170>>.\n" = t(Test7),
+    Test8 =
+        <<"begin
+               A = [1089],
+               S = lists:flatten(io_lib:format(\"~tp/~tp.\", [A, A])),
+               {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+               {ok, Es} = erl_parse:parse_exprs(Ts),
+               B = erl_eval:new_bindings(),
+               erl_eval:exprs(Es, B)
+           end.">>,
+    "** exception error: an error occurred when evaluating"
+        " an arithmetic expression\n     in operator  '/'/2\n"
+        "        called as [1089] / [1089].\n" = t(Test8),
+    Test9 =
+        <<"io:setopts([{encoding,utf8}]).
+           A = [1089],
+           S = lists:flatten(io_lib:format(\"~tp/~tp.\", [A, A])),
+           {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+           {ok, Es} = erl_parse:parse_exprs(Ts),
+           B = erl_eval:new_bindings(),
+           erl_eval:exprs(Es, B).">>,
+
+    "ok.\n** exception error: an error occurred when evaluating"
+        " an arithmetic expression\n     in operator  '/'/2\n"
+        "        called as \"\x{441}\" / \"\x{441}\".\n" = t(Test9),
+    Test10 =
+        <<"A = {\"1\\xaa\",
+           $\\xaa,
+           << <<\"hi\">>/binary >>,
+           <<\"1\xaa\">>},
+           fun(a) -> true end(A).">>,
+    "** exception error: no function clause matching \n"
+    "                    erl_eval:'-inside-an-interpreted-fun-'"
+    "({\"1\xc2\xaa\",170,<<\"hi\">>,\n                                    "
+    "                        <<\"1\xc2\xaa\">>}) .\n" = t(Test10),
+    Test11 =
+        <<"io:setopts([{encoding,utf8}]).
+           A = {\"1\\xaa\",
+           $\\xaa,
+           << <<\"hi\">>/binary >>,
+           <<\"1\xaa\">>},
+           fun(a) -> true end(A).">>,
+
+    "ok.\n** exception error: no function clause matching \n"
+    "                    erl_eval:'-inside-an-interpreted-fun-'"
+    "({\"1\xaa\",170,<<\"hi\">>,\n                                           "
+    "                 <<\"1\xaa\"/utf8>>}) .\n"  = t(Test11),
+    Test12 = <<"fun(a, b) -> false end(65, [1089]).">>,
+    "** exception error: no function clause matching \n"
+    "                    erl_eval:'-inside-an-interpreted-fun-'(65,[1089])"
+    " .\n" = t(Test12),
+    Test13 =
+        <<"io:setopts([{encoding,utf8}]).
+           fun(a, b) -> false end(65, [1089]).">>,
+    "ok.\n** exception error: no function clause matching \n"
+    "                    erl_eval:'-inside-an-interpreted-fun-'(65,\"\x{441}\")"
+    " .\n" = t(Test13),
+
+    ok.
+
 scan(B) ->
     F = fun(Ts) -> 
                 case erl_parse:parse_term(Ts) of
@@ -2761,7 +2888,7 @@ scan(B) ->
     scan(t(B), F).
 
 scan(S0, F) ->
-    case erl_scan:tokens([], S0, 1) of
+    case erl_scan:tokens([], S0, 1, [unicode]) of
         {done,{ok,Ts,_},S} ->
             [F(Ts) | scan(S, F)];
         _Else ->
@@ -2769,29 +2896,36 @@ scan(S0, F) ->
     end.
 
 t({Node,Bin}) when is_atom(Node),is_binary(Bin) ->
-    t0(Bin, fun() -> start_new_shell(Node) end);
+    t0({Bin,latin1}, fun() -> start_new_shell(Node) end);
 t(Bin) when is_binary(Bin) ->
-    t0(Bin, fun() -> start_new_shell() end);
+    t0({Bin,latin1}, fun() -> start_new_shell() end);
+t({Bin,Enc}) when is_binary(Bin), is_atom(Enc) ->
+    t0({Bin,Enc}, fun() -> start_new_shell() end);
 t(L) ->
     t(list_to_binary(L)).
 
-t0(Bin, F) ->
+t0({Bin,Enc}, F) ->
     %% Spawn a process so that io_request messages do not interfer.
     P = self(),
-    C = spawn(fun() -> t1(P, Bin, F) end),
+    C = spawn(fun() -> t1(P, {Bin, Enc}, F) end),
     receive {C, R} -> R end.
 
-t1(Parent, Bin, F) ->
-    %% io:format("*** Testing ~s~n", [binary_to_list(Bin)]),
-    S = #state{bin = Bin, reply = [], leader = group_leader()},
+t1(Parent, {Bin,Enc}, F) ->
+    io:format("*** Testing ~s~n", [binary_to_list(Bin)]),
+    S = #state{bin = Bin, unic = Enc, reply = [], leader = group_leader()},
     group_leader(self(), self()),
     _Shell = F(),
     try 
         server_loop(S)
     catch exit:R -> Parent ! {self(), R};
-          throw:{?MODULE,LoopReply} ->
+          throw:{?MODULE,LoopReply,latin1} ->
                    L0 = binary_to_list(list_to_binary(LoopReply)),
                    [$\n | L1] = lists:dropwhile(fun(X) -> X =/= $\n end, L0),
+                   Parent ! {self(), dotify(L1)};
+          throw:{?MODULE,LoopReply,_Uni} ->
+                   Tmp = unicode:characters_to_binary(LoopReply),
+                   L0 = unicode:characters_to_list(Tmp),
+                   [$\n | L1] = lists:dropwhile(fun(X) -> X =/= $\n end, L0),
                    Parent ! {self(), dotify(L1)}
     after group_leader(S#state.leader, self())
     end.
@@ -2835,7 +2969,7 @@ do_io_request(Req, From, S, ReplyAs) ->
     case io_requests([Req], [], S) of
         {_Status,{eof,_},S1} ->
 	    io_reply(From, ReplyAs, {error,terminated}),
-	    throw({?MODULE,S1#state.reply});
+	    throw({?MODULE,S1#state.reply,S1#state.unic});
 	{_Status,Reply,S1} ->
 	    io_reply(From, ReplyAs, Reply),
 	    S1
@@ -2858,13 +2992,34 @@ io_requests([], [Rs|Cont], S) ->
 io_requests([], [], S) -> 
     {ok,ok,S}.
 
+io_request({setopts, Opts}, S) ->
+    #state{unic = OldEnc, bin = Bin} = S,
+    NewEnc = case proplists:get_value(encoding, Opts) of
+                 undefined -> OldEnc;
+                 utf8 -> unicode;
+                 New -> New
+             end,
+    NewBin = case {OldEnc, NewEnc} of
+                 {E, E} -> Bin;
+                 {latin1, _} ->
+                     unicode:characters_to_binary(Bin, latin1, unicode);
+                 {_, latin1} ->
+                     unicode:characters_to_binary(Bin, unicode, latin1);
+                 {_, _} -> Bin
+             end,
+    {ok, ok, S#state{unic = NewEnc, bin = NewBin}};
+io_request(getopts, S) ->
+    {ok,[{encoding,S#state.unic}],S};
 io_request({get_geometry,columns}, S) ->
     {ok,80,S};
 io_request({get_geometry,rows}, S) ->
     {ok,24,S};
 io_request({put_chars,Chars}, S) ->
     {ok,ok,S#state{reply = [S#state.reply | Chars]}};
-io_request({put_chars,_,Chars}, S) ->
+io_request({put_chars,latin1,Chars}, S) ->
+    {ok,ok,S#state{reply = [S#state.reply | Chars]}};
+io_request({put_chars,unicode,Chars0}, S) ->
+    Chars = unicode:characters_to_list(Chars0),
     {ok,ok,S#state{reply = [S#state.reply | Chars]}};
 io_request({put_chars,Mod,Func,Args}, S) ->
     case catch apply(Mod, Func, Args) of
@@ -2890,9 +3045,12 @@ get_until_loop(M, F, As, S, {more,Cont}, Enc) ->
         0 ->
             get_until_loop(M, F, As, S, 
                            catch apply(M, F, [Cont,eof|As]), Enc);
+	_ when S#state.unic =:= latin1 ->
+	    get_until_loop(M, F, As, S#state{bin = <<>>},
+			   catch apply(M, F, [Cont,binary_to_list(Bin)|As]), Enc);
 	_ ->
 	    get_until_loop(M, F, As, S#state{bin = <<>>},
-			   catch apply(M, F, [Cont,binary_to_list(Bin)|As]), Enc)
+			   catch apply(M, F, [Cont,unicode:characters_to_list(Bin)|As]), Enc)
     end;
 get_until_loop(_M, _F, _As, S, {done,Res,Buf}, Enc) ->
     {ok,Res,S#state{bin = buf2bin(Buf, Enc)}};
@@ -2903,6 +3061,8 @@ buf2bin(eof,_) ->
     <<>>;
 buf2bin(Buf,latin1) ->
     list_to_binary(Buf);
+buf2bin(Buf,utf8) ->
+    unicode:characters_to_binary(Buf,unicode,unicode);
 buf2bin(Buf,unicode) ->
     unicode:characters_to_binary(Buf,unicode,unicode).
 
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 6969c095a0..96e653985f 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -473,8 +474,8 @@ to_upper_to_lower(suite) ->
 to_upper_to_lower(doc) ->
     [];
 to_upper_to_lower(Config) when is_list(Config) ->
-    ?line "1234ABCDEF���=" = string:to_upper("1234abcdef���="),
-    ?line "����������abc()" = string:to_lower("����������abc()"),
+    ?line "1234ABCDEFÅÄÖ=" = string:to_upper("1234abcdefåäö="),
+    ?line "éèíúùòóåäöabc()" = string:to_lower("ÉÈÍÚÙÒÓÅÄÖabc()"),
     ?line All = lists:seq(0, 255),
 
     ?line UC = string:to_upper(All),
diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
index dca5e78be9..2aa6591c77 100644
--- a/lib/syntax_tools/src/Makefile
+++ b/lib/syntax_tools/src/Makefile
@@ -62,17 +62,17 @@ distclean: clean
 realclean: clean
 
 $(EBIN)/%.$(EMULATOR):%.erl
-	erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(erlc_verbose)erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/syntax_tools/src/epp_dodger.erl b/lib/syntax_tools/src/epp_dodger.erl
index b3ced34c14..70395848a1 100644
--- a/lib/syntax_tools/src/epp_dodger.erl
+++ b/lib/syntax_tools/src/epp_dodger.erl
@@ -186,6 +186,7 @@ quick_parse_file(File, Options) ->
 parse_file(File, Parser, Options) ->
     case file:open(File, [read]) of
         {ok, Dev} ->
+            _ = epp:set_encoding(Dev),
             try Parser(Dev, 1, Options)
             after ok = file:close(Dev)
 	    end;
@@ -400,7 +401,7 @@ quick_parse_form(Dev, L0, Options) ->
 parse_form(Dev, L0, Parser, Options) ->
     NoFail = proplists:get_bool(no_fail, Options),
     Opt = #opt{clever = proplists:get_bool(clever, Options)},
-    case io:scan_erl_form(Dev, "", L0) of
+    case io:scan_erl_form(Dev, "", L0, [unicode]) of
         {ok, Ts, L1} ->
             case catch {ok, Parser(Ts, Opt)} of
                 {'EXIT', Term} ->
@@ -419,6 +420,7 @@ parse_form(Dev, L0, Parser, Options) ->
                     {ok, F, L1}
             end;
         {error, _IoErr, _L1} = Err -> Err;
+        {error, _Reason} -> {eof, L0}; % This is probably encoding problem
         {eof, _L1} = Eof -> Eof
     end.
 
diff --git a/lib/syntax_tools/src/erl_comment_scan.erl b/lib/syntax_tools/src/erl_comment_scan.erl
index b833e1c069..a70e7ba413 100644
--- a/lib/syntax_tools/src/erl_comment_scan.erl
+++ b/lib/syntax_tools/src/erl_comment_scan.erl
@@ -72,7 +72,17 @@ file(Name) ->
 	{ok, V} ->
 	    case V of
 		{ok, B} ->
-		    string(binary_to_list(B));
+                    Enc = case epp:read_encoding(Name) of
+                              none -> epp:default_encoding();
+                              Enc0 -> Enc0
+                          end,
+                    case catch unicode:characters_to_list(B, Enc) of
+                        String when is_list(String) ->
+                            string(String);
+                        R ->
+                            error_read_file(Name1),
+                            exit(R)
+                    end;
 		{error, E} ->
 		    error_read_file(Name1),
 		    exit({read, E})
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index f4bbf975c3..1ffcf31134 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -60,7 +60,9 @@
 	       hook = ?NOHOOK     :: hook(),
 	       paper = ?PAPER     :: integer(),
 	       ribbon = ?RIBBON   :: integer(),
-	       user = ?NOUSER     :: term()}).
+	       user = ?NOUSER     :: term(),
+               encoding = epp:default_encoding() :: epp:source_encoding()}).
+
 -type context() :: #ctxt{}.
 
 %% =====================================================================
@@ -231,6 +233,8 @@ format(Node) ->
 %%   <dt>{user, term()}</dt>
 %%       <dd>User-specific data for use in hook functions. The default
 %%       value is `undefined'.</dd>
+%%   <dt>{encoding, epp:source_encoding()}</dt>
+%%       <dd>Specifies the encoding of the generated file.</dd>
 %% </dl>
 %%
 %% A hook function (cf. the {@link hook()} type) is passed the current
@@ -342,7 +346,9 @@ layout(Node, Options) ->
 	#ctxt{hook = proplists:get_value(hook, Options, ?NOHOOK),
 	      paper = proplists:get_value(paper, Options, ?PAPER),
 	      ribbon = proplists:get_value(ribbon, Options, ?RIBBON),
-	      user = proplists:get_value(user, Options)}).
+	      user = proplists:get_value(user, Options),
+              encoding = proplists:get_value(encoding, Options,
+                                             epp:default_encoding())}).
 
 lay(Node, Ctxt) ->
     case erl_syntax:get_ann(Node) of
@@ -445,10 +451,10 @@ lay_2(Node, Ctxt) ->
 	    text(tidy_float(erl_syntax:float_literal(Node)));
 	
 	char ->
-	    text(erl_syntax:char_literal(Node));
+	    text(erl_syntax:char_literal(Node, Ctxt#ctxt.encoding));
 	
 	string ->
-	    lay_string(erl_syntax:string_literal(Node), Ctxt);
+	    lay_string(erl_syntax:string_literal(Node, Ctxt#ctxt.encoding), Ctxt);
 
 	nil ->
 	    text("[]");
@@ -639,10 +645,6 @@ lay_2(Node, Ctxt) ->
 		     set_prec(Ctxt, PrecR)),
 	    beside(D1, beside(text(":"), D2));
 
-	qualified_name ->
-	    Ss = erl_syntax:qualified_name_segments(Node),
-	    lay_qualified_name(Ss, Ctxt);
-
 	%%
 	%% The rest is in alphabetical order
 	%%
@@ -811,13 +813,6 @@ lay_2(Node, Ctxt) ->
 		    reset_prec(Ctxt)),
 	    lay_parentheses(D, Ctxt);
 
-	query_expr ->
-	    Ctxt1 = reset_prec(Ctxt),
-	    D = lay(erl_syntax:query_expr_body(Node), Ctxt1),
-	    sep([text("query"),
-		 nest(Ctxt1#ctxt.sub_indent, D),
-		 text("end")]);
-
 	receive_expr ->
 	    Ctxt1 = reset_prec(Ctxt),
 	    D1 = lay_clauses(erl_syntax:receive_expr_clauses(Node),
@@ -966,26 +961,6 @@ maybe_parentheses(D, Prec, Ctxt) ->
 	    D
     end.
 
-lay_qualified_name([S | Ss1] = Ss, Ctxt) ->
-    case erl_syntax:type(S) of
-	atom ->
-	    case erl_syntax:atom_value(S) of
-		'' ->
-		    beside(text("."),
-			   lay_qualified_name_1(Ss1, Ctxt));
-		_ ->
-		    lay_qualified_name_1(Ss, Ctxt)
-	    end;
-	_ ->
-	    lay_qualified_name_1(Ss, Ctxt)
-    end.
-
-lay_qualified_name_1([S], Ctxt) ->
-    lay(S, Ctxt);
-lay_qualified_name_1([S | Ss], Ctxt) ->
-    beside(lay(S, Ctxt), beside(text("."),
-				lay_qualified_name_1(Ss, Ctxt))).
-
 lay_string(S, Ctxt) ->
     %% S includes leading/trailing double-quote characters. The segment
     %% width is 2/3 of the ribbon width - this seems to work well.
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 151f04b03b..41a1708925 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -161,6 +161,7 @@
 	 is_char/2,
 	 char_value/1,
 	 char_literal/1,
+	 char_literal/2,
 	 clause/2,
 	 clause/3,
 	 clause_body/1,
@@ -234,10 +235,6 @@
 	 prefix_expr/2,
 	 prefix_expr_argument/1,
 	 prefix_expr_operator/1,
-	 qualified_name/1,
-	 qualified_name_segments/1,
-	 query_expr/1,
-	 query_expr_body/1,
 	 receive_expr/1,
 	 receive_expr/3,
 	 receive_expr_action/1,
@@ -271,6 +268,7 @@
 	 is_string/2,
 	 string_value/1,
 	 string_literal/1,
+	 string_literal/2,
 	 text/1,
 	 text_string/1,
 	 try_expr/2,
@@ -449,8 +447,6 @@
 %%   <td>parentheses</td>
 %%   <td>prefix_expr</td>
 %%  </tr><tr>
-%%   <td>qualified_name</td>
-%%   <td>query_expr</td>
 %%   <td>receive_expr</td>
 %%   <td>record_access</td>
 %%  </tr><tr>
@@ -514,8 +510,6 @@
 %% @see operator/1
 %% @see parentheses/1
 %% @see prefix_expr/2
-%% @see qualified_name/1
-%% @see query_expr/1
 %% @see receive_expr/3
 %% @see record_access/3
 %% @see record_expr/2
@@ -580,15 +574,10 @@ type(Node) ->
 	{match, _, _, _} -> match_expr;
 	{op, _, _, _, _} -> infix_expr;
 	{op, _, _, _} -> prefix_expr;
-	{'query', _, _} -> query_expr;
 	{record, _, _, _, _} -> record_expr;
 	{record, _, _, _} -> record_expr;
 	{record_field, _, _, _, _} -> record_access;
-	{record_field, _, _, _} ->
-	    case is_qualified_name(Node) of
-		true -> qualified_name;
-		false -> record_access
-	    end;
+	{record_field, _, _, _} -> record_access;
 	{record_index, _, _, _} -> record_index_expr;
 	{remote, _, _, _} -> module_qualifier;
 	{rule, _, _, _, _} -> rule;
@@ -1628,6 +1617,7 @@ float_literal(Node) ->
 %%
 %% @see char_value/1
 %% @see char_literal/1
+%% @see char_literal/2
 %% @see is_char/2
 
 %% type(Node) = char
@@ -1687,13 +1677,34 @@ char_value(Node) ->
 %% =====================================================================
 %% @doc Returns the literal string represented by a `char'
 %% node. This includes the leading "`$'" character.
+%% Characters beyond 255 will be escaped.
 %%
 %% @see char/1
 
 -spec char_literal(syntaxTree()) -> nonempty_string().
 
 char_literal(Node) ->
-    io_lib:write_char(char_value(Node)).
+    char_literal(Node, latin1).
+
+
+%% =====================================================================
+%% @doc Returns the literal string represented by a `char'
+%% node. This includes the leading "`$'" character.
+%% Depending on the encoding a character beyond 255 will be escaped
+%% ('latin1') or copied as is ('utf8').
+%%
+%% @see char/1
+
+-type encoding() :: 'utf8' | 'unicode' | 'latin1'.
+
+-spec char_literal(syntaxTree(), encoding()) -> nonempty_string().
+
+char_literal(Node, unicode) ->
+    io_lib:write_unicode_char(char_value(Node));
+char_literal(Node, utf8) ->
+    io_lib:write_unicode_char(char_value(Node));
+char_literal(Node, latin1) ->
+    io_lib:write_unicode_char_as_latin1(char_value(Node)).
 
 
 %% =====================================================================
@@ -1708,6 +1719,7 @@ char_literal(Node) ->
 %%
 %% @see string_value/1
 %% @see string_literal/1
+%% @see string_literal/2
 %% @see is_string/2
 %% @see char/1
 
@@ -1768,13 +1780,32 @@ string_value(Node) ->
 %% =====================================================================
 %% @doc Returns the literal string represented by a `string'
 %% node. This includes surrounding double-quote characters.
+%% Characters beyond 255 will be escaped.
 %%
 %% @see string/1
 
 -spec string_literal(syntaxTree()) -> nonempty_string().
 
 string_literal(Node) ->
-    io_lib:write_string(string_value(Node)).
+    string_literal(Node, latin1).
+
+
+%% =====================================================================
+%% @doc Returns the literal string represented by a `string'
+%% node. This includes surrounding double-quote characters.
+%% Depending on the encoding characters beyond 255 will be escaped
+%% ('latin1') or copied as is ('utf8').
+%%
+%% @see string/1
+
+-spec string_literal(syntaxTree(), encoding()) -> nonempty_string().
+
+string_literal(Node, utf8) ->
+    io_lib:write_unicode_string(string_value(Node));
+string_literal(Node, unicode) ->
+    io_lib:write_unicode_string(string_value(Node));
+string_literal(Node, latin1) ->
+    io_lib:write_unicode_string_as_latin1(string_value(Node)).
 
 
 %% =====================================================================
@@ -3003,9 +3034,6 @@ revert_module_name(A) ->
     case type(A) of
 	atom ->
 	    {ok, concrete(A)};
-	qualified_name ->
-	    Ss = qualified_name_segments(A),
-	    {ok, [concrete(S) || S <- Ss]};
 	_ ->
 	    error
     end.
@@ -3051,11 +3079,7 @@ attribute_arguments(Node) ->
 			    M0 ->
 				{M0, none}
 			end,
-		    M2 = if is_list(M1) ->
-				 qualified_name([atom(A) || A <- M1]);
-			    true ->
-				 atom(M1)
-			 end,
+		    M2 = atom(M1),
 		    M = set_pos(M2, Pos),
 		    if Vs == none -> [M];
 		       true -> [M, set_pos(list(Vs), Pos)]
@@ -3065,20 +3089,11 @@ attribute_arguments(Node) ->
 		       list(unfold_function_names(Data, Pos)),
 		       Pos)];
 		import ->
-		    case Data of
-			{Module, Imports} ->
-			    [if is_list(Module) ->
-				     qualified_name([atom(A)
-						     || A <- Module]);
-				true ->
-				     set_pos(atom(Module), Pos)
-			     end,
-			     set_pos(
-			       list(unfold_function_names(Imports, Pos)),
-			       Pos)];
-			_ ->
-			    [qualified_name([atom(A) || A <- Data])]
-		    end;
+		    {Module, Imports} = Data,
+		    [set_pos(atom(Module), Pos),
+		     set_pos(
+		       list(unfold_function_names(Imports, Pos)),
+		       Pos)];
 		file ->
 		    {File, Line} = Data,
 		    [set_pos(string(File), Pos),
@@ -3210,53 +3225,6 @@ module_qualifier_body(Node) ->
 
 
 %% =====================================================================
-%% @doc Creates an abstract qualified name. The result represents
-%% "<code><em>S1</em>.<em>S2</em>. ... .<em>Sn</em></code>", if
-%% `Segments' is `[S1, S2, ..., Sn]'.
-%%
-%% @see qualified_name_segments/1
-
-%% type(Node) = qualified_name
-%% data(Node) = [syntaxTree()]
-%%
-%% `erl_parse' representation:
-%%
-%% {record_field, Pos, Node, Node}
-%%
-%%	Node = {atom, Pos, Value} | {record_field, Pos, Node, Node}
-%%
-%% Note that if not all leaf subnodes are (abstract) atoms, then Node
-%% represents a Mnemosyne query record field access ('record_access');
-%% see type/1 for details.
-
--spec qualified_name([syntaxTree()]) -> syntaxTree().
-
-qualified_name(Segments) ->
-    tree(qualified_name, Segments).
-
-revert_qualified_name(Node) ->
-    Pos = get_pos(Node),
-    fold_qualified_name(qualified_name_segments(Node), Pos).
-
-
-%% =====================================================================
-%% @doc Returns the list of name segments of a
-%% `qualified_name' node.
-%%
-%% @see qualified_name/1
-
--spec qualified_name_segments(syntaxTree()) -> [syntaxTree()].
-
-qualified_name_segments(Node) ->
-    case unwrap(Node) of
-	{record_field, _, _, _} = Node1 ->
-	    unfold_qualified_name(Node1);
-	Node1 ->
-	    data(Node1)
-    end.
-
-
-%% =====================================================================
 %% @doc Creates an abstract function definition. If `Clauses'
 %% is `[C1, ..., Cn]', the result represents
 %% "<code><em>Name</em> <em>C1</em>; ...; <em>Name</em>
@@ -4124,7 +4092,6 @@ record_access(Argument, Field) ->
 %% @see record_access_type/1
 %% @see record_access_field/1
 %% @see record_expr/3
-%% @see query_expr/1
 
 -record(record_access, {argument :: syntaxTree(),
 			type     :: 'none' | syntaxTree(),
@@ -4601,50 +4568,6 @@ binary_comp_body(Node) ->
 
 
 %% =====================================================================
-%% @doc Creates an abstract Mnemosyne query expression. The result
-%% represents "<code>query <em>Body</em> end</code>".
-%%
-%% @see query_expr_body/1
-%% @see record_access/2
-%% @see rule/2
-
-%% type(Node) = query_expr
-%% data(Node) = syntaxTree()
-%%
-%% `erl_parse' representation:
-%%
-%% {'query', Pos, Body}
-%%
-%%	Body = erl_parse()
-
--spec query_expr(syntaxTree()) -> syntaxTree().
-
-query_expr(Body) ->
-    tree(query_expr, Body).
-
-revert_query_expr(Node) ->
-    Pos = get_pos(Node),
-    Body = list_comp_body(Node),
-    {'query', Pos, Body}.
-
-
-%% =====================================================================
-%% @doc Returns the body subtree of a `query_expr' node.
-%%
-%% @see query_expr/1
-
--spec query_expr_body(syntaxTree()) -> syntaxTree().
-
-query_expr_body(Node) ->
-    case unwrap(Node) of
-	{'query', _, Body} ->
-	    Body;
-	Node1 ->
-	    data(Node1)
-    end.
-
-
-%% =====================================================================
 %% @doc Creates an abstract Mnemosyne rule. If `Clauses' is
 %% `[C1, ..., Cn]', the results represents
 %% "<code><em>Name</em> <em>C1</em>; ...; <em>Name</em>
@@ -6068,10 +5991,6 @@ revert_root(Node) ->
 	    revert_parentheses(Node);
 	prefix_expr ->
 	    revert_prefix_expr(Node);
-	qualified_name ->
-	    revert_qualified_name(Node);
-	query_expr ->
-	    revert_query_expr(Node);
 	receive_expr ->
 	    revert_receive_expr(Node);
 	record_access ->
@@ -6312,10 +6231,6 @@ subtrees(T) ->
 		prefix_expr ->
 		    [[prefix_expr_operator(T)],
 		     [prefix_expr_argument(T)]];
-		qualified_name ->
-		    [qualified_name_segments(T)];
-		query_expr ->
-		    [[query_expr_body(T)]];
 		receive_expr ->
 		    case receive_expr_timeout(T) of
 			none ->
@@ -6444,8 +6359,6 @@ make_tree(match_expr, [[P], [E]]) -> match_expr(P, E);
 make_tree(module_qualifier, [[M], [N]]) -> module_qualifier(M, N);
 make_tree(parentheses, [[E]]) -> parentheses(E);
 make_tree(prefix_expr, [[F], [A]]) -> prefix_expr(F, A);
-make_tree(qualified_name, [S]) -> qualified_name(S);
-make_tree(query_expr, [[B]]) -> query_expr(B);
 make_tree(receive_expr, [C]) -> receive_expr(C);
 make_tree(receive_expr, [C, [E], A]) -> receive_expr(C, E, A);
 make_tree(record_access, [[E], [F]]) ->
@@ -6788,32 +6701,6 @@ fold_variable_names(Vs) ->
 unfold_variable_names(Vs, Pos) ->
     [set_pos(variable(V), Pos) || V <- Vs].
 
-%% Support functions for qualified names ("foo.bar.baz",
-%% "erl.lang.lists", etc.). The representation overlaps with the weird
-%% "Mnesia query record access" operators. The '.' operator is left
-%% associative, so folding should nest on the left.
-
-is_qualified_name({record_field, _, L, R}) ->
-    is_qualified_name(L) andalso is_qualified_name(R);
-is_qualified_name({atom, _, _}) -> true;
-is_qualified_name(_) -> false.
-
-unfold_qualified_name(Node) ->
-    lists:reverse(unfold_qualified_name(Node, [])).
-
-unfold_qualified_name({record_field, _, L, R}, Ss) ->
-    unfold_qualified_name(R, unfold_qualified_name(L, Ss));
-unfold_qualified_name(S, Ss) -> [S | Ss].
-
-fold_qualified_name([S | Ss], Pos) ->
-    fold_qualified_name(Ss, Pos, {atom, Pos, atom_value(S)}).
-
-fold_qualified_name([S | Ss], Pos, Ack) ->
-    fold_qualified_name(Ss, Pos, {record_field, Pos, Ack,
-				  {atom, Pos, atom_value(S)}});
-fold_qualified_name([], _Pos, Ack) ->
-    Ack.
-
 %% Support functions for transforming lists of record field definitions.
 %%
 %% There is no unique representation for field definitions in the
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index 36cd35f15d..2c94ac776d 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -2223,11 +2223,6 @@ module_name_to_atom(M) ->
     case erl_syntax:type(M) of
 	atom ->
 	    erl_syntax:atom_value(M);
-	qualified_name ->
-	    list_to_atom(packages:concat(
-			   [erl_syntax:atom_value(A)
-			    || A <- erl_syntax:qualified_name_segments(M)])
-			);
 	_ ->
 	    throw(syntax_error)
     end.
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 59cf6c0a92..e9a88caff3 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -375,6 +375,8 @@ write_module(Tree, Name, Opts) ->
                    end,
                    filename(filename:join(Dir, Name1))
            end,
+    Encoding = [{encoding,Enc} || Enc <- [epp:read_encoding(Name)],
+                                 Enc =/= none],
     case proplists:get_bool(backups, Opts) of
         true ->
             backup_file(File, Opts);
@@ -382,9 +384,9 @@ write_module(Tree, Name, Opts) ->
             ok
     end,
     Printer = proplists:get_value(printer, Opts),
-    FD = open_output_file(File),
+    FD = open_output_file(File, Encoding),
     verbose("writing to file `~s'.", [File], Opts),
-    V = (catch {ok, output(FD, Printer, Tree, Opts)}),
+    V = (catch {ok, output(FD, Printer, Tree, Opts++Encoding)}),
     ok = file:close(FD),
     case V of
         {ok, _} ->
@@ -432,8 +434,9 @@ file_type(Name, Links) ->
             throw(R)
     end.
 
-open_output_file(FName) ->
-    case catch file:open(FName, [write]) of
+open_output_file(FName, Options) ->
+io:format("Options ~p~n", [Options]),
+    case catch file:open(FName, [write]++Options) of
         {ok, FD} ->
             FD;
         {error, R} ->
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index 37e561cbbe..8abc3f41cb 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -341,10 +341,12 @@ merge(Name, Files) ->
 
 merge(Name, Files, Opts) ->
     Opts1 = Opts ++ ?DEFAULT_MERGE_OPTS,
-    {Tree, Stubs} = merge_files(Name, Files, Opts1),
+    {Sources, Enc} = merge_files1(Files, Opts1),
+    {Tree, Stubs} = merge_sources(Name, Sources, Opts1),
     Dir = proplists:get_value(dir, Opts1, ""),
     Filename = proplists:get_value(outfile, Opts1, Name),
-    File = write_module(Tree, Filename, Dir, Opts1),
+    Encoding = [{encoding, Enc} || Enc =/= none],
+    File = write_module(Tree, Filename, Dir, Encoding ++ Opts1),
     [File | maybe_create_stubs(Stubs, Opts1)].
 
 
@@ -459,16 +461,21 @@ merge_files(Name, Files, Options) ->
 -spec merge_files(atom(), erl_syntax:forms(), [file:filename()], [option()]) ->
         {erl_syntax:syntaxTree(), [stubDescriptor()]}.
 
-merge_files(_, _Trees, [], _) ->
+merge_files(Name, Trees, Files, Opts) ->
+    {Sources, _Encoding} = merge_files1(Files, Opts),
+    merge_sources(Name, Trees ++ Sources, Opts).
+
+merge_files1([], _) ->
     report_error("no files to merge."),
     exit(badarg);
-merge_files(Name, Trees, Files, Opts) ->
+merge_files1(Files, Opts) ->
     Opts1 = Opts ++ [{includes, ?DEFAULT_INCLUDES},
 		     {macros, ?DEFAULT_MACROS},
 		     {preprocess, false},
 		     comments],
-    Sources = [read_module(F, Opts1) || F <- Files],
-    merge_sources(Name, Trees ++ Sources, Opts1).
+    SourceEncodings = [read_module(F, Opts1) || F <- Files],
+    {Sources, [Encoding | _]} = lists:unzip(SourceEncodings),
+    {Sources, Encoding}.
 
 
 %% =====================================================================
@@ -2512,7 +2519,11 @@ rename(Files, Renamings, Opts) ->
     lists:flatmap(fun (F) -> rename_file(F, Dict, Opts1) end, Files).
 
 rename_file(File, Dict, Opts) ->
-    S = read_module(File, Opts),
+    {S, Enc} = read_module(File, Opts),
+    %% Try to avoid *two* coding: comments:
+    Encoding = [{encoding, Enc} ||
+                   Enc =/= none,
+                   not proplists:get_bool(comments, Opts)],
     M = get_module_info(S),
     Name = M#module.name,
     Name1 = case dict:find(Name, Dict) of
@@ -2526,10 +2537,10 @@ rename_file(File, Dict, Opts) ->
     Opts1 = [no_headers,
 	     {export, [Name]},
 	     {static, [Name]},
-	     {redirect, dict:to_list(Dict1)}] ++ Opts,
+	     {redirect, dict:to_list(Dict1)}] ++ Encoding ++ Opts,
     {Tree, Stubs} = merge_sources(Name1, [S], Opts1),
     Dir = filename:dirname(filename(File)),
-    File1 = write_module(Tree, Name1, Dir, Opts),
+    File1 = write_module(Tree, Name1, Dir, Opts++Encoding),
 
     %% We create the stub file in the same directory as the source file
     %% and the target file.
@@ -2648,7 +2659,7 @@ error_text(D, Name) ->
 	{L, M, E} when is_integer(L), is_atom(M) ->
 	    case catch M:format_error(E) of
 		S when is_list(S) ->
-		    io_lib:fwrite("`~w', line ~w: ~s.",
+		    io_lib:fwrite("`~w', line ~w: ~ts.",
 				  [Name, L, S]);
 		_ ->
 		    error_text_1(D, Name)
@@ -2706,7 +2717,17 @@ open_output_file(FName) ->
 	    exit(R)
     end.
 
-%% read_module(Name, Options) -> syntaxTree()
+output_encoding(FD, Opts) ->
+    case proplists:get_value(encoding, Opts) of
+        undefined ->
+            ok = io:setopts(FD, [{encoding, epp:default_encoding()}]);
+        Encoding ->
+            ok = io:setopts(FD, [{encoding, Encoding}]),
+            EncS = epp:encoding_to_string(Encoding),
+            ok = io:fwrite(FD, <<"%% ~s\n">>, [EncS])
+    end.
+
+%% read_module(Name, Options) -> {syntaxTree(), epp:source_encoding()}
 %%
 %% This also tries to locate the real source file, if "Name" does not
 %% point directly to a particular file.
@@ -2729,20 +2750,21 @@ read_module(Name, Options) ->
 
 read_module_1(Name, Options) ->
     verbose("reading module `~s'.", [filename(Name)], Options),
-    Forms = read_module_2(Name, Options),
+    {Forms, Enc} = read_module_2(Name, Options),
     case proplists:get_bool(comments, Options) of
 	false ->
-	    Forms;
+	    {Forms, Enc};
 	true ->
 	    Comments = erl_comment_scan:file(Name),
-	    erl_recomment:recomment_forms(Forms, Comments)
+	    {erl_recomment:recomment_forms(Forms, Comments), Enc}
     end.
 
 read_module_2(Name, Options) ->
     case read_module_3(Name, Options) of
 	{ok, Forms} ->
 	    check_forms(Forms, Name), 
-	    Forms;
+            Enc = epp:read_encoding(Name),
+	    {Forms, Enc};
 	{error, _} = Error ->
 	    error_read_file(Name),
 	    exit(Error)
@@ -2772,7 +2794,7 @@ check_forms([F | Fs], File) ->
 		    _ ->
 			"unknown error"
 		end,
-	    report_error("in file `~s' at line ~w:\n  ~s",
+	    report_error("in file `~s' at line ~w:\n  ~ts",
 			 [filename(File), erl_syntax:get_pos(F), S]),
 	    exit(error);
 	_ ->
@@ -2847,6 +2869,7 @@ write_module(Tree, Name, Dir, Opts) ->
     end,
     Printer = proplists:get_value(printer, Opts),
     FD = open_output_file(File),
+    ok = output_encoding(FD, Opts),
     verbose("writing to file `~s'.", [File], Opts),
     V = (catch {ok, output(FD, Printer, Tree, Opts)}),
     ok = file:close(FD),
diff --git a/lib/test_server/doc/src/test_server_ctrl.xml b/lib/test_server/doc/src/test_server_ctrl.xml
index 41bc0bcc75..af96f1fe7e 100644
--- a/lib/test_server/doc/src/test_server_ctrl.xml
+++ b/lib/test_server/doc/src/test_server_ctrl.xml
@@ -427,11 +427,21 @@ Optional, if not given the test server controller node
         <p>A <c>CoverFile</c> can have the following entries:</p>
         <code type="none">
 {exclude, all | ExcludeModuleList}.
-{include, IncludeModuleList}.        </code>
+{include, IncludeModuleList}.
+{cross, CrossCoverInfo}.</code>
         <p>Note that each line must end with a full
           stop. <c>ExcludeModuleList</c> and <c>IncludeModuleList</c>
           are lists of atoms, where each atom is a module name.
           </p>
+
+	<p><c>CrossCoverInfo</c> is used when collecting cover data
+	  over multiple tests. Modules listed here are compiled, but
+	  they will not be analysed when the test is finished. See
+	  <seealso
+	  marker="#cross_cover_analyse-2">cross_cover_analyse/2</seealso>
+	  for more information about the cross cover mechanism and the
+	  format of <c>CrossCoverInfo</c>.
+	  </p>
         <p>If both an <c>Application</c> and a <c>CoverFile</c> is
           given, all modules in the application are cover compiled,
           except for the modules listed in <c>ExcludeModuleList</c>. The
@@ -467,30 +477,71 @@ Optional, if not given the test server controller node
       </desc>
     </func>
     <func>
-      <name>cross_cover_analyse(Level) -> ok</name>
-      <fsummary>Analyse cover data collected from all tests</fsummary>
+      <name>cross_cover_analyse(Level, Tests) -> ok</name>
+      <fsummary>Analyse cover data collected from multiple tests</fsummary>
       <type>
         <v>Level = details | overview</v>
+        <v>Tests = [{Tag,LogDir}]</v>
+	<v>Tag = atom()</v>
+	<d>Test identifier.</d>
+	<v>LogDir = string()</v>
+	<d>Log directory for the test identified by <c>Tag</c>. This
+	  can either be the <c>run.&lt;timestamp&gt;</c> directory or
+	  the parent directory of this (in which case the latest
+	  <c>run.&lt;timestamp&gt;</c> directory is chosen.</d>
       </type>
       <desc>
-        <p>Analyse cover data collected from all tests. The modules
-          analysed are the ones listed in the cross cover file
-          <c>cross.cover</c> in the current directory of the test
-          server.</p>
-        <p>The modules listed in the <c>cross.cover</c> file are
-          modules that are heavily used by other applications than the
-          one they belong to. This function should be run after all
-          tests are completed, and the result will be stored in a file
-          called cross_cover.html in the run.&lt;timestamp&gt;
-          directory of the application the modules belong to.
-          </p>
-        <p>The <c>cross.cover</c> file contains elements like this:</p>
-        <pre>
-{App,Modules}.        </pre>
-        <p>where <c>App</c> can be an application name or the atom
-          <c>all</c>. The application (or all applications) will cover
-          compile the listed <c>Modules</c>.
-          </p>
+        <p>Analyse cover data collected from multiple tests. The modules
+          analysed are the ones listed in <c>cross</c> statements in
+          the cover files. These are modules that are heavily used by
+          other tests than the one where they belong or are explicitly
+          tested. They should then be listed as cross modules in the
+          cover file for the test where they are used but do not
+          belong. Se example below.</p>
+        <p>This function should be run after all tests are completed,
+          and the result will be stored in a file called
+          <c>cross_cover.html</c> in the <c>run.&lt;timestamp&gt;</c>
+          directory of the test the modules belong to.</p>
+	<p>Note that the function can be executed on any node, and it
+	  does not require <c>test_server_ctrl</c> to be started first.</p>
+        <p>The <c>cross</c> statement in the cover file must be like this:</p>
+        <code type="none">
+{cross,[{Tag,Modules}]}.</code>
+        <p>where <c>Tag</c> is the same as <c>Tag</c> in the
+          <c>Tests</c> parameter to this function and <c>Modules</c> is a
+          list of module names (atoms).</p>
+	<p><em>Example:</em></p>
+	<p>If the module <c>m1</c> belongs to system <c>s1</c> but is
+	  heavily used also in the tests for another system <c>s2</c>,
+	  then the cover files for the two systems' tests could be like
+	  this:</p>
+<code type="none">
+s1.cover:
+  {include,[m1]}.
+
+s2.cover:
+  {include,[....]}. % modules belonging to system s2
+  {cross,[{s1,[m1]}]}.</code>
+        <p>When the tests for both <c>s1</c> and <c>s2</c> are completed, run</p>
+<code type="none">
+test_server_ctrl:cross_cover_analyse(Level,[{s1,S1LogDir},{s2,S2LogDir}])
+</code>
+
+        <p>and the accumulated cover data for <c>m1</c> will be written to
+	  <c>S1LogDir/[run.&lt;timestamp&gt;/]cross_cover.html</c>.</p>
+	<p>Note that the <c>m1</c> module will also be presented in the
+	  normal coverage log for <c>s1</c> (due to the include statement in
+	  <c>s1.cover</c>), but that only includes the coverage achieved by the
+	  <c>s1</c> test itself.</p>
+	<p>The Tag in the <c>cross</c> statement in the cover file has
+	  no other purpose than mapping the list of modules
+	  (<c>[m1]</c> in the example above) to the correct log
+	  directory where it should be included in the
+	  <c>cross_cover.html</c> file (<c>S1LogDir</c> in the example
+	  above). I.e. the value of <c>Tag</c> has no meaning, it
+	  could be <c>foo</c> as well as <c>s1</c> above, as long as
+	  the same <c>Tag</c> is used in the cover file and in the
+	  call to this function.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index 4a2c536e96..82ba3a5017 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2012</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -450,7 +450,7 @@ This option is mandatory for remote targets
       <desc>
         <p>Analyse cover data collected from all tests.
           </p>
-        <p>See test_server_ctrl:cross_cover_analyse/1
+        <p>See test_server_ctrl:cross_cover_analyse/2
           </p>
       </desc>
     </func>
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index 20e7a5942c..43a03f4e1d 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -69,7 +69,6 @@ INTERNAL_HRL_FILES = test_server_internal.hrl
 TS_HRL_FILES= ts.hrl
 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
 
@@ -113,10 +112,10 @@ configure: configure.in
 # Special Build Targets
 # ----------------------------------------------------
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
@@ -137,7 +136,7 @@ release_tests_spec: opt
 	$(INSTALL_DATA) $(ERL_FILES) $(TS_ERL_FILES) \
 		$(HRL_FILES) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) \
 		$(TS_TARGET_FILES) \
-		$(AUTOCONF_FILES) $(C_FILES) $(COVER_FILES) $(CONFIG) \
+		$(AUTOCONF_FILES) $(C_FILES) $(CONFIG) \
 		"$(RELEASE_PATH)/test_server"
 	$(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"
 
diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 9c459c05d4..1729257809 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -34,11 +34,17 @@ convert(File, Dest) ->
     %%
     %% FIXME: The colours should *really* be set with
     %% stylesheets...
+    Encoding = encoding(File),
     Header = ["<!DOCTYPE HTML PUBLIC "
 	      "\"-//W3C//DTD HTML 3.2 Final//EN\">\n"
 	      "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
 	      "<html>\n"
-	      "<head><title>", File, "</title></head>\n\n"
+              "<head>\n"
+              "<meta http-equiv=\"Content-Type\" content=\"text/html;"
+                 "charset=",
+              Encoding,"\"/>\n"
+              "<title>", File, "</title>\n"
+              "</head>\n\n"
 	      "<body bgcolor=\"white\" text=\"black\""
 	      " link=\"blue\" vlink=\"purple\" alink=\"red\">\n"],
     convert(File, Dest, Header).
@@ -55,12 +61,12 @@ convert(File, Dest, Header) ->
 		    case file:open(Dest,[write,raw]) of
 			{ok,DFd} ->
 			    file:write(DFd,[Header,"<pre>\n"]),
-			    Lines = build_html(SFd,DFd,Functions),
+			    _Lines = build_html(SFd,DFd,Functions),
 			    file:write(DFd,["</pre>\n",footer(),
 					    "</body>\n</html>\n"]),
 			    %% {_, Time2} = statistics(runtime),
 			    %% io:format("Converted ~p lines in ~.2f Seconds.~n",
-			    %% 	      [Lines, Time2/1000]),
+			    %% 	      [_Lines, Time2/1000]),
 			    file:close(SFd),
 			    file:close(DFd),
 			    ok;
@@ -180,3 +186,20 @@ possibly_enhance(Str,false) ->
 %%% End of the file
 footer() ->
     "".
+
+%%%-----------------------------------------------------------------
+%%% Read encoding from source file
+encoding(File) ->
+    Encoding =
+       case epp:read_encoding(File) of
+           none ->
+               epp:default_encoding();
+           E ->
+               E
+       end,
+    html_encoding(Encoding).
+
+html_encoding(latin1) ->
+    "iso-8859-1";
+html_encoding(utf8) ->
+    "utf-8".
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 14cdfd391a..37cd8fac99 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -60,8 +60,6 @@
 -include("test_server_internal.hrl").
 -include_lib("kernel/include/file.hrl").
 
--define(pl2a(M), test_server_sup:package_atom(M)).
-
 init_target_info() ->
     [$.|Emu] = code:objfile_extension(),
     {_, OTPRel} = init:script_id(),
@@ -97,7 +95,8 @@ init_purify() ->
 %% is found, else {error,application_not_found}.
 
 cover_compile({none,_Exclude,Include,Cross}) ->
-    CompileMods = Include++Cross,
+    CrossMods = lists:flatmap(fun({_,M}) -> M end,Cross),
+    CompileMods = Include++CrossMods,
     case length(CompileMods) of
 	0 ->
 	    io:fwrite("WARNING: No modules to cover compile!\n\n",[]),
@@ -111,7 +110,8 @@ cover_compile({none,_Exclude,Include,Cross}) ->
 	    {ok,Include}
     end;
 cover_compile({App,all,Include,Cross}) ->
-    CompileMods = Include++Cross,
+    CrossMods = lists:flatmap(fun({_,M}) -> M end,Cross),
+    CompileMods = Include++CrossMods,
     case length(CompileMods) of
 	0 ->
 	    io:fwrite("WARNING: No modules to cover compile!\n\n",[]),
@@ -129,9 +129,10 @@ cover_compile({App,all,Include,Cross}) ->
 	    {ok,Include}
     end;
 cover_compile({App,Exclude,Include,Cross}) ->
+    CrossMods = lists:flatmap(fun({_,M}) -> M end,Cross),
     case code:lib_dir(App) of
 	{error,bad_name} ->
-	    case Include++Cross of
+	    case Include++CrossMods of
 		[] ->
 		    io:format("\nWARNING: Can't find lib_dir for \'~w\'\n"
 			      "Not cover compiling!\n\n",[App]),
@@ -152,7 +153,7 @@ cover_compile({App,Exclude,Include,Cross}) ->
 	    WC = filename:join(EbinDir,"*.beam"),
 	    AllMods = module_names(filelib:wildcard(WC)),
 	    AnalyseMods = (AllMods ++ Include) -- Exclude,
-	    CompileMods = AnalyseMods ++ Cross,
+	    CompileMods = AnalyseMods ++ CrossMods,
 	    case length(CompileMods) of
 		0 ->
 		    io:fwrite("WARNING: No modules to cover compile!\n\n",[]),
@@ -317,14 +318,21 @@ pmap(Fun,List) ->
 
 
 do_cover_for_node(Node,CoverFunc) ->
+    do_cover_for_node(Node,CoverFunc,true).
+do_cover_for_node(Node,CoverFunc,StickUnstick) ->
     %% In case a slave node is starting another slave node! I.e. this
     %% function is executed on a slave node - then the cover function
     %% must be executed on the master node. This is for instance the
     %% case in test_server's own tests.
     MainCoverNode = cover:get_main_node(),
-    Sticky = unstick_all_sticky(MainCoverNode,Node),
+    Sticky =
+	if StickUnstick -> unstick_all_sticky(MainCoverNode,Node);
+	   true -> ok
+	end,
     rpc:call(MainCoverNode,cover,CoverFunc,[Node]),
-    stick_all_sticky(Node,Sticky).
+    if StickUnstick -> stick_all_sticky(Node,Sticky);
+       true -> ok
+    end.
 
 unstick_all_sticky(Node) ->
     unstick_all_sticky(node(),Node).
@@ -911,7 +919,7 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
     put(test_server_logopts, LogOpts),
     Where = [{Mod,Func}],
     put(test_server_loc, Where),
-    FWInitResult = test_server_sup:framework_call(init_tc,[?pl2a(Mod),Func,Args0],
+    FWInitResult = test_server_sup:framework_call(init_tc,[Mod,Func,Args0],
 						  {ok,Args0}),
     set_tc_state(running),
     {{Time,Value},Loc,Opts} =
@@ -1045,7 +1053,7 @@ do_end_tc_call(Mod, Func, Res, Return) ->
     Ref = make_ref(),
     if FwMod == "ct_framework" ; FwMod == "undefined"; FwMod == false ->
 	    case test_server_sup:framework_call(
-		   end_tc, [?pl2a(Mod),Func,Res, Return], ok) of
+		   end_tc, [Mod,Func,Res, Return], ok) of
 		{fail,FWReason} ->
 		    {failed,FWReason};
 		ok ->
@@ -1060,7 +1068,7 @@ do_end_tc_call(Mod, Func, Res, Return) ->
 	    end;
        true ->
 	    case test_server_sup:framework_call(FwMod, end_tc,
-						[?pl2a(Mod),Func,Res], Ref) of
+						[Mod,Func,Res], Ref) of
 		{fail,FWReason} ->
 		    {failed,FWReason};
 		_Else ->
@@ -1294,11 +1302,11 @@ get_loc(Pid) ->
 
 fw_error_notify(Mod, Func, Args, Error) ->
     test_server_sup:framework_call(error_notification,
-				   [?pl2a(Mod),Func,[Args],
+				   [Mod,Func,[Args],
 				    {Error,unknown}]).
 fw_error_notify(Mod, Func, Args, Error, Loc) ->
     test_server_sup:framework_call(error_notification,
-				   [?pl2a(Mod),Func,[Args],
+				   [Mod,Func,[Args],
 				    {Error,Loc}]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2186,12 +2194,9 @@ 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
+            Cover = case is_cover(Node) of
                         true ->
-                            not is_shielded(Name)
-				andalso same_version(Node)
-				andalso proplists:get_value(start_cover,Options,
-							    true);
+			    proplists:get_value(start_cover,Options,true);
                         false ->
                             false
                     end,
@@ -2230,15 +2235,8 @@ wait_for_node(Slave) ->
     Result = receive {sync_result,R} -> R end,
     case Result of
 	ok ->
-	    Cover = case is_cover() of
-			true ->
-			    not is_shielded(Slave) andalso same_version(Slave);
-			false ->
-			    false
-		    end,
-
 	    net_adm:ping(Slave),
-	    case Cover of
+	    case is_cover(Slave) of
 		true ->
 		    do_cover_for_node(Slave,start);
 		_ ->
@@ -2256,12 +2254,9 @@ wait_for_node(Slave) ->
 %% Kills a (remote) node.
 %% Also inform test_server_ctrl so it can clean up!
 stop_node(Slave) ->
-    Nocover = is_shielded(Slave) orelse not same_version(Slave),
-    case is_cover() of
-	true when not Nocover ->
-	    do_cover_for_node(Slave,flush);
-	_ ->
-	    ok
+    Cover = is_cover(Slave),
+    if Cover -> do_cover_for_node(Slave,flush,false);
+       true -> ok
     end,
     group_leader() ! {sync_apply,self(),{test_server_ctrl,stop_node,[Slave]}},
     Result = receive {sync_result,R} -> R end,
@@ -2273,10 +2268,15 @@ stop_node(Slave) ->
 		{nodedown, Slave} ->
 		    format(minor, "Stopped slave node: ~p", [Slave]),
 		    format(major, "=node_stop     ~p", [Slave]),
+		    if Cover -> do_cover_for_node(Slave,stop,false);
+		       true -> ok
+		    end,
 		    true
 	    after 30000 ->
 		    format("=== WARNING: Node ~p does not seem to terminate.",
 			   [Slave]),
+		    erlang:monitor_node(Slave, false),
+		    receive {nodedown, Slave} -> ok after 0 -> ok end,
 		    false
 	    end;
 	{error, _Reason} ->
@@ -2288,9 +2288,27 @@ stop_node(Slave) ->
 		   [Slave]),
 	    case net_adm:ping(Slave)of
 		pong ->
+		    erlang:monitor_node(Slave, true),
 		    slave:stop(Slave),
-		    true;
+		    receive
+			{nodedown, Slave} ->
+			    format(minor, "Stopped slave node: ~p", [Slave]),
+			    format(major, "=node_stop     ~p", [Slave]),
+			    if Cover -> do_cover_for_node(Slave,stop,false);
+			       true -> ok
+			    end,
+			    true
+		    after 30000 ->
+			    format("=== WARNING: Node ~p does not seem to terminate.",
+				   [Slave]),
+			    erlang:monitor_node(Slave, false),
+			    receive {nodedown, Slave} -> ok after 0 -> ok end,
+			    false
+		    end;
 		pang ->
+		    if Cover -> do_cover_for_node(Slave,stop,false);
+		       true -> ok
+		    end,
 		    false
 	    end
     end.
@@ -2377,6 +2395,14 @@ same_version(Name) ->
     OtherVersion = rpc:call(Name, erlang, system_info, [version]),
     ThisVersion =:= OtherVersion.
 
+is_cover(Name) ->
+    case is_cover() of
+	true ->
+	    not is_shielded(Name) andalso same_version(Name);
+	false ->
+	    false
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% temp_name(Stem) -> string()
 %% Stem = string()
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index bc08c12089..c5c57426b4 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -53,8 +53,7 @@
 -export([reject_io_reqs/1, get_levels/0, set_levels/3]).
 -export([multiply_timetraps/1, scale_timetraps/1, get_timetrap_parameters/0]).
 -export([create_priv_dir/1]).
--export([cover/2, cover/3, cover/8,
-	 cross_cover_analyse/2, cross_cover_analyse/3, trc/1, stop_trace/0]).
+-export([cover/2, cover/3, cover/8, cross_cover_analyse/2, trc/1, stop_trace/0]).
 -export([testcase_callback/1]).
 -export([set_random_seed/1]).
 -export([kill_slavenodes/0]).
@@ -88,17 +87,18 @@
 -define(data_dir_suffix, "_data/").
 -define(suitelog_name, "suite.log").
 -define(coverlog_name, "cover.html").
+-define(raw_coverlog_name, "cover.log").
 -define(cross_coverlog_name, "cross_cover.html").
+-define(raw_cross_coverlog_name, "cross_cover.log").
+-define(cross_cover_info, "cross_cover.info").
 -define(cover_total, "total_cover.log").
 -define(unexpected_io_log, "unexpected_io.log").
 -define(last_file, "last_name").
 -define(last_link, "last_link").
 -define(last_test, "last_test").
 -define(html_ext, ".html").
--define(cross_cover_file, "cross.cover").
 -define(now, erlang:now()).
 
--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;
@@ -409,7 +409,9 @@ cover(CoverFile, Analyse) ->
 cover(App, CoverFile, Analyse) ->
     controller_call({cover,{App,CoverFile},Analyse,true}).
 cover(App, CoverFile, Exclude, Include, Cross, Export, Analyse, Stop) ->
-    controller_call({cover,{App,{CoverFile,Exclude,Include,Cross,Export}},Analyse,Stop}).
+    controller_call({cover,
+		     {App,{CoverFile,Exclude,Include,Cross,Export}},
+		     Analyse,Stop}).
 
 testcase_callback(ModFunc) ->
     controller_call({testcase_callback,ModFunc}).
@@ -2277,7 +2279,7 @@ 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}]),
+							    {Mod,Func,Comment}]),
 		    run_test_cases_loop(Cases, Config, TimetrapData, ParentMode,
 					delete_status(Ref, Status));
 		_ ->
@@ -2286,7 +2288,7 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		    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}]),
+							    {Mod,Func,Comment}]),
 		    case CurrIOHandler of
 			{Ref,_} ->
 			    %% current_io_handler was set by start conf of this
@@ -2303,7 +2305,7 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	    %% this is a skipped end conf for a non-parallel group that's 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}]),
+	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
 
 	    %% 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
@@ -2334,7 +2336,7 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	    %% this is a skipped end conf for a non-parallel group nested under
 	    %% a parallel group (io buffering is active)
 	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
-	    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
+	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
 	    case CurrIOHandler of
 		{Ref,_} ->
 		    %% current_io_handler was set by start conf of this
@@ -2350,7 +2352,7 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	    %% 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}]),
+	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
 	    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
@@ -2361,7 +2363,7 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		    ok
 	    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}]),
+	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
 	    run_test_cases_loop(Cases, Config, TimetrapData, [conf(Ref,[])|Mode], Status)
     end;
 
@@ -2369,7 +2371,7 @@ run_test_cases_loop([{auto_skip_case,{Case,Comment},SkipMode}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
     {Mod,Func} = skip_case(auto, undefined, get(test_server_case_num)+1,
 			   Case, Comment, is_io_buffered(), SkipMode),
-    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
+    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
     run_test_cases_loop(Cases, Config, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
@@ -2385,7 +2387,7 @@ run_test_cases_loop([{skip_case,{conf,Ref,Case,Comment}}|Cases0],
 		%% skipped start conf
 		{skip_cases_upto(Ref, Cases0, Comment, conf, Mode),Config}
 	end,
-    test_server_sup:framework_call(report, [tc_user_skip,{?pl2a(Mod),Func,Comment}]),
+    test_server_sup:framework_call(report, [tc_user_skip,{Mod,Func,Comment}]),
     run_test_cases_loop(Cases, Config1, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
@@ -2393,7 +2395,7 @@ run_test_cases_loop([{skip_case,{Case,Comment}}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
     {Mod,Func} = skip_case(user, undefined, get(test_server_case_num)+1,
 			   Case, Comment, is_io_buffered()),
-    test_server_sup:framework_call(report, [tc_user_skip,{?pl2a(Mod),Func,Comment}]),
+    test_server_sup:framework_call(report, [tc_user_skip,{Mod,Func,Comment}]),
     run_test_cases_loop(Cases, Config, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
@@ -3571,7 +3573,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	end,
 
     test_server_sup:framework_call(report,
-				   [tc_start,{{?pl2a(Mod),Func},MinorName}]),
+				   [tc_start,{{Mod,Func},MinorName}]),
 
     print_props((RunInit==skip_init), get_props(Mode)),
     GroupName =	case get_name(Mode) of
@@ -3756,7 +3758,7 @@ progress(skip, CaseNum, Mod, Func, Loc, Reason, Time,
     print(major, "=result        skipped", []),
     print(1, "*** SKIPPED *** ~s",
 	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
-    test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,
+    test_server_sup:framework_call(report, [tc_done,{Mod,Func,
 						     {skipped,Reason1}}]),
     ReasonStr = reason_to_string(Reason1),
     ReasonStr1 = lists:flatten([string:strip(S,left) ||
@@ -3787,7 +3789,7 @@ progress(failed, CaseNum, Mod, Func, Loc, timetrap_timeout, T,
     print(1, "*** FAILED *** ~s",
 	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report,
-				   [tc_done,{?pl2a(Mod),Func,
+				   [tc_done,{Mod,Func,
 					     {failed,timetrap_timeout}}]),
     FormatLastLoc = test_server_sup:format_loc(get_last_loc(Loc)),
     ErrorReason = io_lib:format("{timetrap_timeout,~s}", [FormatLastLoc]),
@@ -3813,7 +3815,7 @@ progress(failed, CaseNum, Mod, Func, Loc, {testcase_aborted,Reason}, _T,
     print(1, "*** FAILED *** ~s",
 	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report,
-				   [tc_done,{?pl2a(Mod),Func,
+				   [tc_done,{Mod,Func,
 					     {failed,testcase_aborted}}]),
     FormatLastLoc = test_server_sup:format_loc(get_last_loc(Loc)),
     ErrorReason = io_lib:format("{testcase_aborted,~s}", [FormatLastLoc]),
@@ -3838,7 +3840,7 @@ progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
     print(major, "=result        failed: ~p, ~p", [Reason,unknown]),
     print(1, "*** FAILED *** ~s",
 	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
-    test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,
+    test_server_sup:framework_call(report, [tc_done,{Mod,Func,
 						     {failed,Reason}}]),
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
 			       true -> "~w"
@@ -3874,7 +3876,7 @@ progress(failed, CaseNum, Mod, Func, Loc, Reason, Time,
     print(major, "=result        failed: ~p, ~p", [Reason,Loc]),
     print(1, "*** FAILED *** ~s",
 	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
-    test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,
+    test_server_sup:framework_call(report, [tc_done,{Mod,Func,
 						     {failed,Reason}}]),
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
 			       true -> "~w"
@@ -3899,7 +3901,7 @@ progress(failed, CaseNum, Mod, Func, Loc, Reason, 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}]),
+    test_server_sup:framework_call(report, [tc_done,{Mod,Func,ok}]),
     Comment =
 	case RetVal of
 	    {comment,RetComment} ->
@@ -4546,7 +4548,7 @@ collect_case_invoke(Mod, Case, MFA, St) ->
 	    end;
 	_ ->
 	    Suite = test_server_sup:framework_call(get_suite,
-						   [?pl2a(Mod),Case],
+						   [Mod,Case],
 						   []),
 	    collect_subcases(Mod, Case, MFA, St, Suite)
     end.
@@ -4898,33 +4900,52 @@ pinfo(P) ->
 %% - 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'
-%%   or under the tested application.
-%%
-%% The modules listed in the cross.cover file are modules that are
-%% hevily used by other applications than the one they belong
-%% to. After all tests are completed, these modules can be analysed
-%% with coverage data from all tests - see cross_cover_analyse/1. The
-%% result is stored in a file called cross_cover.html in the
-%% run.<timestamp> directory of the application the modules belong
-%% to.
-%%
-%% For example, the lists module is listed in cross.cover to be
-%% included in all tests. lists belongs to the stdlib
-%% application. cross_cover_analyse/1 will create a file named
-%% cross_cover.html under the newest stdlib.logs/run.xxx directory,
-%% where the coverage result for the lists module from all tests is
-%% presented.
-%%
-%% The lists module is also presented in the normal coverage log
-%% for stdlib, but that only includes the coverage achieved by
-%% the stdlib tests themselves.
-%%
-%% The Cross cover file cross.cover contains elements like this:
-%% {App,Modules}.
-%% where App can be an application name or the atom all. The
-%% application (or all applications) shall cover compile the listed
-%% Modules.
+%%   {cross,[{Tag,List}]} part of the App.cover file
+%%
+%% The modules listed in the 'cross' part of the cover file are
+%% modules that are heavily used by other tests than the one where
+%% they are explicitly tested. They should then be listed as 'cross'
+%% in the cover file for the test where they are used but do not
+%% belong.
+%%
+%% After all tests are completed, the these modules can be analysed
+%% with coverage data from all tests where they are compiled - see
+%% cross_cover_analyse/2. The result is stored in a file called
+%% cross_cover.html in the run.<timestamp> directory of the
+%% test the modules belong to.
+%%
+%% Example:
+%% If the module m1 belongs to system s1 but is heavily used also in
+%% the tests for another system s2, then the cover files for the two
+%% systems could be like this:
+%%
+%% s1.cover:
+%%  {include,[m1]}.
+%%
+%% s2.cover:
+%%  {include,[....]}. % modules belonging to system s2
+%%  {cross,[{s1,[m1]}]}.
+%%
+%% When the tests for both s1 and s2 are completed, run
+%% cross_cover_analyse(Level,[{s1,S1LogDir},{s2,S2LogDir}]), and
+%% the accumulated cover data for m1 will be written to
+%% S1LogDir/[run.<timestamp>/]cross_cover.html
+%%
+%% S1LogDir and S2LogDir are either the run.<timestamp> directories
+%% for the two tests, or the parent directory of these, in which case
+%% the latest run.<timestamp> directory will be chosen.
+%%
+%% Note that the m1 module will also be presented in the normal
+%% coverage log for s1 (due to the include statement in s1.cover), but
+%% that only includes the coverage achieved by the s1 test itself.
+%%
+%% The Tag in the 'cross' statement in the cover file has no other
+%% purpose than mapping the list of modules ([m1] in the example
+%% above) to the correct log directory where it should be included in
+%% the cross_cover.html file (S1LogDir in the example above).
+%% I.e. the value of the Tag has no meaning, it could be foo as well
+%% as s1 above, as long as the same Tag is used in the cover file and
+%% in the call to cross_cover_analyse/2.
 
 
 %% Cover compilation
@@ -4933,8 +4954,7 @@ cover_compile({App,{_File,Exclude,Include,Cross,_Export}}) ->
     cover_compile1({App,Exclude,Include,Cross});
 
 cover_compile({App,CoverFile}) ->
-    Cross = get_cross_modules(App),
-    {Exclude,Include} = read_cover_file(CoverFile),
+    {Exclude,Include,Cross} = read_cover_file(CoverFile),
     cover_compile1({App,Exclude,Include,Cross}).
 
 cover_compile1(What) ->
@@ -4945,41 +4965,57 @@ cover_compile1(What) ->
 %% (Exclude), and a list of modules that are not members of the
 %% application but shall be compiled (Include).
 read_cover_file(none) ->
-    {[],[]};
+    {[],[],[]};
 read_cover_file(CoverFile) ->
     case file:consult(CoverFile) of
 	{ok,List} ->
-	    case check_cover_file(List, [], []) of
-		{ok,Exclude,Include} -> {Exclude,Include};
+	    case check_cover_file(List, [], [], []) of
+		{ok,Exclude,Include,Cross} -> {Exclude,Include,Cross};
 		error ->
 		    io:fwrite("Faulty format of CoverFile ~p\n", [CoverFile]),
-		    {[],[]}
+		    {[],[],[]}
 	    end;
 	{error,Reason} ->
 	    io:fwrite("Can't read CoverFile ~p\nReason: ~p\n",
 		      [CoverFile,Reason]),
-	    {[],[]}
+	    {[],[],[]}
     end.
 
-check_cover_file([{exclude,all}|Rest], _, Include) ->
-    check_cover_file(Rest, all, Include);
-check_cover_file([{exclude,Exclude}|Rest], _, Include) ->
+check_cover_file([{exclude,all}|Rest], _, Include, Cross) ->
+    check_cover_file(Rest, all, Include, Cross);
+check_cover_file([{exclude,Exclude}|Rest], _, Include, Cross) ->
     case lists:all(fun(M) -> is_atom(M) end, Exclude) of
 	true ->
-	    check_cover_file(Rest, Exclude, Include);
+	    check_cover_file(Rest, Exclude, Include, Cross);
 	false ->
 	    error
     end;
-check_cover_file([{include,Include}|Rest], Exclude, _) ->
+check_cover_file([{include,Include}|Rest], Exclude, _, Cross) ->
     case lists:all(fun(M) -> is_atom(M) end, Include) of
 	true ->
-	    check_cover_file(Rest, Exclude, Include);
+	    check_cover_file(Rest, Exclude, Include, Cross);
 	false ->
 	    error
     end;
-check_cover_file([], Exclude, Include) ->
-    {ok,Exclude,Include}.
+check_cover_file([{cross,Cross}|Rest], Exclude, Include, _) ->
+    case check_cross(Cross) of
+	true ->
+	    check_cover_file(Rest, Exclude, Include, Cross);
+	false ->
+	    error
+    end;
+check_cover_file([], Exclude, Include, Cross) ->
+    {ok,Exclude,Include,Cross}.
 
+check_cross([{Tag,Modules}|Rest]) ->
+    case lists:all(fun(M) -> is_atom(M) end, [Tag|Modules]) of
+	true ->
+	    check_cross(Rest);
+	false ->
+	    false
+    end;
+check_cross([]) ->
+    true.
 
 
 %% Cover analysis, per application
@@ -5000,16 +5036,17 @@ cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, Stop, TestDir) ->
 	      "<p><a href=\"~s\">Coverdata collected over all tests</a></p>",
 	      [?cross_coverlog_name]),
 
-    {CoverFile,_Included,Excluded} =
+    {CoverFile,_Included,Excluded,Cross} =
 	case CoverInfo of
-	    {File,Excl,Incl,_Cross,Export} ->
+	    {File,Excl,Incl,Cr,Export} ->
 		cover:export(Export),
-		{File,Incl,Excl};
+		{File,Incl,Excl,Cr};
 	    File ->
-		{Excl,Incl} = read_cover_file(File),
-		{File,Incl,Excl}
+		{Excl,Incl,Cr} = read_cover_file(File),
+		{File,Incl,Excl,Cr}
 	end,
     io:fwrite(CoverLog, "<p>CoverFile: <code>~p</code>\n", [CoverFile]),
+    write_cross_cover_info(TestDir,Cross),
 
     case length(cover:imported_modules()) of
 	Imps when Imps > 0 ->
@@ -5022,6 +5059,8 @@ cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, Stop, TestDir) ->
     io:fwrite(CoverLog, "<p>Excluded module(s): <code>~p</code>\n", [Excluded]),
 
     Coverage = cover_analyse(Analyse, AnalyseMods, Stop),
+    file:write_file(filename:join(TestDir,?raw_coverlog_name),
+		    term_to_binary(Coverage)),
 
     case lists:filter(fun({_M,{_,_,_}}) -> false;
 			 (_) -> true
@@ -5043,20 +5082,20 @@ cover_analyse(Analyse, AnalyseMods, Stop) ->
     test_server:cover_analyse({Analyse,TestDir}, AnalyseMods, Stop).
 
 
-%% Cover analysis, cross application
+%% Cover analysis - accumulated over multiple tests
 %% This can be executed on any node after all tests are finished.
-%% Apps = [{App,Dir}]
-%%   App = atom(), application name
-%%   Dir = string(), the log directory for App, normally where
-%%                   run.<timestamp> is found.
-%%   Modules = [atom()], modules that have been cover compiled during tests
-%%                       of other apps than the one they belong to.
-cross_cover_analyse(Analyse, Apps) ->
-    cross_cover_analyse(Analyse, Apps, get_cross_modules()).
-cross_cover_analyse(Analyse, Apps, Modules) ->
-    Apps1 = get_latest_run_dirs(Apps),
-    Apps2 = add_cross_modules(Modules,Apps1),
-    CoverdataFiles = get_coverdata_files(Apps2),
+%% Analyse = overview | details
+%% TagDirs = [{Tag,Dir}]
+%%   Tag = atom(), identifier
+%%   Dir = string(), the log directory for Tag, it can be a
+%%         run.<timestamp> directory or the parent directory of
+%%         such (in which case the latest run.<timestamp> directory
+%%         is used)
+cross_cover_analyse(Analyse, TagDirs0) ->
+    TagDirs = get_latest_run_dirs(TagDirs0),
+    TagMods = get_all_cross_info(TagDirs,[]),
+    TagDirMods = add_cross_modules(TagMods,TagDirs),
+    CoverdataFiles = get_coverdata_files(TagDirMods),
     lists:foreach(fun(CDF) -> cover:import(CDF) end, CoverdataFiles),
     io:fwrite("Cover analysing...\n", []),
     DetailsFun =
@@ -5066,39 +5105,52 @@ cross_cover_analyse(Analyse, Apps, Modules) ->
 			OutFile = filename:join(Dir,
 						atom_to_list(M) ++
 						".CROSS_COVER.html"),
-			cover:analyse_to_file(M, OutFile, [html]),
-			{file,OutFile}
+			case cover:analyse_to_file(M, OutFile, [html]) of
+			    {ok,_} ->
+				{file,OutFile};
+			    Error ->
+				Error
+			end
 		end;
 	    _ ->
 		fun(_,_) -> undefined end
 	end,
-    Coverage = analyse_apps(Apps2, DetailsFun, []),
+    Coverage = analyse_tests(TagDirMods, DetailsFun, []),
     cover:stop(),
-    write_cross_cover_logs(Coverage,Apps2).
+    write_cross_cover_logs(Coverage,TagDirMods).
 
-%% For each application from which there are cross cover analysed
+write_cross_cover_info(_Dir,[]) ->
+    ok;
+write_cross_cover_info(Dir,Cross) ->
+    {ok,Fd} = file:open(filename:join(Dir,?cross_cover_info),[write]),
+    lists:foreach(fun(C) -> io:format(Fd,"~p.~n",[C]) end, Cross),
+    file:close(Fd).
+
+%% For each test from which there are cross cover analysed
 %% modules, write a cross cover log (cross_cover.html).
-write_cross_cover_logs([{App,Coverage}|T],Apps) ->
-    case lists:keyfind(App,1,Apps) of
+write_cross_cover_logs([{Tag,Coverage}|T],TagDirMods) ->
+    case lists:keyfind(Tag,1,TagDirMods) of
 	{_,Dir,Mods} when Mods=/=[] ->
+	    file:write_file(filename:join(Dir,?raw_cross_coverlog_name),
+			    term_to_binary(Coverage)),
 	    CoverLogName = filename:join(Dir,?cross_coverlog_name),
 	    {ok,CoverLog} = file:open(CoverLogName, [write]),
 	    write_coverlog_header(CoverLog),
 	    io:fwrite(CoverLog,
 		      "<h1>Coverage results for \'~w\' from all tests</h1>\n",
-		      [App]),
+		      [Tag]),
 	    write_cover_result_table(CoverLog, Coverage),
 	    io:fwrite("Written file ~p\n", [CoverLogName]);
 	_ ->
 	    ok
     end,
-    write_cross_cover_logs(T,Apps);
+    write_cross_cover_logs(T,TagDirMods);
 write_cross_cover_logs([],_) ->
     io:fwrite("done\n", []).
 
 %% Get the latest run.<timestamp> directories
-get_latest_run_dirs([{App,Dir}|Apps]) ->
-    [{App,get_latest_run_dir(Dir)} | get_latest_run_dirs(Apps)];
+get_latest_run_dirs([{Tag,Dir}|Rest]) ->
+    [{Tag,get_latest_run_dir(Dir)} | get_latest_run_dirs(Rest)];
 get_latest_run_dirs([]) ->
     [].
 
@@ -5117,44 +5169,47 @@ get_latest_dir([_|T],Latest) ->
 get_latest_dir([],Latest) ->
     Latest.
 
-%% Associate the cross cover modules with their applications.
-add_cross_modules(Mods,Apps)->
-    do_add_cross_modules(Mods,[{App,Dir,[]} || {App,Dir} <- Apps]).
-do_add_cross_modules([Mod|Mods],Apps)->
-    App = get_app(Mod),
-    NewApps =
-	case lists:keytake(App,1,Apps) of
-	    {value,{App,Dir,AppMods},Rest} ->
-		[{App,Dir,lists:umerge([Mod],AppMods)}|Rest];
+get_all_cross_info([{_Tag,Dir}|Rest],Acc) ->
+    case file:consult(filename:join(Dir,?cross_cover_info)) of
+	{ok,TagMods} ->
+	    get_all_cross_info(Rest,TagMods++Acc);
+	_ ->
+	    get_all_cross_info(Rest,Acc)
+    end;
+get_all_cross_info([],Acc) ->
+    Acc.
+
+%% Associate the cross cover modules with their log directories
+add_cross_modules(TagMods,TagDirs)->
+    do_add_cross_modules(TagMods,[{Tag,Dir,[]} || {Tag,Dir} <- TagDirs]).
+do_add_cross_modules([{Tag,Mods1}|TagMods],TagDirMods)->
+    NewTagDirMods =
+	case lists:keytake(Tag,1,TagDirMods) of
+	    {value,{Tag,Dir,Mods},Rest} ->
+		[{Tag,Dir,lists:umerge(lists:sort(Mods1),Mods)}|Rest];
 	    false ->
-		Apps
+		TagDirMods
 	end,
-    do_add_cross_modules(Mods,NewApps);
-do_add_cross_modules([],Apps) ->
-    %% Just to get the modules in the same order as app-only cover log
-    [{App,Dir,lists:reverse(Mods)} || {App,Dir,Mods} <- Apps].
-
-get_app(Module) ->
-    Beam = code:which(Module),
-    AppDir = filename:basename(filename:dirname(filename:dirname(Beam))),
-    [AppStr|_] = string:tokens(AppDir,"-"),
-    list_to_atom(AppStr).
+    do_add_cross_modules(TagMods,NewTagDirMods);
+do_add_cross_modules([],TagDirMods) ->
+    %% Just to get the modules in the same order as in the normal cover log
+    [{Tag,Dir,lists:reverse(Mods)} || {Tag,Dir,Mods} <- TagDirMods].
 
 %% Find all exported coverdata files.
-get_coverdata_files(Apps) ->
+get_coverdata_files(TagDirMods) ->
     lists:flatmap(
-      fun({_,LatestAppDir,_}) ->
-	      filelib:wildcard(filename:join(LatestAppDir,"all.coverdata"))
+      fun({_,LatestDir,_}) ->
+	      filelib:wildcard(filename:join(LatestDir,"all.coverdata"))
       end,
-      Apps).
+      TagDirMods).
 
 
-%% For each application, analyse all modules
+%% For each test, analyse all modules
 %% Used for cross cover analysis.
-analyse_apps([{App,LastTest,Modules}|T], DetailsFun, Acc) ->
+analyse_tests([{Tag,LastTest,Modules}|T], DetailsFun, Acc) ->
     Cov = analyse_modules(LastTest, Modules, DetailsFun, []),
-    analyse_apps(T, DetailsFun, [{App,Cov}|Acc]);
-analyse_apps([], _DetailsFun, Acc) ->
+    analyse_tests(T, DetailsFun, [{Tag,Cov}|Acc]);
+analyse_tests([], _DetailsFun, Acc) ->
     Acc.
 
 %% Analyse each module
@@ -5167,27 +5222,6 @@ analyse_modules(_Dir, [], _DetailsFun, Acc) ->
     Acc.
 
 
-%% Read the cross cover file (cross.cover)
-get_cross_modules() ->
-    get_cross_modules(all).
-get_cross_modules(App) ->
-    case file:consult(?cross_cover_file) of
-	{ok,List} ->
-	    get_cross_modules(App, List, []);
-	_X ->
-	    []
-    end.
-
-get_cross_modules(App, [{_To,Modules}|T], Acc) when App==all->
-    get_cross_modules(App, T, Acc ++ Modules);
-get_cross_modules(App, [{To,Modules}|T], Acc) when To==App; To==all->
-    get_cross_modules(App, T, Acc ++ Modules);
-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
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index c7553cccb5..a6d426887e 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -28,7 +28,7 @@
 	 get_username/0, get_os_family/0, 
 	 hostatom/0, hostatom/1, hoststr/0, hoststr/1,
 	 framework_call/2,framework_call/3,framework_call/4,
-	 format_loc/1, package_str/1, package_atom/1,
+	 format_loc/1,
 	 call_trace/1]).
 -include("test_server_internal.hrl").
 -define(crash_dump_tar,"crash_dumps.tar.gz").
@@ -553,7 +553,7 @@ format_loc([{Mod,Func,Line}|Rest]) ->
 format_loc([{Mod,LineOrFunc}]) ->
     format_loc({Mod,LineOrFunc});
 format_loc({Mod,Func}) when is_atom(Func) -> 
-    io_lib:format("{~s,~w}",[package_str(Mod),Func]);
+    io_lib:format("{~w,~w}",[Mod,Func]);
 format_loc(Loc) ->
     io_lib:format("~p",[Loc]).    
 
@@ -562,15 +562,15 @@ format_loc1([{Mod,Func,Line}]) ->
 format_loc1([{Mod,Func,Line}|Rest]) ->
     ["              ",format_loc1({Mod,Func,Line}),",\n"|format_loc1(Rest)];
 format_loc1({Mod,Func,Line}) ->
-    ModStr = package_str(Mod),
+    ModStr = atom_to_list(Mod),
     case {lists:member(no_src, get(test_server_logopts)),
 	  lists:reverse(ModStr)} of
 	{false,[$E,$T,$I,$U,$S,$_|_]}  ->
-	    io_lib:format("{~s,~w,<a href=\"~s~s#~w\">~w</a>}",
-			  [ModStr,Func,downcase(ModStr),?src_listing_ext,
+	    io_lib:format("{~w,~w,<a href=\"~s~s#~w\">~w</a>}",
+			  [Mod,Func,downcase(ModStr),?src_listing_ext,
 			   Line,Line]);
 	_ ->
-	    io_lib:format("{~s,~w,~w}",[ModStr,Func,Line])
+	    io_lib:format("{~w,~w,~w}",[Mod,Func,Line])
     end.
 
 downcase(S) -> downcase(S, []).
@@ -581,22 +581,6 @@ downcase([C|Rest], Result) ->
 downcase([], Result) ->
     lists:reverse(Result).
 
-package_str(Mod) when is_atom(Mod) ->
-    atom_to_list(Mod);
-package_str(Mod) when is_list(Mod), is_atom(hd(Mod)) ->
-    %% convert [s1,s2] -> "s1.s2"
-    [_|M] = lists:flatten(["."++atom_to_list(S) || S <- Mod]),
-    M;
-package_str(Mod) when is_list(Mod) ->
-    Mod.
-
-package_atom(Mod) when is_atom(Mod) ->
-    Mod;
-package_atom(Mod) when is_list(Mod), is_atom(hd(Mod)) ->
-    list_to_atom(package_str(Mod));
-package_atom(Mod) when is_list(Mod) ->
-    list_to_atom(Mod).
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% call_trace(TraceSpecFile) -> ok
 %%
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index 115e783070..cfd7161dbd 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -160,8 +160,8 @@ help(installed) ->
 	 "                      the given run options\n",
 	 "  ts:cross_cover_analyse(Level)\n"
 	 "                    - Used after ts:run with option cover or \n"
-	 "                      cover_details. Analyses modules specified in\n"
-	 "                      cross.cover.\n"
+	 "                      cover_details. Analyses modules specified with\n"
+	 "                      a 'cross' statement in the cover spec file.\n"
 	 "                      Level can be 'overview' or 'details'.\n",
 	 "  ts:compile_testcases()~n"
 	 "  ts:compile_testcases(Apps)~n"
@@ -528,8 +528,7 @@ cross_cover_analyse([Level]) ->
     cross_cover_analyse(Level);
 cross_cover_analyse(Level) ->
     Apps = get_last_app_tests(),
-    Modules = get_cross_modules(Apps,[]),
-    test_server_ctrl:cross_cover_analyse(Level,Apps,Modules).
+    test_server_ctrl:cross_cover_analyse(Level,Apps).
 
 get_last_app_tests() ->
     AllTests = filelib:wildcard(filename:join(["*","*_test.logs"])),
@@ -558,30 +557,6 @@ get_last_app_tests([Dir|Dirs],RE,Acc) ->
 get_last_app_tests([],_,Acc) ->
     Acc.
 
-get_cross_modules([{App,_}|Apps],Acc) ->
-    Mods = cross_modules(App),
-    get_cross_modules(Apps,lists:umerge(Mods,Acc));
-get_cross_modules([],Acc) ->
-    Acc.
-
-cross_modules(App) ->
-    case default_coverfile(App) of
-	none ->
-	    [];
-	File ->
-	    case catch file:consult(File) of
-		{ok,CoverSpec} ->
-		    case lists:keyfind(cross_apps,1,CoverSpec) of
-			false ->
-			    [];
-			{cross_apps,App,Modules} ->
-			    lists:usort(Modules)
-		    end;
-		_ ->
-		    []
-	    end
-    end.
-
 %%% Implementation.
 
 check_and_run(Fun) ->
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index d9a699ca9f..c0200ab67c 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -143,7 +143,6 @@ suite_order(inets) -> 28;
 suite_order(asn1) -> 30;
 suite_order(os_mon) -> 32;
 suite_order(snmp) -> 38;
-suite_order(mnemosyne) -> 40;
 suite_order(mnesia_session) -> 42;
 suite_order(mnesia) -> 44;
 suite_order(system) -> 999; %% IMPORTANT: system SHOULD always be last!
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 95a3423fef..fb82a87fd0 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -80,7 +80,7 @@ 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_server_break_SUITE].
+     test_server_break_SUITE, test_server_cover_SUITE].
 
 
 %%--------------------------------------------------------------------
@@ -93,37 +93,95 @@ 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", 38, 1, 30,
-			  19, 9, 1, 11, 2, 25, Config).
+    run_test_server_tests("test_server_SUITE",
+			  [{test_server_SUITE,skip_case7,"SKIPPED!"}],
+			  38, 1, 30, 19, 9, 1, 11, 2, 25, Config).
 
 test_server_parallel01_SUITE(Config) ->
-    run_test_server_tests("test_server_parallel01_SUITE", 37, 0, 19, 
-			  19, 0, 0, 0, 0, 37, 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).
+    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).
+    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).
+    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("test_server_conf02_SUITE", [],
+			  26, 0, 12, 12, 0, 0, 0, 0, 26, Config).
 
 test_server_break_SUITE(Config) ->
-    D = run_test_server_tests("test_server_break_SUITE", 8, 2, 6,
-			  4, 0, 0, 0, 2, 6, Config),
-    D.
+    run_test_server_tests("test_server_break_SUITE", [],
+			  8, 2, 6, 4, 0, 0, 0, 2, 6, Config).
 
-run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, 
+test_server_cover_SUITE(Config) ->
+    case test_server:is_cover() of
+	true ->
+	    {skip, "Cover already running"};
+	false ->
+	    PrivDir = ?config(priv_dir,Config),
+
+	    %% Test suite has two test cases
+	    %%   tc1 calls cover_helper:foo/0
+	    %%   tc2 calls cover_helper:bar/0
+	    %% Each function in cover_helper is one line.
+	    %%
+	    %% First test run skips tc2, so only cover_helper:foo/0 is executed.
+	    %% Cover file specifies to include cover_helper in this test run.
+	    CoverFile1 = filename:join(PrivDir,"t1.cover"),
+	    CoverSpec1 = {include,[cover_helper]},
+	    file:write_file(CoverFile1,io_lib:format("~p.~n",[CoverSpec1])),
+	    run_test_server_tests("test_server_cover_SUITE",
+				  [{test_server_cover_SUITE,tc2,"SKIPPED!"}],
+				  4, 0, 2, 1, 1, 0, 1, 0, 3,
+				  CoverFile1, Config),
+
+	    %% Next test run skips tc1, so only cover_helper:bar/0 is executed.
+	    %% Cover file specifies cross compilation of cover_helper
+	    CoverFile2 = filename:join(PrivDir,"t2.cover"),
+	    CoverSpec2 = {cross,[{t1,[cover_helper]}]},
+	    file:write_file(CoverFile2,io_lib:format("~p.~n",[CoverSpec2])),
+	    run_test_server_tests("test_server_cover_SUITE",
+				  [{test_server_cover_SUITE,tc1,"SKIPPED!"}],
+				  4, 0, 2, 1, 1, 0, 1, 0, 3, CoverFile2, Config),
+
+	    %% Cross cover analyse
+	    WorkDir = ?config(work_dir,Config),
+	    WC = filename:join([WorkDir,"test_server_cover_SUITE.logs","run.*"]),
+	    [D2,D1|_] = lists:reverse(lists:sort(filelib:wildcard(WC))),
+	    TagDirs = [{t1,D1},{t2,D2}],
+	    test_server_ctrl:cross_cover_analyse(details,TagDirs),
+
+	    %% Check that cover log shows only what is really included
+	    %% in the test and cross cover log show the accumulated
+	    %% result.
+	    {ok,Cover1} = file:read_file(filename:join(D1,"cover.log")),
+	    [{cover_helper,{1,1,_}}] = binary_to_term(Cover1),
+	    {ok,Cover2} = file:read_file(filename:join(D2,"cover.log")),
+	    [] = binary_to_term(Cover2),
+	    {ok,Cross} = file:read_file(filename:join(D1,"cross_cover.log")),
+	    [{cover_helper,{2,0,_}}] = binary_to_term(Cross),
+	    ok
+    end.
+
+
+run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
 		      NUsrSkip, NAutoSkip, 
 		      NActualSkip, NActualFail, NActualSucc, Config) ->
+    run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
+			  NUsrSkip, NAutoSkip,
+			  NActualSkip, NActualFail, NActualSucc, false, Config).
+
+run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
+		      NUsrSkip, NAutoSkip,
+		      NActualSkip, NActualFail, NActualSucc, Cover, Config) ->
 
     WorkDir = proplists:get_value(work_dir, Config),
     ct:log("<a href=\"file://~s\">Test case log files</a>\n",
@@ -131,11 +189,17 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc,
 
     Node = proplists:get_value(node, Config),
     {ok,_Pid} = rpc:call(Node,test_server_ctrl, start, []),
+    case Cover of
+	false ->
+	    ok;
+	_ ->
+	    rpc:call(Node,test_server_ctrl,cover,[Cover,details])
+    end,
     rpc:call(Node,
 	     test_server_ctrl,add_dir_with_skip,
 	     [SuiteName, 
 	      [proplists:get_value(data_dir,Config)],SuiteName,
-	      [{test_server_SUITE,skip_case7,"SKIPPED!"}]]),
+	      Skip]),
 
     until(fun() ->
 		  rpc:call(Node,test_server_ctrl,jobs,[]) =:= []
diff --git a/lib/test_server/test/test_server_SUITE_data/Makefile.src b/lib/test_server/test/test_server_SUITE_data/Makefile.src
index ec8ddd78b0..c770627f04 100644
--- a/lib/test_server/test/test_server_SUITE_data/Makefile.src
+++ b/lib/test_server/test/test_server_SUITE_data/Makefile.src
@@ -5,4 +5,6 @@ all:
 	erlc test_server_shuffle01_SUITE.erl
 	erlc test_server_conf02_SUITE.erl
 	erlc test_server_skip_SUITE.erl
-	erlc test_server_break_SUITE.erl
\ No newline at end of file
+	erlc test_server_break_SUITE.erl
+	erlc test_server_cover_SUITE.erl
+	erlc +debug_info test_server_cover_SUITE_data/cover_helper.erl
\ No newline at end of file
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
index 70e30a3334..d9f009679a 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
@@ -41,7 +41,7 @@ init_per_suite(Config) ->
     spawn(fun break_and_continue_sup/0),
     Config.
 
-end_per_suite(Config) ->
+end_per_suite(_Config) ->
     ok.
 
 init_per_testcase(Case,Config) when Case==break_in_init_tc ->
@@ -90,19 +90,19 @@ break_in_end_tc_after_fail(Config) when is_list(Config) ->
 break_in_end_tc_after_abort(Config) when is_list(Config) ->
     ?t:adjusted_sleep(2000). % will cause a timetrap timeout
 
-%%%-----------------------------------------------------------------
-%%% Internal functions
-
 %% This test case checks that all breaks in previous test cases was
 %% also continued, and that the break lasted as long as expected.
 %% The reason for this is that some of the breaks above are in
 %% end_per_testcase, and failures there will only produce a warning,
 %% not an error - so this is to catch the error for real.
-check_all_breaks(Config) ->
+check_all_breaks(Config) when is_list(Config) ->
     break_and_continue_sup ! {done,self()},
     receive {Breaks,Continued} ->
 	    check_all_breaks(Breaks,Continued)
     end.
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
 
 check_all_breaks([{From,Case,T,Start}|Breaks],[{From,End}|Continued]) ->
     Diff = timer:now_diff(End,Start),
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl
new file mode 100644
index 0000000000..b1ae70a302
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, 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_cover_SUITE).
+
+-export([all/1, init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+-export([tc1/1, tc2/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+all(suite) ->
+    [tc1,tc2].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_Case,Config) ->
+    Dog = ?t:timetrap({minutes,10}),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case,Config) ->
+    Dog=?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+tc1(Config) when is_list(Config) ->
+    cover_helper:foo(),
+    ok.
+
+tc2(Config) when is_list(Config) ->
+    cover_helper:bar(),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
new file mode 100644
index 0000000000..6c74eb4e8a
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
@@ -0,0 +1,4 @@
+-module(cover_helper).
+-compile(export_all).
+foo() -> ok.
+bar() -> ok.
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl
index 4e89abf308..d466aa0110 100644
--- a/lib/test_server/test/test_server_test_lib.erl
+++ b/lib/test_server/test/test_server_test_lib.erl
@@ -83,14 +83,21 @@ start_slave(Config,_Level) ->
 
 post_end_per_testcase(_TC, Config, Return, State) ->
     Node = proplists:get_value(node, Config),
-    case test_server:is_cover() of
-	true ->
-	    cover:flush(Node);
-	false ->
-	    ok
+    Cover = test_server:is_cover(),
+    if Cover-> cover:flush(Node);
+       true -> ok
     end,
+    erlang:monitor_node(Node, true),
     slave:stop(Node),
-
+    receive
+	{nodedown, Node} ->
+	    if Cover -> cover:stop(Node);
+	       true -> ok
+	    end
+    after 5000 ->
+	    erlang:monitor_node(Node, false),
+	    receive {nodedown, Node} -> ok after 0 -> ok end %flush
+    end,
     {Return, State}.
 
 %% Parse an .suite log file
diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile
index 102970a59a..a24846976b 100644
--- a/lib/toolbar/src/Makefile
+++ b/lib/toolbar/src/Makefile
@@ -71,10 +71,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index 0382d3228d..aea5686ae9 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -17,6 +17,7 @@
 # %CopyrightEnd%
 #
 
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/erts/include/internal/$(TARGET)/ethread.mk
 
@@ -150,7 +151,7 @@ _create_dirs := $(shell mkdir -p $(CREATE_DIRS))
 all: $(PROGS) $(DRIVERS)
 
 $(ERTS_LIB):
-	cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
+	$(make_verbose)cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
 
 
 docs:
@@ -167,7 +168,7 @@ clean:
 #
 
 $(EMEM_OBJ_DIR)/%.o: %.c
-	$(CC) $(EMEM_CFLAGS) -o $@ -c $<
+	$(V_CC) $(EMEM_CFLAGS) -o $@ -c $<
 
 #
 # Driver targets
@@ -178,7 +179,7 @@ $(EMEM_OBJ_DIR)/%.o: %.c
 #
 
 $(BIN_DIR)/emem$(TYPEMARKER)@EXEEXT@: $(EMEM_OBJS) $(ERTS_LIB)
-	$(PRE_LD) $(LD) $(EMEM_LDFLAGS) -o $@ $(EMEM_OBJS) $(EMEM_LIBS)
+	$(ld_verbose)$(PRE_LD) $(LD) $(EMEM_LDFLAGS) -o $@ $(EMEM_OBJS) $(EMEM_LIBS)
 
 #
 # Release targets
@@ -221,7 +222,8 @@ SED_DEPEND=sed '$(SED_REPL_OBJ_DIR);$(SED_REPL_TT_DIR);$(SED_REPL_TARGET);$(SED_
 DEPEND_MK=depend.mk
 
 dep depend:
-	@echo "Generating dependency file $(DEPEND_MK)..."
+	[ $(v_p) == 0 ] && echo " GEN	"$(DEPEND_MK)
+	$(V_colon)@echo "Generating dependency file $(DEPEND_MK)..."
 	@echo "# Generated dependency rules." > $(DEPEND_MK);
 	@echo "# Do *not* edit this file; instead, run 'make depend'." \
 		>> $(DEPEND_MK);
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index e2bcd37def..2967acf310 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -997,6 +997,22 @@ behaviour.")
 	 1 'font-lock-function-name-face t))
   "Font lock keyword highlighting a function header.")
 
+(defface erlang-font-lock-exported-function-name-face
+  '((default (:inherit font-lock-function-name-face)))
+  "Face used for highlighting exported functions.")
+
+(defvar erlang-font-lock-exported-function-name-face
+  'erlang-font-lock-exported-function-name-face)
+
+(defvar erlang-inhibit-exported-function-name-face nil
+  "Inhibit separate face for exported functions")
+
+(defvar erlang-font-lock-keywords-exported-function-header
+  (list
+   (list #'erlang-match-next-exported-function
+	 1 'erlang-font-lock-exported-function-name-face t))
+  "Font lock keyword highlighting an exported function header.")
+
 (defvar erlang-font-lock-keywords-int-bifs
   (list
    (list (concat erlang-int-bif-regexp "\\s-*(")
@@ -1132,7 +1148,8 @@ There exists three levels of Font Lock keywords for Erlang:
   `erlang-font-lock-keywords-1' - Function headers and reserved keywords.
   `erlang-font-lock-keywords-2' - Bifs, guards and `single quotes'.
   `erlang-font-lock-keywords-3' - Variables, macros and records.
-  `erlang-font-lock-keywords-4' - Function names, Funs, LCs (not Atoms)
+  `erlang-font-lock-keywords-4' - Exported functions, Function names,
+                                  Funs, LCs (not Atoms).
 
 To use a specific level, please set the variable
 `font-lock-maximum-decoration' to the appropriate level.  Note that the
@@ -1174,6 +1191,7 @@ Example:
 
 (defvar erlang-font-lock-keywords-4
   (append erlang-font-lock-keywords-3
+          erlang-font-lock-keywords-exported-function-header
           erlang-font-lock-keywords-int-function-calls
 	  erlang-font-lock-keywords-ext-function-calls
 	  erlang-font-lock-keywords-fun-n
@@ -3662,6 +3680,38 @@ In the future the list may contain more elements."
 	  str)
       (store-match-data md))))
 
+(defun erlang-match-next-exported-function (max)
+  "Returns non-nil if there is an exported function in the current
+buffer between point and MAX."
+  (block nil
+    (while (and (not erlang-inhibit-exported-function-name-face)
+                (erlang-match-next-function max))
+      (when (erlang-last-match-exported-p)
+        (return (match-data))))))
+
+(defun erlang-match-next-function (max)
+  "Searches forward in current buffer for the next erlang function,
+bounded by position MAX."
+  (re-search-forward erlang-defun-prompt-regexp max 'move-point))
+
+(defun erlang-last-match-exported-p ()
+  "Returns non-nil if match-data describes the name and arity of an
+exported function."
+  (save-excursion
+    (save-match-data
+      (goto-char (match-beginning 1))
+      (erlang-function-exported-p
+       (erlang-remove-quotes (erlang-get-function-name))
+       (erlang-get-function-arity)))))
+
+(defun erlang-function-exported-p (name arity)
+  "Returns non-nil if function of name and arity is exported in current buffer."
+  (save-excursion
+    (let* ((old-match-data (match-data))
+           (exports        (erlang-get-export)))
+      (store-match-data old-match-data)
+      (member (cons name arity) exports))))
+
 
 ;;; Check module name
 
diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
index abe1389771..bdd0cdce25 100644
--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
@@ -94,10 +94,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 10f14b0a49..680c1781ca 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -705,7 +705,9 @@ main_process_loop(State) ->
 	    remote_collect('_',Nodes,true),
 	    reply(From, ok),
 	    Nodes1 = State#main_state.nodes--Nodes,
-	    main_process_loop(State#main_state{nodes=Nodes1});
+	    LostNodes1 = State#main_state.lost_nodes--Nodes,
+	    main_process_loop(State#main_state{nodes=Nodes1,
+					       lost_nodes=LostNodes1});
 
 	{From, {flush,Nodes}} ->
 	    remote_collect('_',Nodes,false),
@@ -792,8 +794,15 @@ main_process_loop(State) ->
 	
 	{'DOWN', _MRef, process, {?SERVER,Node}, _Info} ->
 	    %% A remote cover_server is down, mark as lost
-	    Nodes = State#main_state.nodes--[Node],
-	    Lost = [Node|State#main_state.lost_nodes],
+	    {Nodes,Lost} =
+		case lists:member(Node,State#main_state.nodes) of
+		    true ->
+			N = State#main_state.nodes--[Node],
+			L = [Node|State#main_state.lost_nodes],
+			{N,L};
+		    false -> % node stopped
+			{State#main_state.nodes,State#main_state.lost_nodes}
+		end,
 	    main_process_loop(State#main_state{nodes=Nodes,lost_nodes=Lost});
 
 	{nodeup,Node} ->
@@ -1510,12 +1519,6 @@ aux_var(Vars, N) ->
 %% This way we will be able to exclude functions defined in include files.
 munge({function,0,module_info,_Arity,_Clauses},_Vars,_MainFile,_Switch) ->
     ignore; % module_info will be added again when the forms are recompiled
-munge(Form={function,_,'MNEMOSYNE QUERY',_,_},Vars,_MainFile,Switch) ->
-    {Form,Vars,Switch};                 % No bumps in Mnemosyne code.
-munge(Form={function,_,'MNEMOSYNE RULE',_,_},Vars,_MainFile,Switch) ->
-    {Form,Vars,Switch};
-munge(Form={function,_,'MNEMOSYNE RECFUNDEF',_,_},Vars,_MainFile,Switch) ->
-    {Form,Vars,Switch};
 munge({function,Line,Function,Arity,Clauses},Vars,_MainFile,on) ->
     Vars2 = Vars#vars{function=Function,
 		      arity=Arity,
@@ -2087,30 +2090,40 @@ do_analyse_to_file(Module, OutFile, ErlFile, HTML) ->
 	    case file:open(OutFile, [write]) of
 		{ok, OutFd} ->
 		    if HTML -> 
-			    io:format(OutFd,
-				      "<html>\n"
-				      "<head><title>~s</title></head>"
-				      "<body bgcolor=white text=black>\n"
-				      "<pre>\n",
-				      [OutFile]);
+                           Encoding = encoding(ErlFile),
+                           Header =
+                               ["<!DOCTYPE HTML PUBLIC "
+                                "\"-//W3C//DTD HTML 3.2 Final//EN\">\n"
+                                "<html>\n"
+                                "<head>\n"
+                                "<meta http-equiv=\"Content-Type\""
+                                " content=\"text/html; charset=",
+                                Encoding,"\"/>\n"
+                                "<title>",OutFile,"</title>\n"
+                                "</head>"
+                                "<body style='background-color: white;"
+                                " color: black'>\n"
+                                "<pre>\n"],
+                           file:write(OutFd,Header);
 		       true -> ok
 		    end,
 		    
 		    %% Write some initial information to the output file
 		    {{Y,Mo,D},{H,Mi,S}} = calendar:local_time(),
-		    io:format(OutFd, "File generated from ~s by COVER "
-			             "~p-~s-~s at ~s:~s:~s~n",
-			      [ErlFile,
-			       Y,
-			       string:right(integer_to_list(Mo), 2, $0),
-			       string:right(integer_to_list(D),  2, $0),
-			       string:right(integer_to_list(H),  2, $0),
-			       string:right(integer_to_list(Mi), 2, $0),
-			       string:right(integer_to_list(S),  2, $0)]),
-		    io:format(OutFd, "~n"
-			             "**************************************"
-			             "**************************************"
-			             "~n~n", []),
+                   Timestamp =
+                       io_lib:format("~p-~s-~s at ~s:~s:~s",
+                                     [Y,
+                                      string:right(integer_to_list(Mo), 2, $0),
+                                      string:right(integer_to_list(D),  2, $0),
+                                      string:right(integer_to_list(H),  2, $0),
+                                      string:right(integer_to_list(Mi), 2, $0),
+                                      string:right(integer_to_list(S),  2, $0)]),
+                    file:write(OutFd,
+                               ["File generated from ",ErlFile," by COVER ",
+                                Timestamp,"\n\n"
+                                "**************************************"
+                                "**************************************"
+                                "\n\n"]),
 
 		    print_lines(Module, InFd, OutFd, 1, HTML),
 		    
@@ -2405,3 +2418,20 @@ pmap(Fun, [], [], Limit, Cnt, Acc) ->
 	{'DOWN', _Ref, process, X, _} when is_pid(X) ->
 	    pmap(Fun, [], [], Limit, Cnt - 1, Acc)
     end.
+
+%%%-----------------------------------------------------------------
+%%% Read encoding from source file
+encoding(File) ->
+    Encoding =
+       case epp:read_encoding(File) of
+           none ->
+               epp:default_encoding();
+           E ->
+               E
+       end,
+    html_encoding(Encoding).
+
+html_encoding(latin1) ->
+    "iso-8859-1";
+html_encoding(utf8) ->
+    "utf-8".
diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index 989a661b75..70d62307c8 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
 %%
 %% The 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/tools/src/xref_reader.erl b/lib/tools/src/xref_reader.erl
index 92f0c45c7b..2fcc2c503c 100644
--- a/lib/tools/src/xref_reader.erl
+++ b/lib/tools/src/xref_reader.erl
@@ -80,12 +80,6 @@ form({attribute, Line, xref, Calls}, S) -> % experimental
     attr(Calls, Line, M, Fun, L, X, B, S);
 form({attribute, _Line, _Attr, _Val}, S) ->
     S;
-form({function, 0, 'MNEMOSYNE RULE', 1, _Clauses}, S) ->
-    S;
-form({function, 0, 'MNEMOSYNE QUERY', 2, _Clauses}, S) ->
-    S;
-form({function, 0, 'MNEMOSYNE RECFUNDEF', 1, _Clauses}, S) ->
-    S;
 form({function, 0, module_info, 0, _Clauses}, S) ->
     S;
 form({function, 0, module_info, 1, _Clauses}, S) ->
@@ -331,9 +325,6 @@ handle_call(Locality, Module, Name, Arity, Line, S) ->
 	    handle_call(Locality, To, Line, S, false)
     end.
 
-handle_call(_Locality, {_, 'MNEMOSYNE RULE',1}, _Line, S, _) -> S;
-handle_call(_Locality, {_, 'MNEMOSYNE QUERY', 2}, _Line, S, _) -> S;
-handle_call(_Locality, {_, 'MNEMOSYNE RECFUNDEF',1}, _Line, S, _) -> S;
 handle_call(Locality, To0, Line, S, IsUnres) ->
     From = S#xrefr.function,
     To = adjust_arity(S, To0),
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 3bf1b44af8..57260a3869 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -23,7 +23,9 @@
 	 init_per_group/2,end_per_group/2]).
 
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
-	 distribution/1, reconnect/1, die_and_reconnect/1, export_import/1,
+	 distribution/1, reconnect/1, die_and_reconnect/1,
+	 dont_reconnect_after_stop/1, stop_node_after_disconnect/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]).
 
@@ -47,6 +49,7 @@ all() ->
 	undefined ->
 	    [start, compile, analyse, misc, stop,
 	     distribution, reconnect, die_and_reconnect,
+	     dont_reconnect_after_stop, stop_node_after_disconnect,
 	     export_import, otp_5031, eif, otp_5305, otp_5418,
 	     otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
 	     otp_8340];
@@ -86,8 +89,11 @@ init_per_testcase(TC, Config) when TC =:= misc;
 init_per_testcase(_TestCase, Config) ->
     Config.
 
-end_per_testcase(_TestCase, _Config) ->
-    %cover:stop(),
+end_per_testcase(TestCase, _Config) ->
+    case lists:member(TestCase,[start,compile,analyse,misc]) of
+	true -> ok;
+	false -> cover:stop()
+    end,
     ok.
 
 start(suite) -> [];
@@ -447,8 +453,8 @@ reconnect(Config) ->
 
     %% Disconnect and check that node is removed from main cover node
     net_kernel:disconnect(N1),
+    timer:sleep(500), % allow some to detect disconnect and for f:f2() call
     [] = cover:which_nodes(),
-    timer:sleep(500), % allow some time for the f:f2() call
 
     %% Do some add one module (b) and remove one module (a)
     code:purge(a),
@@ -520,6 +526,94 @@ die_and_reconnect(Config) ->
     ?t:stop_node(N1),
     ok.
 
+%% Test that a stopped node is not marked as lost, i.e. that it is not
+%% reconnected if it is restarted (OTP-10638)
+dont_reconnect_after_stop(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ok = file:set_cwd(DataDir),
+
+    {ok,f} = compile:file(f),
+
+    NodeName = cover_SUITE_dont_reconnect_after_stop,
+    {ok,N1} = ?t:start_node(NodeName,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    {ok,f} = cover:compile(f),
+    {ok,[N1]} = cover:start(nodes()),
+
+    %% A call to check later
+    rpc:call(N1,f,f1,[]),
+
+    %% Stop cover on the node, then terminate the node
+    cover:stop(N1),
+    rpc:call(N1,erlang,halt,[]),
+    [] = cover:which_nodes(),
+
+    check_f_calls(1,0),
+
+    %% Restart the node and check that cover does not reconnect
+    {ok,N1} = ?t:start_node(NodeName,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    timer:sleep(300),
+    [] = cover:which_nodes(),
+    Beam = rpc:call(N1,code,which,[f]),
+    false = (Beam==cover_compiled),
+
+    %% One more call...
+    rpc:call(N1,f,f1,[]),
+    cover:flush(N1),
+
+    %% Ensure that the last call is not counted
+    check_f_calls(1,0),
+
+    cover:stop(),
+    ?t:stop_node(N1),
+    ok.
+
+%% Test that a node which is stopped while it is marked as lost is not
+%% reconnected if it is restarted (OTP-10638)
+stop_node_after_disconnect(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ok = file:set_cwd(DataDir),
+
+    {ok,f} = compile:file(f),
+
+    NodeName = cover_SUITE_stop_node_after_disconnect,
+    {ok,N1} = ?t:start_node(NodeName,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    {ok,f} = cover:compile(f),
+    {ok,[N1]} = cover:start(nodes()),
+
+    %% A call to check later
+    rpc:call(N1,f,f1,[]),
+
+    %% Flush the node, then terminate the node to make it marked as lost
+    cover:flush(N1),
+    rpc:call(N1,erlang,halt,[]),
+
+    check_f_calls(1,0),
+
+    %% Stop cover on node
+    cover:stop(N1),
+
+    %% Restart the node and check that cover does not reconnect
+    {ok,N1} = ?t:start_node(NodeName,peer,
+			    [{args," -pa " ++ DataDir},{start_cover,false}]),
+    timer:sleep(300),
+    [] = cover:which_nodes(),
+    Beam = rpc:call(N1,code,which,[f]),
+    false = (Beam==cover_compiled),
+
+    %% One more call...
+    rpc:call(N1,f,f1,[]),
+    cover:flush(N1),
+
+    %% Ensure that the last call is not counted
+    check_f_calls(1,0),
+
+    cover:stop(),
+    ?t:stop_node(N1),
+    ok.
+
 export_import(suite) -> [];
 export_import(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
@@ -908,7 +1002,7 @@ otp_8270(Config) when is_list(Config) ->
     ok.
 
 otp_8273(doc) ->
-    ["OTP-8270. Bug."];
+    ["OTP-8273. Bug."];
 otp_8273(suite) -> [];
 otp_8273(Config) when is_list(Config) ->
     Test = <<"-module(t).
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index fd3e111d8d..dc06678b8e 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -46,7 +47,7 @@
 -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, fun_mfa_r14/1,
+         fun_mfa/1, fun_mfa_r14/1,
 	 fun_mfa_vars/1, qlc/1]).
 
 -export([
@@ -82,7 +83,7 @@ groups() ->
        modules]},
      {files, [],
       [add, default, info, lib, read, read2, remove, replace,
-       update, deprecated, trycatch, abstract_modules, fun_mfa,
+       update, deprecated, trycatch, fun_mfa,
        fun_mfa_r14, fun_mfa_vars, qlc]},
      {analyses, [],
       [analyze, basic, md, q, variables, unused_locals]},
@@ -1668,64 +1669,6 @@ trycatch(Conf) when is_list(Conf) ->
     ok.
 
 
-abstract_modules(suite) -> [];
-abstract_modules(doc) -> ["OTP-5520: Abstract (parameterized) modules."];
-abstract_modules(Conf) when is_list(Conf) ->
-    Dir = ?copydir,
-    File = fname(Dir, "absmod.erl"),
-    MFile = fname(Dir, "absmod"),
-    Beam = fname(Dir, "absmod.beam"),
-    Test = <<"-module(param, [A, B]).
-
-              -export([args/1]).
-
-              args(C) ->
-                  X = local(C),
-                  Y = THIS:new(), % undef
-                  Z = new(A, B),
-                  {X, Y, Z}.
-
-              local(C) ->
-                  module_info(C).
-             ">>,
-
-    ?line ok = file:write_file(File, Test),
-
-    %% The compiler will no longer allow us to have a mismatch between
-    %% the module name and the output file, so we must use a trick.
-    ?line {ok, param, BeamCode} = compile:file(File, [binary,debug_info]),
-    ?line ok = file:write_file(Beam, BeamCode),
-
-    ?line {ok, _} = xref:start(s),
-    ?line {ok, param} = xref:add_module(s, MFile, {warnings,false}),
-    A = param,
-    ?line {ok, [{{{A,args,1},{'$M_EXPR',new,0}},[7]},
-                {{{A,args,1},{A,local,1}},[6]},
-                {{{A,args,1},{A,new,2}},[8]},
-                {{{A,local,1},{A,module_info,1}},[12]},
-                {{{param,new,2},{param,instance,2}},[0]}]} =
-        xref:q(s, "(Lin) E"),
-    ?line {ok,[{param,args,1},
-               {param,instance,2},
-               {param,local,1},
-               {param,module_info,1},
-               {param,new,2}]} = xref:q(s, "F"),
-
-    ?line ok = check_state(s),
-    ?line xref:stop(s),
-
-    ?line {ok, _} = xref:start(s, {xref_mode, modules}),
-    ?line {ok, param} = xref:add_module(s, MFile),
-    ?line {ok,[{param,args,1},
-               {param,instance,2},
-               {param,new,2}]} = xref:q(s, "X"),
-    ?line ok = check_state(s),
-    ?line xref:stop(s),
-
-    ?line ok = file:delete(File),
-    ?line ok = file:delete(Beam),
-    ok.
-
 fun_mfa(suite) -> [];
 fun_mfa(doc) -> ["OTP-5653: fun M:F/A."];
 fun_mfa(Conf) when is_list(Conf) ->
@@ -2521,7 +2464,7 @@ otp_10192(doc) ->
 otp_10192(Conf) when is_list(Conf) ->
     PrivDir = ?privdir,
     {ok, _Pid} = xref:start(s),
-    Dir = filename:join(PrivDir, "�"),
+    Dir = filename:join(PrivDir, "ä"),
     ok = file:make_dir(Dir),
     {ok, []} = xref:add_directory(s, Dir),
     xref:stop(s),
diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile
index da1713e156..3d680c1eaf 100644
--- a/lib/tv/src/Makefile
+++ b/lib/tv/src/Makefile
@@ -109,10 +109,10 @@ clean:
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 docs:
 
diff --git a/lib/tv/src/tv_main.hrl b/lib/tv/src/tv_main.hrl
index 28329ca83c..06b405ac1f 100644
--- a/lib/tv/src/tv_main.hrl
+++ b/lib/tv/src/tv_main.hrl
@@ -131,7 +131,6 @@
 			ir_WstringDef,
 			lmcounter,
 			locks, 
-			mnemosyne_tmp,
 			pg2_table,
 			queue,
 			snmp_agent_table,
diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
index 1f94d8fdc8..13af466755 100644
--- a/lib/typer/src/Makefile
+++ b/lib/typer/src/Makefile
@@ -82,13 +82,13 @@ clean:
 # ----------------------------------------------------
 
 $(EBIN)/typer.$(EMULATOR): typer.erl ../vsn.mk Makefile
-	erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) typer.erl
+	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) typer.erl
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ---------------------------------------------------------------------
 # dependencies
diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
index 783ffad79a..f28c777240 100644
--- a/lib/webtool/src/Makefile
+++ b/lib/webtool/src/Makefile
@@ -76,10 +76,10 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/wx/.gitignore b/lib/wx/.gitignore
index 0fa427bfe5..960c76a779 100644
--- a/lib/wx/.gitignore
+++ b/lib/wx/.gitignore
@@ -1,4 +1,5 @@
 test_log_*
 wx_test_case_info
-api_gen/gl_man?
-doc/html/*
\ No newline at end of file
+doc/html/*
+%% Don't delete links to man src when git clean -dfX
+%% api_gen/gl_man?
diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4
index 9578cd35c4..918e30a886 100644
--- a/lib/wx/aclocal.m4
+++ b/lib/wx/aclocal.m4
@@ -1849,6 +1849,31 @@ case $erl_gethrvtime in
 esac
 ])dnl
 
+dnl ----------------------------------------------------------------------
+dnl
+dnl LM_TRY_ENABLE_CFLAG
+dnl
+dnl
+dnl Tries a CFLAG and sees if it can be enabled without compiler errors
+dnl $1: textual cflag to add
+dnl $2: variable to store the modified CFLAG in
+dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+dnl
+dnl
+AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
+    saved_CFLAGS=$CFLAGS;
+    CFLAGS="$1 $$2";
+    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
+    CFLAGS=$saved_CFLAGS;
+    if test "X$can_enable_flag" = "Xtrue"; then
+        AC_MSG_RESULT([yes])
+        AS_VAR_SET($2, "$1 $$2")
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
 dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
 dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 4638d4c7ea..2ba1c6e16f 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,8 +49,10 @@ get_taylor_made(Str, Name) ->
 	   [dotall, {capture, all_but_first, list}]).
 
 open_write(File) ->
+    open_write(File, []).
+open_write(File, Opts) ->
     %% io:format("Generating ~s~n",[File]),
-    {ok, Fd} = file:open(File++".temp", [write]),
+    {ok, Fd} = file:open(File++".temp", [write|Opts]),
     put(current_file, {Fd,File}).
 
 
@@ -187,6 +189,8 @@ replace_and_remove([$| | R], Acc) ->
     replace_and_remove(R, ["|"|Acc]);
 replace_and_remove([$* | R], Acc) ->
     replace_and_remove(R, ["*"|Acc]);
+replace_and_remove([$+ | R], Acc) ->
+    replace_and_remove(R, ["+"|Acc]);
 replace_and_remove([$& | R], Acc) ->
     replace_and_remove(R, [$&|Acc]);
 replace_and_remove([$<,$< | R], Acc) ->
@@ -221,7 +225,7 @@ erl_copyright() ->
     w("%%~n",[]),
     w("%% %CopyrightBegin%~n",[]),
     w("%%~n",[]),
-    w("%% Copyright Ericsson AB ~p-2012. All Rights Reserved.~n",
+    w("%% Copyright Ericsson AB ~p-2013. All Rights Reserved.~n",
       [StartYear]),
     w("%%~n",[]),
     w("%% The contents of this file are subject to the Erlang Public License,~n",[]),
@@ -241,7 +245,7 @@ c_copyright() ->
     w("/*~n",[]),
     w(" * %CopyrightBegin%~n",[]),
     w(" *~n",[]),
-    w(" * Copyright Ericsson AB 2008-2012. All Rights Reserved.~n",[]),
+    w(" * Copyright Ericsson AB 2008-2013. All Rights Reserved.~n",[]),
     w(" *~n",[]),
     w(" * The contents of this file are subject to the Erlang Public License,~n",[]),
     w(" * Version 1.1, (the \"License\"); you may not use this file except in~n",[]),
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 331ba32ba4..ea967c958f 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -185,11 +185,11 @@ parse_define([#xmlElement{name=name,content=[#xmlText{value="WINGDIAPI"++_}]}|_]
     throw(skip);
 parse_define([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], Def, Os) ->
     parse_define(R, Def#def{name=Name}, Os);
-parse_define([#xmlElement{name=initializer,content=[#xmlText{value=V}]}|_],Def,_Os) ->
-    Val0 = string:strip(V),
-    try 
+parse_define([#xmlElement{name=initializer,content=Contents}|_R],Def,_Os) ->
+    Val0 = extract_def2(Contents),
+    try
 	case Val0 of
-	    "0x" ++ Val1 -> 
+	    "0x" ++ Val1 ->
 		_ = http_util:hexlist_to_integer(Val1),
 		Def#def{val=Val1, type=hex};
 	    _ ->
@@ -207,6 +207,23 @@ parse_define([_|R], D, Opts) ->
 parse_define([], D, _Opts) ->
     D.
 
+extract_def2([#xmlText{value=Val}|R]) ->
+    strip_comment(string:strip(Val)) ++ extract_def2(R);
+extract_def2([#xmlElement{content=Cs}|R]) ->
+    extract_def2(Cs) ++ extract_def2(R);
+extract_def2([]) -> [].
+
+strip_comment("/*" ++ Rest) ->
+    strip_comment_until_end(Rest);
+strip_comment("//" ++ _) -> [];
+strip_comment([H|R]) -> [H | strip_comment(R)];
+strip_comment([]) -> [].
+
+strip_comment_until_end("*/" ++ Rest) ->
+    strip_comment(Rest);
+strip_comment_until_end([_|R]) ->
+    strip_comment_until_end(R).
+
 parse_func(Xml, Opts) ->
     {Func,_} = foldl(fun(X,Acc) -> parse_func(X,Acc,Opts) end, {#func{},1}, Xml),
     put(current_func, Func#func.name),
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index 25f89e4ad4..446521098e 100644
--- a/lib/wx/api_gen/gl_gen_erl.erl
+++ b/lib/wx/api_gen/gl_gen_erl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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 @@
 
 -import(lists, [foldl/3,foldr/3,reverse/1, keysearch/3, map/2, filter/2, max/1]).
 -import(gen_util, [lowercase/1, lowercase_all/1, uppercase/1, uppercase_all/1,
-		   open_write/1, close/0, erl_copyright/0, w/2,
+		   open_write/1, open_write/2, close/0, erl_copyright/0, w/2,
 		   args/3, args/4, strip_name/2]).
 
 gl_defines(Defs) ->
@@ -90,7 +90,8 @@ types() ->
     ].
 
 gl_api(Fs) ->
-    open_write("../src/gen/gl.erl"),
+    open_write("../src/gen/gl.erl", [{encoding,utf8}]),
+    w("%% -*- coding: utf-8 -*-~n~n", []),
     erl_copyright(),
     w("~n%% OPENGL API~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -148,7 +149,8 @@ gl_api(Fs) ->
     ok.
 
 glu_api(Fs) ->
-    open_write("../src/gen/glu.erl"),
+    open_write("../src/gen/glu.erl", [{encoding,utf8}]),
+    w("%% -*- coding: utf-8 -*-~n~n", []),
     erl_copyright(),
     w("~n%% OPENGL UTILITY API~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -330,7 +332,7 @@ format_doc([{constant, Const}|Rest], Count) ->
     w("`?~s'", [Const]),
     format_doc(Rest, Count-length(Const)-8);
 format_doc([{emphasis, Const}|Rest], Count) ->
-    w("`~s'", [Const]),
+    w("`~ts'", [Const]),
     format_doc(Rest, Count-length(Const)-7);
 format_doc([{function, Func}|Rest], Count) ->
     case Func of
@@ -377,7 +379,7 @@ format_doc([{fenced, Open, Close, Eq}|Rest], Count) ->
     format_doc(Rest, Count);
 
 format_doc([{code, Code}|Rest], Count) ->
-    w("``~s''", [Code]),
+    w("``~ts''", [Code]),
     format_doc(Rest, Count-length(Code)-7);
 
 format_doc([para|Rest], _Count) ->
@@ -387,10 +389,10 @@ format_doc([break|Rest], _Count) ->
     w("<br />~n%% ", []),
     format_doc(Rest, ?LINE_LEN);
 format_doc([{purpose, Purpose}, para | Doc], _Count) ->
-    w("%% @doc ~s~n%%~n%% ", [uppercase(Purpose)]),
+    w("%% @doc ~ts~n%%~n%% ", [uppercase(Purpose)]),
     format_doc(Doc, ?LINE_LEN);
 format_doc([{purpose, Purpose} | Doc], _Count) ->
-    w("%% @doc ~s~n%%~n%% ", [Purpose]),
+    w("%% @doc ~ts~n%%~n%% ", [Purpose]),
     format_doc(Doc, ?LINE_LEN);
 format_doc([listentry|Rest], _Count) ->
     w("~n%%~n%% ", []),
@@ -398,11 +400,11 @@ format_doc([listentry|Rest], _Count) ->
 format_doc([Str|Rest], Count) ->
     case length(Str) of
 	Len when Len < Count ->
-	    w("~s", [Str]),
+	    w("~ts", [Str]),
 	    format_doc(Rest, Count-Len);
 	_ ->
 	    {Str1, Str2} = split(Str, Count, []),
-	    w("~s~n%% ", [Str1]),
+	    w("~ts~n%% ", [Str1]),
 	    format_doc([Str2|Rest], ?LINE_LEN)
     end;
 format_doc([], _) -> ok.
diff --git a/lib/wx/api_gen/gl_scan_doc.erl b/lib/wx/api_gen/gl_scan_doc.erl
index fc7b7cf275..80b4826a30 100644
--- a/lib/wx/api_gen/gl_scan_doc.erl
+++ b/lib/wx/api_gen/gl_scan_doc.erl
@@ -2,7 +2,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -56,8 +56,10 @@ gen_output({characters, String0}, #state{gen_output=true, type=Type, str=Str} =
 		      mi -> case hd(Str) of
 				"/" -> String;
 				"*" -> String;
+				[215] -> String;
 				"+" -> String;
 				"-" -> String;
+				"=" -> String;
 				{fenced,_,_} -> String;
 				_ ->
 				    [$ |String]
@@ -268,7 +270,9 @@ fix_str([$<|Str]) ->
 fix_str([$>|Str]) ->
     [$&,$g,$t,$;|fix_str(Str)];
 fix_str("&times;"++Str) ->
-    [$*|fix_str(Str)];
+    [215|fix_str(Str)];
+%% fix_str([215|Str]) ->
+%%     [$*|fix_str(Str)];
 fix_str("&Prime;"++Str) ->
     [$"|fix_str(Str)];
 fix_str("&CenterDot;"++Str) ->
@@ -277,10 +281,12 @@ fix_str("&af;"++Str) ->
     fix_str(Str);
 fix_str("&it;"++Str) ->
     [$ |fix_str(Str)];
+fix_str("&nbsp;"++Str) ->
+    [$ |fix_str(Str)];
 fix_str([$&|Str]) ->
     [$&,$a,$m,$p,$; |fix_str(Str)];
-fix_str([C|Str]) when C > 255 ->
-    fix_str(Str);
+%% fix_str([C|Str]) when C > 255 ->
+%%     fix_str(Str);
 fix_str([C|Str]) ->
     [C|fix_str(Str)];
 fix_str([]) -> [].
diff --git a/lib/wx/api_gen/wx_extra/wxPrintout.erl b/lib/wx/api_gen/wx_extra/wxPrintout.erl
index be8f2e2fa5..1dfd86ec62 100644
--- a/lib/wx/api_gen/wx_extra/wxPrintout.erl
+++ b/lib/wx/api_gen/wx_extra/wxPrintout.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %% 
 %% The 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,8 @@ new(Title, OnPrintPage) ->
 %%   <pre>OnBeginDocument(This,StartPage,EndPage) -> boolean()  </pre>
 %%   <pre>OnEndDocument(This) -> term()  </pre>
 %%   <pre>HasPage(This,Page)} -> boolean()   </pre>
-%%   <pre>GetPageInfo(This) -> {MinPage:.integer(), MaxPage::integer(), PageFrom::integer(), PageTo::integer()}  </pre>
+%%   <pre>GetPageInfo(This) -> {MinPage::integer(), MaxPage::integer(),
+%%                              PageFrom::integer(), PageTo::integer()}  </pre>
 %%  The <b>This</b> argument is the wxPrintout object reference to this object
 %%  <br /> NOTE: The callbacks may not call other processes. 
 new(Title, OnPrintPage, Opts) when is_list(Title), is_function(OnPrintPage), is_list(Opts) ->
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index 7f85151d03..2eb9d9d33d 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -103,7 +103,12 @@ mangle_info({class,CN,P,O,FL}) ->
     Event  = get_value(event,O, false),
     Acc    = get_value(acc, O, []),
     {Fs,Fopts} = foldr(fun(FWO={F,FO},{Fl,Fopt}) when is_list(FO) ->
-			       {[F|Fl],[FWO|Fopt]};
+			       Opt = case F of
+					 {Name, ArgLen} when is_integer(ArgLen) ->
+					     {Name, FO};
+					 _ -> FWO
+				     end,
+			       {[F|Fl],[Opt|Fopt]};
 			  (F,{Fl,Fopt}) ->
 			       {[F|Fl], Fopt}
 		       end, {[],[]}, FL),
@@ -421,22 +426,30 @@ select_member(Several, #class{name=Class,file=Orig}, Defs0, Opts) ->
 
 parse_member(Data,MType,Virtual,Opts = #hs{fopt=Fopts}) ->
     Parse  = fun(Con,A) -> parse_member2(Con,Opts,A) end,
-    Method = #method{name=MName,params=PS0} = 
+    Method = #method{name=MName,params=PS0} =
 	foldl(Parse, #method{method_type=MType, virtual=Virtual}, Data),
     %% Skip motif name's if it's last and optional
     PS2 = case PS0 of %% Backward order..
-	      [#param{name="name",def=Def,type=#type{name="wxString"}}|PS1] 
-	      when Def =/= none -> 
+	      [#param{name="name",def=Def,type=#type{name="wxString"}}|PS1]
+	      when Def =/= none ->
 		  PS1;
 	      _ ->
 		  PS0
 	  end,
     Sz = length(PS2),
-    PS = map(fun(P=#param{name=PName}) -> 
+    PS = map(fun(P=#param{name=PName}) ->
 		     patch_param(MName,{Sz,PName},P,Fopts)
 	     end, PS2),
-    Alias = find_erl_alias_name(MName,PS,Fopts),	    
-    Method#method{params=PS, alias=Alias}.
+    Alias = find_erl_alias_name(MName,PS,Fopts),
+    FOpts = case gb_trees:lookup(MName, Fopts) of
+		{value, FuncO} when is_list(FuncO) ->
+		    case lists:keyfind({func,Sz}, 1, FuncO) of
+			false -> FuncO;
+			{_, FuncNO} -> FuncNO
+		    end;
+		_ -> []
+	    end,
+    Method#method{params=PS, alias=Alias, opts=FOpts}.
 
 find_erl_alias_name(MName,Ps,Fopts) ->
     case gb_trees:lookup(MName, Fopts) of
@@ -527,7 +540,7 @@ add_param2(P=#param{name=Name},#hs{fopt=FOpt},M0=#method{name=MName,params=Ps})
 	    M0#method{params=[Patched|Ps]}
     end.
 
-patch_param(Method, Name, P, Opt) ->    
+patch_param(Method, Name, P, Opt) ->
     case gb_trees:lookup(Method,Opt) of
 	none -> P;
 	{value,NoArg} when is_integer(NoArg) -> P;
@@ -560,11 +573,14 @@ handle_param_opt(both, P) -> P#param{in=both};
 handle_param_opt({def,Def},P) -> P#param{def=Def};
 handle_param_opt({type,Type}, P=#param{type=T})  ->  P#param{type=T#type{name=Type}};
 handle_param_opt({single,Opt}, P=#param{type=T}) ->  P#param{type=T#type{single=Opt}};
+handle_param_opt({base,Enum={enum,Type}},  P=#param{type=T}) ->   P#param{type=T#type{base=Enum, name=Type}};
 handle_param_opt({base,Opt},  P=#param{type=T}) ->   P#param{type=T#type{base=Opt}};
 handle_param_opt({c_only,Opt},P) -> P#param{where=c, alt=Opt};
-handle_param_opt({ref, pointer}, P=#param{type=T}) ->   
+handle_param_opt({ref, pointer}, P=#param{type=T}) ->
     P#param{type=T#type{by_val=false,ref={pointer, 1}}};
-handle_param_opt({mod,Mods}, P=#param{type=T=#type{mod=Mods0}}) ->  
+handle_param_opt({by_val, true}, P=#param{type=T}) ->
+    P#param{type=T#type{by_val=true}};
+handle_param_opt({mod,Mods}, P=#param{type=T=#type{mod=Mods0}}) ->
     P#param{type=T#type{mod=Mods++Mods0}}.
 
 get_opt(Opt, Method, Sz, Opts) -> 
@@ -654,6 +670,12 @@ extract_type_info(#xmlElement{name=ref,attributes=As,content=[#xmlText{value=V}]
     {value, #xmlAttribute{value = Kind}} = keysearch(kindref,#xmlAttribute.name,As),
     {reverse(foldl(fun extract_type_info2/2, [], string:tokens(V, " "))) ++ Acc,
      {Kind,Refid}};
+extract_type_info(#xmlElement{name=ref,attributes=As,content=[#xmlText{value=V}]},
+		  {Acc,_}) ->
+    {value, #xmlAttribute{value = Refid}} = keysearch(refid,#xmlAttribute.name,As),
+    {value, #xmlAttribute{value = Kind}} = keysearch(kindref,#xmlAttribute.name,As),
+    {reverse(foldl(fun extract_type_info2/2, [], string:tokens(V, " "))) ++ Acc,
+     {Kind,Refid}};
 extract_type_info(What,Acc) ->
     ?error({parse_error,What,Acc}).
 
@@ -704,11 +726,9 @@ parse_type2([N="wxTextPos"|R],Info,Opts,T) ->        %%long
     parse_type2(R,Info,Opts,T#type{name=N,base=int});
 parse_type2([N="wxPrintQuality"|R],Info,Opts,T) ->
     parse_type2(R,Info,Opts,T#type{name=N,base=int});
-parse_type2([N="wxPaperSize"|R],Info,Opts,T) ->
-    parse_type2(R,Info,Opts,T#type{name=N,base=int});
 parse_type2(["wxDataFormat"|_R],_Info,_Opts,T) ->
     %% Hack Hack
-    T#type{name="wxDataFormatId",base=int};
+    T#type{name="wxDataFormatId",base={enum,"wxDataFormatId"}};
 parse_type2([N="wxArrayInt"|R],Info,Opts,T) -> 
     parse_type2(R,Info,Opts,T#type{name=N,base=int,single=array});
 parse_type2([N="wxArrayDouble"|R],Info,Opts,T) -> 
@@ -1251,7 +1271,7 @@ parse_enums([File|Files], Parsed) ->
     case gb_sets:is_member(File,Parsed) of
 	false ->
 	    FileName = filename:join(["wx_xml",File ++ "_8h.xml"]),
-%%	    io:format("Parse Enums in ~s ~n", [FileName]),
+	    %%io:format("Parse Enums in ~s ~n", [FileName]),
 	    case xmerl_scan:file(FileName, [{space, normalize}]) of 
 		{error, enoent} ->
 		    parse_enums(Files, gb_sets:add(File,Parsed));
@@ -1318,41 +1338,37 @@ extract_enum2([], N, _Id, Acc) ->
 
 extract_enum3([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], Id, Acc) ->
     case lists:keymember(Name, 1, Acc) of
-	true ->  %% Doxygen double includes some defs. 
+	true ->  %% Doxygen double includes some defs.
 	    {Acc,Id};
 	false ->
 	    case Id of
-		This = {Str,Num} -> 
+		This = {Str,Num} ->
 		    extract_enum3(R, {Str, Num+1}, [{Name,This}|Acc]);
 		Val ->
 		    extract_enum3(R, Val+1, [{Name,Val}|Acc])
 	    end
     end;
 
-extract_enum3([#xmlElement{name=initializer,
-			   content=Cs=[#xmlText{}|_]}|_],_Id,[{Name,_}|Acc]) ->
-
-    String = lists:append([string:strip(C#xmlText.value) || C <- Cs]),
-    
+extract_enum3([#xmlElement{name=initializer,content=Cs}|_],_Id,[{Name,_}|Acc]) ->
+    String = extract_def2(Cs),
     Val0 = gen_util:tokens(String,"<& "),
-            
-    try 
+    try
 	case Val0 of
-	    ["0x" ++ Val1] -> 
+	    ["0x" ++ Val1] ->
 		Val = http_util:hexlist_to_integer(Val1),
 		{[{Name, Val}|Acc], Val+1};
-	    [Single] ->
-		Val = list_to_integer(Single),
-		{[{Name, Val}|Acc], Val+1};
 	    ["1", "<<", Shift] ->
 		Val = 1 bsl list_to_integer(Shift),
 		{[{Name, Val}|Acc], Val+1};
-	    [_Str, "+", _What] ->
-		Val = lists:append(Val0),
-		{[{Name, {Val, 0}}|Acc], {Val,1}};	    
-	    _What ->
-		%% io:format("~p Name ~p ~p~n",[?LINE, Name, Val0]),
-		throw(below)		
+	    [Str, "+", What] ->
+		Val = list_to_integer(What),
+		{[{Name, {Str, Val}}|Acc], {Str,Val+1}};
+	    [Single] ->
+		Val = list_to_integer(Single),
+		{[{Name, Val}|Acc], Val+1};
+	    _ ->
+		%% io:format("~p Name ~p ~p ~p~n",[?LINE, Name, Val0, String]),
+		throw(below)
 	end
     catch _:_ ->
 	    {[{Name,{String,0}}|Acc], {String,1}}
@@ -1372,7 +1388,7 @@ extract_defs(Defs, File) ->
     end.
 
 extract_defs2(#xmlElement{name=memberdef,content=C},{Acc,Skip}) ->
-    try 
+    try
 	Res = {Name,_} = extract_def(C,undefined,Skip),
 	case gb_sets:is_member(Name,Skip) orelse lists:keymember(Name, 1, Acc) of
 	    true -> {Acc,Skip};
@@ -1380,30 +1396,31 @@ extract_defs2(#xmlElement{name=memberdef,content=C},{Acc,Skip}) ->
 	end
     catch throw:SkipName -> {Acc, gb_sets:add(SkipName,Skip)}
     end.
-	     
+
 extract_def([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], _N, Skip) ->
     case Name of
 	"wxUSE" ++ _ ->
 	    throw(Name);
 	"wx" ++ _ ->
 	    extract_def(R, Name, Skip);
-	_ -> 
+	_ ->
 	    throw(Name)
     end;
 extract_def([#xmlElement{name=param}|_],Name,_) ->
     throw(Name);
-extract_def([#xmlElement{name=initializer,content=[#xmlText{value=Val0}]}|_],N,Skip) ->
+extract_def([#xmlElement{name=initializer,content=Cs}|_R],N,Skip) ->
+    Val0 = extract_def2(Cs),
     case Val0 of
 	"0x" ++ Val1 -> {N, http_util:hexlist_to_integer(Val1)};
 	_ ->
 	    try
 		Val = list_to_integer(Val0),
 		{N, Val}
-	    catch _:_ ->  
+	    catch _:_ ->
 		    case def_is_ok(Val0, Skip) of
 			false ->
 			    throw(N);
-			NVal when is_integer(NVal) -> 
+			NVal when is_integer(NVal) ->
 			    {N, NVal};
 			NVal ->
 			    {N, {NVal,0}}
@@ -1414,7 +1431,24 @@ extract_def([_|R],N,Skip) ->
     extract_def(R,N,Skip);
 extract_def(_,N,_) ->
     throw(N).
-		     
+
+extract_def2([#xmlText{value=Val}|R]) ->
+    strip_comment(string:strip(Val)) ++ extract_def2(R);
+extract_def2([#xmlElement{content=Cs}|R]) ->
+    extract_def2(Cs) ++ extract_def2(R);
+extract_def2([]) -> [].
+
+strip_comment("/*" ++ Rest) ->
+    strip_comment_until_end(Rest);
+strip_comment("//" ++ _) -> [];
+strip_comment([H|R]) -> [H | strip_comment(R)];
+strip_comment([]) -> [].
+
+strip_comment_until_end("*/" ++ Rest) ->
+    strip_comment(Rest);
+strip_comment_until_end([_|R]) ->
+    strip_comment_until_end(R).
+
 def_is_ok(Name, Skip) ->
     Toks = gen_util:tokens(Name,"()| \\:"),
     R = def_is_ok(Toks, Skip, []),
diff --git a/lib/wx/api_gen/wx_gen.hrl b/lib/wx/api_gen/wx_gen.hrl
index 426e3adfae..89577b9707 100644
--- a/lib/wx/api_gen/wx_gen.hrl
+++ b/lib/wx/api_gen/wx_gen.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -44,7 +44,8 @@
 	  doc,                     % Extra documentation
 	  virtual,                 % Is virtual?
 	  pre_hook    = [],        % Pre hook  before call in c-code
-	  post_hook   = []         % Post hook after call in c-code
+	  post_hook   = [],        % Post hook after call in c-code
+	  opts        = []         % Options
 	}
        ).
 
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 2209e4a53b..293c97507e 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -118,12 +118,18 @@ gen_constructors(#class{name=Class, methods=Ms0}) ->
 
 gen_constructor(_Class, #method{where=merged_c}) -> ok;
 gen_constructor(_Class, #method{where=erl_no_opt}) -> ok;
-gen_constructor(Class, _M=#method{params=Ps}) ->
+gen_constructor(Class, _M=#method{params=Ps, opts=FOpts}) ->
     Gen1  = fun(#param{name=N, type=T}) -> gen_type(T,1) ++ N end,
     Gen2  = fun(#param{name=N, type=T}) -> gen_type(T,2) ++ N end,
     CallA = fun(#param{name=N}) -> N end,
     HaveMergedType = fun(#param{type={merged,_,_,_,_,_,_}}) -> true; (_) -> false end,
     ?WTC("gen_constructor"),
+    Endif = case lists:keysearch(deprecated, 1, FOpts) of
+		{value, {deprecated, IfDef}} ->
+		    w("#if ~s~n", [IfDef]),
+		    true;
+		_ -> false
+	    end,
     case lists:any(HaveMergedType, Ps) of
 	false ->
 	    w(" E~s(~s) : ~s(~s) {};~n",
@@ -133,7 +139,9 @@ gen_constructor(Class, _M=#method{params=Ps}) ->
 	      [Class,args(Gen1,",",Ps),Class,args(CallA,",",Ps)]),
 	    w(" E~s(~s) : ~s(~s) {};~n",
 	      [Class,args(Gen2,",",Ps),Class,args(CallA,",",Ps)])
-    end.
+    end,
+    Endif andalso w("#endif~n", []),
+    ok.
 
 gen_type(#type{name=Type, ref={pointer,1}, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " * ";
@@ -162,6 +170,14 @@ gen_funcs(Defs) ->
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"wxe_derived_dest.h\"~n~n"),
 
+    w("#if !wxCHECK_VERSION(2,9,0)~n", []),
+    [w("#define ~p int~n", [Enum]) ||
+	Enum <- [wxPenJoin, wxPenCap, wxImageResizeQuality, %%wxBitmapType,
+		 wxPolygonFillMode, wxMappingMode, wxRasterOperationMode,
+		 wxFloodFillStyle
+		]],
+    w("#endif~n",[]),
+
     w("void WxeApp::wxe_dispatch(wxeCommand& Ecmd)~n{~n"),
     w(" char * bp = Ecmd.buffer;~n"),
     w(" wxeMemEnv *memenv = getMemEnv(Ecmd.port);~n"),
@@ -292,10 +308,16 @@ gen_method(CName, M=#method{name=N,params=[Ps],method_type=destructor,id=MethodI
 	    ignore
     end,
     M;
-gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId}) ->
+gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId, opts=FOpts}) ->
     put(current_func, N),
     put(bin_count,-1),
     ?WTC("gen_method"),
+    Endif = case lists:keysearch(deprecated, 1, FOpts) of
+		{value, {deprecated, IfDef}} ->
+		    w("#if ~s~n", [IfDef]),
+		    true;
+		_ -> false
+	    end,
     w("case ~s: { // ~s::~s~n", [wx_gen_erl:get_unique_name(MethodId),CName,N]),
     Ps1 = declare_variables(void, Ps0),
     {Ps2,Align} = decode_arguments(Ps1),
@@ -314,6 +336,7 @@ gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId
     free_args(),
     build_return_vals(T,Ps3),
     w(" break;~n}~n", []),
+    Endif andalso w("#endif~n", []),
     erase(current_func),
     M.
 
@@ -746,7 +769,7 @@ return_res1(#type{name=Type,ref={pointer,_}, base={term,_}}) ->
     {Type ++ " * Result = (" ++ Type ++ "*)", ""};
 return_res1(#type{name=Type,ref={pointer,_}}) ->
     {Type ++ " * Result = (" ++ Type ++ "*)", ""};
-return_res1(#type{name=Type,single=true,ref=reference}) ->
+return_res1(#type{name=Type,single=true,by_val=false,ref=reference}) ->
     {Type ++ " * Result = &", ""};
 return_res1(#type{name=Type,single=true,by_val=true})
   when is_atom(Type) ->
@@ -758,7 +781,7 @@ return_res1(#type{name=Type,base={class,_},single=list,ref=reference}) ->
 return_res1(#type{name=Type,base={comp,_,_},single=array,by_val=true}) ->
     {Type ++ " Result = ", ""};
 return_res1(#type{name=Type,single=true,by_val=true, base={class, _}}) ->
-    %% Memory leak !!!!!!   XXXX BUGBUG FIXME or doument!!
+    %% Temporary memory leak !!!!!!
     case Type of
 	"wxImage" ->  ok;
 	"wxFont"  ->  ok;
@@ -769,7 +792,6 @@ return_res1(#type{name=Type,single=true,by_val=true, base={class, _}}) ->
 	    io:format("~s::~s Building return value of temp ~s~n",
 		      [get(current_class),get(current_func),Type])
     end,
-    %% #class{id=Id} = get({class,Type}),
     {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result,"
      ++ "3, memenv);"};
 return_res1(#type{base={enum,_Type},single=true,by_val=true}) ->
@@ -794,15 +816,14 @@ call_arg(#param{where=c, alt={length,Alt}}) when is_list(Alt) ->
 call_arg(#param{where=c, alt={size,Id}}) when is_integer(Id) ->
     %% It's a binary
     "Ecmd.bin["++ integer_to_list(Id) ++ "]->size";
-call_arg(#param{name=N,def=Def,type=#type{name=Type,by_val=true,single=true,base=Base}})
+call_arg(#param{name=N,def=Def,type=#type{by_val=true,single=true,base=Base}})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     case Def of
-	none -> "(" ++ to_string(Type) ++ ") *" ++ N;
+	none -> "*" ++ N;
 	_ ->  N
     end;
-
-call_arg(#param{name=N,type=#type{base={enum,Type}, by_val=true,single=true}}) ->
-    "(" ++ enum_type(Type) ++") " ++ N;
+call_arg(#param{name=N,type=#type{base={enum,_Type}, by_val=true,single=true}}) ->
+    N;
 call_arg(#param{name=N,type=#type{base={class,_},by_val=true,single=true}}) -> "*" ++ N;
 call_arg(#param{name=N,type=#type{base={class,_},ref=reference,single=true}}) -> "*" ++ N;
 call_arg(#param{name=N,type=#type{base=eventType}}) ->
@@ -823,8 +844,8 @@ call_arg(#param{name=N,type={merged,_,#type{base={class,_},single=true,
 					    ref=Ref},_,_,_,_}})
   when ByVal =:= true; Ref =:= reference ->
     "*" ++ N;
-call_arg(#param{def=Def, type=void}) when Def =/= none -> Def;
-call_arg(#param{def=Def, type=voidp}) when Def =/= none -> Def;
+call_arg(#param{def=Def, type=void}) when Def =/= none  -> Def;
+call_arg(#param{def=Def, type=voidp}) when Def =/= none -> "(void **) " ++ Def;
 call_arg(#param{name=N,type=#type{base={ref,_},by_val=true,single=true}}) -> N;
 call_arg(#param{name=N,type={merged,_,_,_,_,_,_}}) -> N.
 
@@ -932,10 +953,18 @@ build_ret(Name,_,#type{base={enum,_Type},single=true}) ->
     w(" rt.addInt(~s);~n",[Name]);
 build_ret(Name,_,#type{base={comp,_,{record, _}},single=true}) ->
     w(" rt.add(~s);~n", [Name]);
+build_ret(Name,{ret,_},#type{base={comp,_,_},single=true, by_val=true}) ->
+    w(" rt.add(~s);~n",[Name]);
 build_ret(Name,{ret,_},#type{base={comp,_,_},single=true, ref=reference}) ->
     w(" rt.add((*~s));~n",[Name]);
 build_ret(Name,_,#type{base={comp,_,_},single=true}) ->
     w(" rt.add(~s);~n",[Name]);
+build_ret(Name = "ev->m_scanCode",_,#type{base=bool,single=true,by_val=true}) ->
+    %% Hardcoded workaround for 2.9 and later
+    w("#if !wxCHECK_VERSION(2,9,0)~n", []),
+    w(" rt.addBool(~s);~n",[Name]),
+    w("#else~n rt.addBool(false);~n",[]),
+    w("#endif~n",[]);
 build_ret(Name,_,#type{base=bool,single=true,by_val=true}) ->
     w(" rt.addBool(~s);~n",[Name]);
 build_ret(Name,{arg, both},#type{base=int,single=true,mod=M}) ->
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index a8f23575f3..a999a869e6 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -70,8 +70,7 @@ gen_class1(C=#class{name=Name,parent="static",methods=Ms,options=_Opts}) ->
 
     Exp = fun(M) -> gen_export(C,M) end,
     ExportList = lists:usort(lists:append(lists:map(Exp,reverse(Ms)))),
-    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
-
+    w("-export([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", ExportList, 60)]),
 
     Gen = fun(M) -> gen_method(Name,M) end,
     NewMs = lists:map(Gen,reverse(Ms)),
@@ -134,7 +133,7 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    w("-include(\"wxe.hrl\").~n",[]),
 	    Exp = fun(M) -> gen_export(C,M) end,
 	    ExportList = lists:usort(lists:append(lists:map(Exp,reverse(Ms)))),
-	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
+	    w("-export([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", ExportList, 60)]),
 	    w("%% inherited exports~n",[]),
 	    Done0 = ["Destroy", "New", "Create", "destroy", "new", "create"],
 	    Done  = gb_sets:from_list(Done0 ++ [M|| #method{name=M} <- lists:append(Ms)]),
@@ -143,6 +142,10 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 					  lists:usort(["parent_class/1"|InExported]),
 					  60)]),
 	    w("-export_type([~s/0]).~n", [Name]),
+	    case lists:filter(fun({_F,Depr}) -> Depr end, ExportList) of
+		[] -> ok;
+		Depr -> w("-deprecated([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", Depr, 60)])
+	    end,
 	    w("%% @hidden~n", []),
 	    parents_check(Parents),
 	    w("-type ~s() :: wx:wx_object().~n", [Name]),
@@ -218,33 +221,40 @@ gen_export(#class{name=Class,abstract=Abs},Ms0) ->
     case Res of
 	[] -> [];
 	[M=#method{where=taylormade}|_] ->
-	    [taylormade_export(Class, M)];
+	    [deprecated(M, taylormade_export(Class, M))];
 	Ms ->
-	    GetF = fun(#method{method_type=constructor,where=W,params=Ps}) ->
+	    GetF = fun(M=#method{method_type=constructor,where=W,params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
 			   OptLen = case Opts of
 					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
 					_ -> 1
 				    end,
-			   "new/" ++ integer_to_list(length(Args)+OptLen);
-		      (#method{method_type=destructor}) ->
+			   deprecated(M, "new" ++ "/" ++ integer_to_list(length(Args)+OptLen));
+		      (M=#method{method_type=destructor}) ->
 			   case Abs of
 			       true -> [];
-			       _ -> "destroy/1"
+			       _ -> deprecated(M, "destroy/1")
 			   end;
-		      (#method{name=N,alias=A,where=W, params=Ps}) ->
+		      (M=#method{name=N,alias=A,where=W, params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
 			   OptLen = case Opts of
 					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
 					_ -> 1
 				    end,
-			   erl_func_name(N,A) ++ "/" ++ integer_to_list(length(Args) + OptLen)
+			   deprecated(M, erl_func_name(N,A) ++ "/" ++ integer_to_list(length(Args) + OptLen))
 		   end,
 	    lists:map(GetF, Ms)
     end.
 
+deprecated(#method{opts=FOpts}, FA) ->
+    case lists:keysearch(deprecated, 1, FOpts) of
+	{value, {deprecated, _}} ->
+	    {FA,true};
+	_ ->
+	    {FA,false}
+    end.
 
 gen_method(Class,Ms0) ->
     RemoveC = fun(#method{where=merged_c}) -> false;(_Other) -> true end,
@@ -832,15 +842,20 @@ doc_enum(_,Ps) ->
     [doc_enum_type(Type,Name) || #param{name=Name, type=#type{base={enum,Type}}} <- Ps].
 
 doc_enum_type(Type, Name) ->
-    {Enum0, #enum{vals=Vals}} = wx_gen:get_enum(Type),
-    Enum = case Enum0 of {_, E} -> E; E -> E end,
-    Consts = get(consts),
-    Format = fun({N,_What}) ->
-		     #const{name=N} = gb_trees:get(N, Consts),
-		     "?" ++ enum_name(N)
-	     end,
-    Vs = args(Format, " | ", Vals),
-    {uppercase(Enum),Name, Vs}.
+    try
+	{Enum0, #enum{vals=Vals}} = wx_gen:get_enum(Type),
+	Enum = case Enum0 of {_, E} -> E; E -> E end,
+	Consts = get(consts),
+	Format = fun({N,_What}) ->
+			 #const{name=N} = gb_trees:get(N, Consts),
+			 "?" ++ enum_name(N)
+		 end,
+	Vs = args(Format, " | ", Vals),
+	{uppercase(Enum),Name, Vs}
+    catch _:_ ->
+	    io:format("Warning missing enum type ~p~n", [Type]),
+	    {uppercase(Type),Name,"integer"}
+    end.
 
 doc_enum_desc([]) -> ok;
 doc_enum_desc([{_Enum,Name,Vs}|R]) ->
@@ -1014,11 +1029,23 @@ align(64, 1, Str) -> {"0:32," ++ Str,0};
 align(Sz, W, Str) -> align(Sz, W rem 2, Str).
 
 enum_name(Name) ->
+    case enum_split(Name) of
+	{undefined, _} -> Name;
+	{_C, ErlName} -> ErlName
+    end.
+
+enum_split(Name) ->
     case string:tokens(Name, ":") of
-	[Name] -> Name;
-	[C,N] ->  C ++ "_" ++ N
+	[Name] -> {undefined, Name};
+	[C,N] ->  {C, enum_name(C,N)}
     end.
 
+enum_name(undefined, Name) -> Name;
+enum_name(Enum, Name) -> Enum ++ "_" ++ Name.
+
+enum_name_c(undefined, Name) -> Name;
+enum_name_c(Enum, Name) -> Enum ++ "::" ++ Name.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 gen_enums_ints() ->
@@ -1058,6 +1085,14 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 	    w("% From class ~s::~s~n",[Class, Name])
     end,
 
+    Consts = get(consts),
+    Ignore = fun(Name) ->
+		     case gb_trees:lookup(Name, Consts) of
+			 {value, Const} -> Const;
+			 none -> true
+		     end
+	     end,
+
     Format = fun(#const{name="wxEVT_" ++ _}) ->
 		     ignore; %% Ignore event macros they are not valid in our event model
 		(#const{name=Name,val=Value,is_const=true}) when is_number(Value) ->
@@ -1065,44 +1100,57 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 		(#const{name=Name,val=Value,is_const=false}) when is_number(Value) ->
 		     w("-define(~s, wxe_util:get_const(~s)).~n", [enum_name(Name),enum_name(Name)]);
 		(#const{name=Name,val={Str,0}}) ->
+		     {EnumClass, EnumName} = enum_split(Name),
 		     case string:tokens(Str, " |()") of
 			 [Token] ->
-			     w("-define(~s, ~s).~n", [enum_name(Name),const_value(Token)]);
+			     w("-define(~s, ~s).~n", [EnumName,const_value(Token, EnumClass, Ignore)]);
 			 Tokens ->
-			     Def = args(fun(T) -> const_value(T) end, " bor ", Tokens),
-			     w("-define(~s, (~s)).~n", [enum_name(Name),Def])
+			     Def = args(fun(T) -> const_value(T, EnumClass, Ignore) end, " bor ", Tokens),
+			     w("-define(~s, (~s)).~n", [EnumName, Def])
 		     end;
 		(#const{name=Name,val={Str,N}}) ->
+		     {EnumClass, EnumName} = enum_split(Name),
 		     case string:tokens(Str, " |()") of
 			 [Token] ->
-			     w("-define(~s, (?~s+~p)).~n", [enum_name(Name),Token,N])
+			     w("-define(~s, (~s+~p)).~n", [EnumName,const_value(Token, EnumClass, Ignore),N])
 		     end
 	     end,
-    Consts = get(consts),
+
     Write = fun({Name,_What}, Skip) ->
-		    case gb_sets:is_member(Name,Skip) of
-			true ->
-			    Skip;
-			false ->
-			    case gb_trees:lookup(Name, Consts) of
-				{value, Const} ->
-				    Format(Const),
-				    gb_sets:add(Name,Skip);
-				none -> Skip
-			    end
+		    case gb_sets:is_member(Name,Skip) orelse Ignore(Name) of
+			true -> Skip;
+			Const ->
+			    try Format(Const)
+			    catch {unknown_value, _Error} ->
+				    %% io:format("Const ~s uses unknown define ~p ignoring~n", [Name, _Error]),
+				    ok
+			    end,
+			    gb_sets:add(Name,Skip)
 		    end
 	    end,
     lists:foldl(Write, Done, Vals).
 
-const_value(V) when is_integer(V) -> integer_to_list(V);
-const_value(V = "16#" ++ IntList) ->
+const_value(V,_,_) when is_integer(V) -> integer_to_list(V);
+const_value(V = "16#" ++ IntList,_,_) ->
     _ = http_util:hexlist_to_integer(IntList), %% ASSERT
     V;
-const_value(V0) ->
+const_value(V0, EnumClass, Ignore) ->
     try
 	_ = list_to_integer(V0),
 	V0
-    catch _:_ -> [$?|V0]
+    catch _:_ ->
+	    EEnum = enum_name(EnumClass, V0),
+	    CEnum = enum_name_c(EnumClass, V0),
+	    case Ignore(CEnum) of
+		true when CEnum == V0 ->
+		    throw({unknown_value, EEnum});
+		true ->
+		    case Ignore(V0) of
+			true -> throw({unknown_value, EEnum});
+			_ -> [$?|V0]
+		    end;
+		_ -> [$?|EEnum]
+	    end
     end.
 
 gen_event_recs() ->
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 1f6225ce60..94142ff6ba 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -148,7 +148,8 @@
 
 {class, wxTopLevelWindowGTK, wxWindow, 
  [{alias, [{wxTopLevelWindowGTK, wxTopLevelWindow}]}],
- ['GetIcon','GetIcons','GetTitle','IsActive','Iconize',
+ [{'GetIcon', [{return, {by_val, true}}]},
+  'GetIcons','GetTitle','IsActive','Iconize',
   'IsFullScreen','IsIconized','IsMaximized','Maximize',
   'RequestUserAttention','SetIcon','SetIcons',
   'CenterOnScreen', 'CentreOnScreen',
@@ -279,8 +280,11 @@
 {class, wxGridCellEditor,   root, [], 
  ['Create',
   'IsCreated', 'SetSize', 'Show',
-  'PaintBackground', 'BeginEdit', 'EndEdit', 'Reset', 'StartingKey',
-  'StartingClick', 'HandleReturn' 						
+  {'PaintBackground', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'BeginEdit',
+  {'EndEdit', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'Reset', 'StartingKey',
+  'StartingClick', 'HandleReturn'
   %'Destroy','Clone','~wxGridCellEditor',
  ]}.
 
@@ -319,17 +323,25 @@
 {class, wxDC, object, 
  [{skip, [{'DrawEllipse',5},{'DrawRectangle',5},
 	  {'DrawRoundedRectangle',6},{'SetClippingRegion',5}]}],
- [{'Blit',7},'CalcBoundingBox','Clear','ComputeScaleAndOrigin',{'CrossHair',1},
+ [{{'Blit',7},[{"rop", [{base, {enum, "wxRasterOperationMode"}}]}]},
+  'CalcBoundingBox','Clear',
+  {'ComputeScaleAndOrigin',[{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CrossHair',1},
   'DestroyClippingRegion','DeviceToLogicalX','DeviceToLogicalXRel',
   'DeviceToLogicalY','DeviceToLogicalYRel',{'DrawArc',3},{'DrawBitmap',3},
   {'DrawCheckMark',1},{'DrawCircle',2},'DrawEllipse',{'DrawEllipticArc',4},
   {'DrawIcon',2},{'DrawLabel',4},{'DrawLine',2},
   {'DrawLines', [{"n",{c_only,{length,"points"}}}]},
-  {'DrawPolygon', [{"n",{c_only,{length,"points"}}}]}, %'DrawPolyPolygon',
+  {'DrawPolygon', [{"n",{c_only,{length,"points"}}},
+		   {"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}
+		  ]},
+  %%'DrawPolyPolygon',
   {'DrawPoint',1},'DrawRectangle',
   {'DrawRotatedText',3}, 'DrawRoundedRectangle',%'DrawSpline',
   {'DrawText',2},
-  'EndDoc','EndPage',{'FloodFill',3},'GetBackground','GetBackgroundMode',
+  'EndDoc','EndPage',
+  {{'FloodFill',3},[{"style", [{base, {enum, "wxFloodFillStyle"}}]}]},
+  'GetBackground','GetBackgroundMode',
   'GetBrush','GetCharHeight','GetCharWidth',{'GetClippingBox',[{"rect", skip_member}]},
   'GetFont','GetLayoutDirection','GetLogicalFunction','GetMapMode','GetMultiLineTextExtent',
   {'GetPartialTextExtents', [{"widths", out}]},
@@ -340,21 +352,33 @@
   'LogicalToDeviceX','LogicalToDeviceXRel','LogicalToDeviceY','LogicalToDeviceYRel',
   'MaxX','MaxY','MinX','MinY','IsOk','ResetBoundingBox','SetAxisOrientation',
   'SetBackground','SetBackgroundMode','SetBrush','SetClippingRegion','SetDeviceOrigin',
-  'SetFont','SetLayoutDirection','SetLogicalFunction','SetMapMode', 'SetPalette',
+  'SetFont','SetLayoutDirection',
+  {'SetLogicalFunction', [{"function", [{base, {enum, "wxRasterOperationMode"}}]}]},
+  {'SetMapMode', [{"mode", [{base, {enum, "wxMappingMode"}}]}]},
+  'SetPalette',
   'SetPen','SetTextBackground','SetTextForeground','SetUserScale','StartDoc','StartPage']}.
 
 {class,wxMirrorDC, wxDC, [], ['wxMirrorDC', '~wxMirrorDC']}.
 {class,wxScreenDC, wxDC, [], ['wxScreenDC', '~wxScreenDC']}.
-{class,wxPostScriptDC,wxDC,[],['wxPostScriptDC','~wxPostScriptDC','SetResolution','GetResolution']}.
-{class,wxWindowDC, wxDC, [], ['wxWindowDC', '~wxWindowDC']}.
-{class,wxClientDC,wxWindowDC,[],['wxClientDC', '~wxClientDC']}.
-{class,wxPaintDC, wxWindowDC, [], ['wxPaintDC', '~wxPaintDC']}.
+{class,wxPostScriptDC,wxDC,[],
+ ['wxPostScriptDC','~wxPostScriptDC',
+  {'SetResolution', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'GetResolution', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]}.
+{class,wxWindowDC, wxDC, [],
+ [{'wxWindowDC', [{{func, 0}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxWindowDC']}.
+{class,wxClientDC,wxWindowDC,[],
+ [{'wxClientDC', [{{func, 0}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxClientDC']}.
+{class,wxPaintDC, wxWindowDC, [],
+ [{'wxPaintDC', [{{func, 0}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxPaintDC']}.
 %%{class,wxPrinterDC, wxDC, [], ['wxPrinterDC','GetPaperRect']}. Not in GTK
 {class,wxMemoryDC, wxDC, [], ['wxMemoryDC', '~wxMemoryDC','SelectObject','SelectObjectAsSource']}.
 {class,wxBufferedDC,wxMemoryDC,[],['wxBufferedDC','~wxBufferedDC','Init']}.
 {class,wxBufferedPaintDC,wxBufferedDC,[],['wxBufferedPaintDC', '~wxBufferedPaintDC']}.
 %% Only a typedef!
-%%{class,wxAutoBufferedPaintDC,wxBufferedPaintDC,[],['wxAutoBufferedPaintDC']}. 
+%%{class,wxAutoBufferedPaintDC,wxBufferedPaintDC,[],['wxAutoBufferedPaintDC']}.
 
 {class, wxGraphicsObject, object, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['~wxGraphicsObject', 'GetRenderer','IsNull']}.
@@ -362,13 +386,17 @@
  [{ifdef, wxUSE_GRAPHICS_CONTEXT}, {skip, [{'StrokeLines',4}]}],
  ['~wxGraphicsContext',
   'Create', %%CreateFromNative CreateFromNativeWindow
-  'CreatePen','CreateBrush','CreateRadialGradientBrush',
-  'CreateLinearGradientBrush','CreateFont','CreateMatrix',
+  'CreatePen','CreateBrush',
+  {'CreateRadialGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CreateLinearGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'CreateFont','CreateMatrix',
   'CreatePath','Clip','ResetClip',
   'DrawBitmap','DrawEllipse','DrawIcon',
-  {'DrawLines', [{"n",{c_only,{length,"points"}}}, {"points", {single,array}}]},
-  'DrawPath',
-  'DrawRectangle','DrawRoundedRectangle','DrawText','FillPath',
+  {'DrawLines', [{"n",{c_only,{length,"points"}}}, {"points", {single,array}},
+		 {"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
+  {'DrawPath',[{"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
+  'DrawRectangle','DrawRoundedRectangle','DrawText',
+  {'FillPath',[{"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
   'StrokePath', %% 'GetNativeContext',
   {'GetPartialTextExtents', [{"widths", out}]},
   'GetTextExtent','Rotate','Scale','Translate',
@@ -383,15 +411,18 @@
 {class, wxGraphicsPath, wxGraphicsObject, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['MoveToPoint','AddArc','AddArcToPoint','AddCircle','AddCurveToPoint',
   'AddEllipse','AddLineToPoint','AddPath','AddQuadCurveToPoint',
-  'AddRectangle','AddRoundedRectangle','CloseSubpath','Contains',
-  'GetBox','GetCurrentPoint','Transform' 
+  'AddRectangle','AddRoundedRectangle','CloseSubpath',
+  {'Contains', [{"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
+  'GetBox','GetCurrentPoint','Transform'
   %'GetNativePath','UnGetNativePath'
  ]}.
 {class, wxGraphicsRenderer, object, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['GetDefaultRenderer','CreateContext',
   %%'CreateContextFromNativeContext', 'CreateContextFromNativeWindow',
   'CreatePen','CreateBrush',
-  'CreateLinearGradientBrush','CreateRadialGradientBrush','CreateFont',
+  {'CreateLinearGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CreateRadialGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'CreateFont',
   'CreateMatrix','CreatePath']}.
 
 {class, wxGraphicsPen,  wxGraphicsObject,[{ifdef, wxUSE_GRAPHICS_CONTEXT}], []}.
@@ -501,10 +532,12 @@
   'CopyFromBitmap','~wxIcon']}.
 
 {class, wxIconBundle, root, [],
- ['wxIconBundle','~wxIconBundle','AddIcon','GetIcon']}.
+ ['wxIconBundle','~wxIconBundle','AddIcon',
+ {'GetIcon', [{return, {by_val, true}}]}]}.
 
 {class, wxCursor, wxBitmap,[], 
- [{'wxCursor',[{"bits",[in,{base,binary},{single,true}]},
+ [{'wxCursor',[{{func, 5}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+	       {"bits",[in,{base,binary},{single,true}]},
 	       {"maskBits",nowhere},{"fg",nowhere},{"bg",nowhere}]},
   '~wxCursor','Ok']}.
 
@@ -549,16 +582,22 @@
   {'GetAlpha',[{{0,return},{base,{binary,"(This->GetWidth()*This->GetHeight())"}}}]},
   'GetBlue',
   {'GetData', [{return,{base,{binary,"(This->GetWidth()*This->GetHeight()*3)"}}}]},
-  'GetGreen', 'GetImageCount', %'GetHandlers',
+  'GetGreen',
+  {'GetImageCount', [{"type", [{base, {enum, "wxBitmapType"}}]}]},
+  %%'GetHandlers',
   'GetHeight','GetMaskBlue','GetMaskGreen',
   'GetMaskRed','GetOrFindMaskColour','GetPalette',
   'GetRed','GetSubImage', 'GetWidth',%%':HSVValue', 'HSVtoRGB',
   'HasAlpha','HasMask','GetOption','GetOptionInt','HasOption',
   'InitAlpha','InitStandardHandlers',%'InsertHandler',
   'IsTransparent', 'LoadFile','Ok',%%RGBValue 'RGBtoHSV',
-  'RemoveHandler','Mirror','Replace','Rescale','Resize',
+  'RemoveHandler','Mirror','Replace',
+  {'Rescale', [{"quality", [{base, {enum, "wxImageResizeQuality"}}]}]},
+  'Resize',
   'Rotate', 'RotateHue',
-  'Rotate90','SaveFile','Scale','Size',
+  'Rotate90','SaveFile',
+  {'Scale', [{"quality", [{base, {enum, "wxImageResizeQuality"}}]}]},
+  'Size',
   {'SetAlpha', [{{2,"alpha"},[in,{base,binary}, {def, none}]},
 		{{2,pre_hook}, 
 		 [{c, "if(!static_data) {"
@@ -576,15 +615,20 @@
   'SetRGB']}.
 
 {class, wxBrush, object, [],
- ['wxBrush','~wxBrush','GetColour','GetStipple','GetStyle',
+ ['wxBrush','~wxBrush',
+  {'GetColour', [{return, {by_val, true}}]},
+  'GetStipple','GetStyle',
   'IsHatch','IsOk','SetColour','SetStipple','SetStyle']}.
 
 {class, wxPen, object, [],
- ['wxPen','~wxPen','GetCap','GetColour',
+ ['wxPen','~wxPen','GetCap',
+  {'GetColour', [{return, {by_val, true}}]},
   %%'GetDashes', %'GetStipple',
-  'GetJoin', 'GetStyle','GetWidth','IsOk','SetCap','SetColour',
+  'GetJoin', 'GetStyle','GetWidth','IsOk',
+  {'SetCap', [{"capStyle", [{base, {enum, "wxPenCap"}}]}]},
+  'SetColour',
   %%'SetDashes',  %'SetStipple',
-  'SetJoin', 'SetStyle','SetWidth']}.
+  {'SetJoin', [{"joinStyle", [{base, {enum, "wxPenJoin"}}]}]}, 'SetStyle','SetWidth']}.
 
 {enum, wxRegionContain, "wx"}.
 
@@ -683,8 +727,11 @@
  ['wxButton','~wxButton','Create',%'GetLabel',
   'GetDefaultSize', 'SetDefault','SetLabel']}.
 {class, wxBitmapButton, wxButton, [], 
- ['wxBitmapButton','~wxBitmapButton','Create','GetBitmapDisabled',
-  'GetBitmapFocus','GetBitmapLabel','GetBitmapSelected',
+ ['wxBitmapButton','~wxBitmapButton','Create',
+  {'GetBitmapDisabled', [{return, {by_val, true}}]},
+  {'GetBitmapFocus', [{return, {by_val, true}}]},
+  {'GetBitmapLabel', [{return, {by_val, true}}]},
+  {'GetBitmapSelected', [{return, {by_val, true}}]},
   'SetBitmapDisabled','SetBitmapFocus','SetBitmapLabel','SetBitmapSelected']}.
 {class, wxToggleButton, wxControl, [], 
  ['wxToggleButton','~wxToggleButton','Create','GetValue','SetValue']}.
@@ -693,8 +740,10 @@
 {class, wxDateTime, root, [ignore], []}.  %% Only for ifdefs and enums
 
 {class, wxCalendarCtrl, wxControl, [], 
- ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate','GetDate',
-  'EnableYearChange','EnableMonthChange','EnableHolidayDisplay',
+ ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate',
+  {'GetDate', [{return, {by_val, true}}]},
+  {'EnableYearChange', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}, %% Temp bug in wx I assume
+  'EnableMonthChange','EnableHolidayDisplay',
   'SetHeaderColours','GetHeaderColourFg','GetHeaderColourBg',
   'SetHighlightColours','GetHighlightColourFg','GetHighlightColourBg',
   'SetHolidayColours','GetHolidayColourFg','GetHolidayColourBg',
@@ -816,8 +865,9 @@
 {enum, wxTextAttrAlignment, "wxTEXT_ALIGNMENT_"}.
 
 {class, wxTextAttr, root, [], 
- ['wxTextAttr','GetAlignment','GetBackgroundColour','GetFont','GetLeftIndent',
-  'GetLeftSubIndent','GetRightIndent','GetTabs','GetTextColour',
+ ['wxTextAttr','GetAlignment','GetBackgroundColour',
+  {'GetFont', [{return, {by_val, true}}]},
+  'GetLeftIndent','GetLeftSubIndent','GetRightIndent','GetTabs','GetTextColour',
   'HasBackgroundColour','HasFont','HasTextColour','GetFlags','IsDefault',
   'SetAlignment','SetBackgroundColour','SetFlags','SetFont','SetLeftIndent',
   'SetRightIndent','SetTabs','SetTextColour']}.
@@ -1233,7 +1283,8 @@
 
 {class, wxMDIParentFrame, wxFrame, [], 
  [
- 'wxMDIParentFrame', '~wxMDIParentFrame', 'ActivateNext', 'ActivatePrevious', 
+  'wxMDIParentFrame',
+  '~wxMDIParentFrame', 'ActivateNext', 'ActivatePrevious',
   'ArrangeIcons', 'Cascade', 'Create', 
   %%'GetClientSize', 'GetToolBar', 'SetToolBar',  defined in parent
   'GetActiveChild', 'GetClientWindow', 
@@ -1244,8 +1295,9 @@
 {class, wxMDIChildFrame, wxFrame, [], 
  ['wxMDIChildFrame','~wxMDIChildFrame','Activate','Create','Maximize','Restore']}.
 
-{class, wxMDIClientWindow, wxWindow, [], 
- ['wxMDIClientWindow','~wxMDIClientWindow','CreateClient']}.
+{class, wxMDIClientWindow, wxWindow, [],
+ [{'wxMDIClientWindow', [{{func, 2}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxMDIClientWindow','CreateClient']}.
 
 {class, wxLayoutAlgorithm, object, [],
  ['wxLayoutAlgorithm', '~wxLayoutAlgorithm', 
@@ -1310,12 +1362,7 @@
    [wxEVT_LEFT_DOWN,wxEVT_LEFT_UP,wxEVT_MIDDLE_DOWN,wxEVT_MIDDLE_UP,
     wxEVT_RIGHT_DOWN,wxEVT_RIGHT_UP,wxEVT_MOTION,wxEVT_ENTER_WINDOW,
     wxEVT_LEAVE_WINDOW,wxEVT_LEFT_DCLICK,wxEVT_MIDDLE_DCLICK,
-    wxEVT_RIGHT_DCLICK,wxEVT_MOUSEWHEEL,
-    wxEVT_NC_LEFT_DOWN,wxEVT_NC_LEFT_UP,
-    wxEVT_NC_MIDDLE_DOWN,wxEVT_NC_MIDDLE_UP,wxEVT_NC_RIGHT_DOWN,
-    wxEVT_NC_RIGHT_UP,wxEVT_NC_MOTION,wxEVT_NC_ENTER_WINDOW,
-    wxEVT_NC_LEAVE_WINDOW,wxEVT_NC_LEFT_DCLICK,wxEVT_NC_MIDDLE_DCLICK,
-    wxEVT_NC_RIGHT_DCLICK]}],
+    wxEVT_RIGHT_DCLICK,wxEVT_MOUSEWHEEL]}],
  ['AltDown','Button','ButtonDClick','ButtonDown','ButtonUp','CmdDown','ControlDown',
   'Dragging',  'Entering',  'GetButton',  'GetPosition',  'GetLogicalPosition',
   'GetLinesPerAction',  'GetWheelRotation',  'GetWheelDelta',  'GetX',  'GetY',
@@ -1345,8 +1392,8 @@
  ['GetSize']}.
 {class, wxMoveEvent, wxEvent, [{event,[wxEVT_MOVE]}],
  ['GetPosition']}.
-{class, wxPaintEvent, wxEvent, [{event,[wxEVT_PAINT,wxEVT_PAINT_ICON]}],[]}.
-{class, wxNcPaintEvent, wxEvent, [{event,[wxEVT_NC_PAINT]}],[]}.
+{class, wxPaintEvent, wxEvent, [{event,[wxEVT_PAINT]}],[]}.
+%%{class, wxNcPaintEvent, wxEvent, [{event,[wxEVT_NC_PAINT]}],[]}.
 {class, wxEraseEvent, wxEvent, 
  [{acc, [{m_dc, "GetDC()"}]},
   {event, [wxEVT_ERASE_BACKGROUND]}],
@@ -1415,7 +1462,8 @@
  ['GetPosition','SetPosition']}.
 {enum, wxIdleMode, "wxIDLE_"}.
 {class, wxIdleEvent, wxEvent, [{event,[wxEVT_IDLE]}],
- ['CanSend','GetMode','RequestMore','MoreRequested','SetMode']}.
+ [{'CanSend', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'GetMode','RequestMore','MoreRequested','SetMode']}.
 {class, wxGridEvent, wxNotifyEvent, 
  [{acc, [{m_row, "GetRow()"}, {m_col, "GetCol()"}, {m_x, "GetPosition().x"},{m_y, "GetPosition().y"},
 	 {m_selecting, "Selecting()"},{m_control,"ControlDown()"},
@@ -1634,7 +1682,7 @@
   'StyleSetFont', 'StyleSetFontAttr', 'StyleSetCharacterSet', 'StyleSetFontEncoding', 
   'CmdKeyExecute', 
   'SetMargins', {'GetSelection', [{"startPos", [out]}, {"endPos",[out]}]}, 
-  'PointFromPosition', 'ScrollToLine', 'ScrollToColumn', 'SendMsg', 
+  'PointFromPosition', 'ScrollToLine', 'ScrollToColumn', %% 'SendMsg',
   'SetVScrollBar', 'SetHScrollBar', 'GetLastKeydownProcessed', 'SetLastKeydownProcessed', 
   'SaveFile', 'LoadFile', 'DoDragOver', 'DoDropText', 'GetUseAntiAliasing', 
   {'AddTextRaw', [{"text", [in, {base, binary}]}]},
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index 1497ac4d16..1d17076d23 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -71,8 +71,7 @@ WX_OBJECTS  = $(GENERAL_O) $(GENERATED_O) $(RC_FILE)
 
 OBJECTS = $(WX_OBJECTS) $(GL_OBJECTS)
 
-TARGET_APIS = wxe_driver erl_gl
-TARGET_DIR = ../priv
+TARGET_DIR = ../priv/$(SYS_TYPE)
 
 # -O2 -funroll-loops  -ffast-math -fomit-frame-pointer 
 
@@ -121,7 +120,7 @@ debug:
 
 clean:  
 	rm -f $(OBJECTS) 
-	rm -f ../priv/$(TARGET_DIR)/$(TARGET_API)$(SO_EXT)
+	rm -f $(TARGET_DIR)/*$(SO_EXT)
 	rm -f *~ erl_crash.dump
 
 complete_clean: 
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index 6b7a5378cb..5fdce27d4b 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -94,19 +94,25 @@ class EwxPostScriptDC : public wxPostScriptDC {
 class EwxWindowDC : public wxWindowDC {
  public: ~EwxWindowDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxWindowDC(wxWindow * win) : wxWindowDC(win) {};
+#if !wxCHECK_VERSION(2,9,0)
  EwxWindowDC() : wxWindowDC() {};
+#endif
 };
 
 class EwxClientDC : public wxClientDC {
  public: ~EwxClientDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxClientDC(wxWindow * win) : wxClientDC(win) {};
+#if !wxCHECK_VERSION(2,9,0)
  EwxClientDC() : wxClientDC() {};
+#endif
 };
 
 class EwxPaintDC : public wxPaintDC {
  public: ~EwxPaintDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxPaintDC(wxWindow * win) : wxPaintDC(win) {};
+#if !wxCHECK_VERSION(2,9,0)
  EwxPaintDC() : wxPaintDC() {};
+#endif
 };
 
 class EwxMemoryDC : public wxMemoryDC {
@@ -182,7 +188,9 @@ class EwxIcon : public wxIcon {
 
 class EwxCursor : public wxCursor {
  public: ~EwxCursor() {((WxeApp *)wxTheApp)->clearPtr(this);};
+#if !wxCHECK_VERSION(2,9,0)
  EwxCursor(const char * bits,int width,int height,int hotSpotX,int hotSpotY) : wxCursor(bits,width,height,hotSpotX,hotSpotY) {};
+#endif
  EwxCursor(int cursorId) : wxCursor(cursorId) {};
  EwxCursor(const wxImage& image) : wxCursor(image) {};
  EwxCursor() : wxCursor() {};
@@ -286,7 +294,7 @@ class EwxStdDialogButtonSizer : public wxStdDialogButtonSizer {
 
 class EwxFont : public wxFont {
  public: ~EwxFont() {((WxeApp *)wxTheApp)->clearPtr(this);};
- EwxFont(int size,int family,int style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {};
+ EwxFont(int size,wxFontFamily family,wxFontStyle style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {};
  EwxFont(const wxString& fontname) : wxFont(fontname) {};
  EwxFont() : wxFont() {};
 };
@@ -712,7 +720,9 @@ class EwxMDIChildFrame : public wxMDIChildFrame {
 
 class EwxMDIClientWindow : public wxMDIClientWindow {
  public: ~EwxMDIClientWindow() {((WxeApp *)wxTheApp)->clearPtr(this);};
+#if !wxCHECK_VERSION(2,9,0)
  EwxMDIClientWindow(wxMDIParentFrame * parent,long style) : wxMDIClientWindow(parent,style) {};
+#endif
  EwxMDIClientWindow() : wxMDIClientWindow() {};
 };
 
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index 0afb02150a..7a3233a410 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -107,18 +107,6 @@ void initEventTable()
    {wxEVT_MIDDLE_DCLICK, 167, "middle_dclick"},
    {wxEVT_RIGHT_DCLICK, 167, "right_dclick"},
    {wxEVT_MOUSEWHEEL, 167, "mousewheel"},
-   {wxEVT_NC_LEFT_DOWN, 167, "nc_left_down"},
-   {wxEVT_NC_LEFT_UP, 167, "nc_left_up"},
-   {wxEVT_NC_MIDDLE_DOWN, 167, "nc_middle_down"},
-   {wxEVT_NC_MIDDLE_UP, 167, "nc_middle_up"},
-   {wxEVT_NC_RIGHT_DOWN, 167, "nc_right_down"},
-   {wxEVT_NC_RIGHT_UP, 167, "nc_right_up"},
-   {wxEVT_NC_MOTION, 167, "nc_motion"},
-   {wxEVT_NC_ENTER_WINDOW, 167, "nc_enter_window"},
-   {wxEVT_NC_LEAVE_WINDOW, 167, "nc_leave_window"},
-   {wxEVT_NC_LEFT_DCLICK, 167, "nc_left_dclick"},
-   {wxEVT_NC_MIDDLE_DCLICK, 167, "nc_middle_dclick"},
-   {wxEVT_NC_RIGHT_DCLICK, 167, "nc_right_dclick"},
    {wxEVT_SET_CURSOR, 168, "set_cursor"},
    {wxEVT_CHAR, 169, "char"},
    {wxEVT_CHAR_HOOK, 169, "char_hook"},
@@ -127,187 +115,185 @@ void initEventTable()
    {wxEVT_SIZE, 170, "size"},
    {wxEVT_MOVE, 171, "move"},
    {wxEVT_PAINT, 172, "paint"},
-   {wxEVT_PAINT_ICON, 172, "paint_icon"},
-   {wxEVT_NC_PAINT, 173, "nc_paint"},
-   {wxEVT_ERASE_BACKGROUND, 174, "erase_background"},
-   {wxEVT_SET_FOCUS, 175, "set_focus"},
-   {wxEVT_KILL_FOCUS, 175, "kill_focus"},
-   {wxEVT_CHILD_FOCUS, 176, "child_focus"},
-   {wxEVT_MENU_OPEN, 177, "menu_open"},
-   {wxEVT_MENU_CLOSE, 177, "menu_close"},
-   {wxEVT_MENU_HIGHLIGHT, 177, "menu_highlight"},
-   {wxEVT_CLOSE_WINDOW, 178, "close_window"},
-   {wxEVT_END_SESSION, 178, "end_session"},
-   {wxEVT_QUERY_END_SESSION, 178, "query_end_session"},
-   {wxEVT_SHOW, 179, "show"},
-   {wxEVT_ICONIZE, 180, "iconize"},
-   {wxEVT_MAXIMIZE, 181, "maximize"},
-   {wxEVT_JOY_BUTTON_DOWN, 182, "joy_button_down"},
-   {wxEVT_JOY_BUTTON_UP, 182, "joy_button_up"},
-   {wxEVT_JOY_MOVE, 182, "joy_move"},
-   {wxEVT_JOY_ZMOVE, 182, "joy_zmove"},
-   {wxEVT_UPDATE_UI, 183, "update_ui"},
-   {wxEVT_SYS_COLOUR_CHANGED, 184, "sys_colour_changed"},
-   {wxEVT_MOUSE_CAPTURE_CHANGED, 185, "mouse_capture_changed"},
-   {wxEVT_DISPLAY_CHANGED, 186, "display_changed"},
-   {wxEVT_PALETTE_CHANGED, 187, "palette_changed"},
-   {wxEVT_QUERY_NEW_PALETTE, 188, "query_new_palette"},
-   {wxEVT_NAVIGATION_KEY, 189, "navigation_key"},
-   {wxEVT_CREATE, 190, "create"},
-   {wxEVT_DESTROY, 191, "destroy"},
-   {wxEVT_HELP, 192, "help"},
-   {wxEVT_DETAILED_HELP, 192, "detailed_help"},
-   {wxEVT_CONTEXT_MENU, 193, "context_menu"},
-   {wxEVT_IDLE, 194, "idle"},
-   {wxEVT_GRID_CELL_LEFT_CLICK, 195, "grid_cell_left_click"},
-   {wxEVT_GRID_CELL_RIGHT_CLICK, 195, "grid_cell_right_click"},
-   {wxEVT_GRID_CELL_LEFT_DCLICK, 195, "grid_cell_left_dclick"},
-   {wxEVT_GRID_CELL_RIGHT_DCLICK, 195, "grid_cell_right_dclick"},
-   {wxEVT_GRID_LABEL_LEFT_CLICK, 195, "grid_label_left_click"},
-   {wxEVT_GRID_LABEL_RIGHT_CLICK, 195, "grid_label_right_click"},
-   {wxEVT_GRID_LABEL_LEFT_DCLICK, 195, "grid_label_left_dclick"},
-   {wxEVT_GRID_LABEL_RIGHT_DCLICK, 195, "grid_label_right_dclick"},
-   {wxEVT_GRID_ROW_SIZE, 195, "grid_row_size"},
-   {wxEVT_GRID_COL_SIZE, 195, "grid_col_size"},
-   {wxEVT_GRID_RANGE_SELECT, 195, "grid_range_select"},
-   {wxEVT_GRID_CELL_CHANGE, 195, "grid_cell_change"},
-   {wxEVT_GRID_SELECT_CELL, 195, "grid_select_cell"},
-   {wxEVT_GRID_EDITOR_SHOWN, 195, "grid_editor_shown"},
-   {wxEVT_GRID_EDITOR_HIDDEN, 195, "grid_editor_hidden"},
-   {wxEVT_GRID_EDITOR_CREATED, 195, "grid_editor_created"},
-   {wxEVT_GRID_CELL_BEGIN_DRAG, 195, "grid_cell_begin_drag"},
-   {wxEVT_SASH_DRAGGED, 197, "sash_dragged"},
-   {wxEVT_COMMAND_LIST_BEGIN_DRAG, 198, "command_list_begin_drag"},
-   {wxEVT_COMMAND_LIST_BEGIN_RDRAG, 198, "command_list_begin_rdrag"},
-   {wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 198, "command_list_begin_label_edit"},
-   {wxEVT_COMMAND_LIST_END_LABEL_EDIT, 198, "command_list_end_label_edit"},
-   {wxEVT_COMMAND_LIST_DELETE_ITEM, 198, "command_list_delete_item"},
-   {wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 198, "command_list_delete_all_items"},
-   {wxEVT_COMMAND_LIST_KEY_DOWN, 198, "command_list_key_down"},
-   {wxEVT_COMMAND_LIST_INSERT_ITEM, 198, "command_list_insert_item"},
-   {wxEVT_COMMAND_LIST_COL_CLICK, 198, "command_list_col_click"},
-   {wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 198, "command_list_col_right_click"},
-   {wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 198, "command_list_col_begin_drag"},
-   {wxEVT_COMMAND_LIST_COL_DRAGGING, 198, "command_list_col_dragging"},
-   {wxEVT_COMMAND_LIST_COL_END_DRAG, 198, "command_list_col_end_drag"},
-   {wxEVT_COMMAND_LIST_ITEM_SELECTED, 198, "command_list_item_selected"},
-   {wxEVT_COMMAND_LIST_ITEM_DESELECTED, 198, "command_list_item_deselected"},
-   {wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 198, "command_list_item_right_click"},
-   {wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 198, "command_list_item_middle_click"},
-   {wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 198, "command_list_item_activated"},
-   {wxEVT_COMMAND_LIST_ITEM_FOCUSED, 198, "command_list_item_focused"},
-   {wxEVT_COMMAND_LIST_CACHE_HINT, 198, "command_list_cache_hint"},
-   {wxEVT_DATE_CHANGED, 199, "date_changed"},
-   {wxEVT_CALENDAR_SEL_CHANGED, 200, "calendar_sel_changed"},
-   {wxEVT_CALENDAR_DAY_CHANGED, 200, "calendar_day_changed"},
-   {wxEVT_CALENDAR_MONTH_CHANGED, 200, "calendar_month_changed"},
-   {wxEVT_CALENDAR_YEAR_CHANGED, 200, "calendar_year_changed"},
-   {wxEVT_CALENDAR_DOUBLECLICKED, 200, "calendar_doubleclicked"},
-   {wxEVT_CALENDAR_WEEKDAY_CLICKED, 200, "calendar_weekday_clicked"},
-   {wxEVT_COMMAND_FILEPICKER_CHANGED, 201, "command_filepicker_changed"},
-   {wxEVT_COMMAND_DIRPICKER_CHANGED, 201, "command_dirpicker_changed"},
-   {wxEVT_COMMAND_COLOURPICKER_CHANGED, 202, "command_colourpicker_changed"},
-   {wxEVT_COMMAND_FONTPICKER_CHANGED, 203, "command_fontpicker_changed"},
-   {wxEVT_STC_CHANGE, 204, "stc_change"},
-   {wxEVT_STC_STYLENEEDED, 204, "stc_styleneeded"},
-   {wxEVT_STC_CHARADDED, 204, "stc_charadded"},
-   {wxEVT_STC_SAVEPOINTREACHED, 204, "stc_savepointreached"},
-   {wxEVT_STC_SAVEPOINTLEFT, 204, "stc_savepointleft"},
-   {wxEVT_STC_ROMODIFYATTEMPT, 204, "stc_romodifyattempt"},
-   {wxEVT_STC_KEY, 204, "stc_key"},
-   {wxEVT_STC_DOUBLECLICK, 204, "stc_doubleclick"},
-   {wxEVT_STC_UPDATEUI, 204, "stc_updateui"},
-   {wxEVT_STC_MODIFIED, 204, "stc_modified"},
-   {wxEVT_STC_MACRORECORD, 204, "stc_macrorecord"},
-   {wxEVT_STC_MARGINCLICK, 204, "stc_marginclick"},
-   {wxEVT_STC_NEEDSHOWN, 204, "stc_needshown"},
-   {wxEVT_STC_PAINTED, 204, "stc_painted"},
-   {wxEVT_STC_USERLISTSELECTION, 204, "stc_userlistselection"},
-   {wxEVT_STC_URIDROPPED, 204, "stc_uridropped"},
-   {wxEVT_STC_DWELLSTART, 204, "stc_dwellstart"},
-   {wxEVT_STC_DWELLEND, 204, "stc_dwellend"},
-   {wxEVT_STC_START_DRAG, 204, "stc_start_drag"},
-   {wxEVT_STC_DRAG_OVER, 204, "stc_drag_over"},
-   {wxEVT_STC_DO_DROP, 204, "stc_do_drop"},
-   {wxEVT_STC_ZOOM, 204, "stc_zoom"},
-   {wxEVT_STC_HOTSPOT_CLICK, 204, "stc_hotspot_click"},
-   {wxEVT_STC_HOTSPOT_DCLICK, 204, "stc_hotspot_dclick"},
-   {wxEVT_STC_CALLTIP_CLICK, 204, "stc_calltip_click"},
-   {wxEVT_STC_AUTOCOMP_SELECTION, 204, "stc_autocomp_selection"},
-   {wxEVT_COMMAND_TREE_BEGIN_DRAG, 209, "command_tree_begin_drag"},
-   {wxEVT_COMMAND_TREE_BEGIN_RDRAG, 209, "command_tree_begin_rdrag"},
-   {wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 209, "command_tree_begin_label_edit"},
-   {wxEVT_COMMAND_TREE_END_LABEL_EDIT, 209, "command_tree_end_label_edit"},
-   {wxEVT_COMMAND_TREE_DELETE_ITEM, 209, "command_tree_delete_item"},
-   {wxEVT_COMMAND_TREE_GET_INFO, 209, "command_tree_get_info"},
-   {wxEVT_COMMAND_TREE_SET_INFO, 209, "command_tree_set_info"},
-   {wxEVT_COMMAND_TREE_ITEM_EXPANDED, 209, "command_tree_item_expanded"},
-   {wxEVT_COMMAND_TREE_ITEM_EXPANDING, 209, "command_tree_item_expanding"},
-   {wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 209, "command_tree_item_collapsed"},
-   {wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 209, "command_tree_item_collapsing"},
-   {wxEVT_COMMAND_TREE_SEL_CHANGED, 209, "command_tree_sel_changed"},
-   {wxEVT_COMMAND_TREE_SEL_CHANGING, 209, "command_tree_sel_changing"},
-   {wxEVT_COMMAND_TREE_KEY_DOWN, 209, "command_tree_key_down"},
-   {wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 209, "command_tree_item_activated"},
-   {wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 209, "command_tree_item_right_click"},
-   {wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 209, "command_tree_item_middle_click"},
-   {wxEVT_COMMAND_TREE_END_DRAG, 209, "command_tree_end_drag"},
-   {wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 209, "command_tree_state_image_click"},
-   {wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 209, "command_tree_item_gettooltip"},
-   {wxEVT_COMMAND_TREE_ITEM_MENU, 209, "command_tree_item_menu"},
-   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 210, "command_notebook_page_changed"},
-   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 210, "command_notebook_page_changing"},
-   {wxEVT_COMMAND_SPINCTRL_UPDATED, 216, "command_spinctrl_updated"},
+   {wxEVT_ERASE_BACKGROUND, 173, "erase_background"},
+   {wxEVT_SET_FOCUS, 174, "set_focus"},
+   {wxEVT_KILL_FOCUS, 174, "kill_focus"},
+   {wxEVT_CHILD_FOCUS, 175, "child_focus"},
+   {wxEVT_MENU_OPEN, 176, "menu_open"},
+   {wxEVT_MENU_CLOSE, 176, "menu_close"},
+   {wxEVT_MENU_HIGHLIGHT, 176, "menu_highlight"},
+   {wxEVT_CLOSE_WINDOW, 177, "close_window"},
+   {wxEVT_END_SESSION, 177, "end_session"},
+   {wxEVT_QUERY_END_SESSION, 177, "query_end_session"},
+   {wxEVT_SHOW, 178, "show"},
+   {wxEVT_ICONIZE, 179, "iconize"},
+   {wxEVT_MAXIMIZE, 180, "maximize"},
+   {wxEVT_JOY_BUTTON_DOWN, 181, "joy_button_down"},
+   {wxEVT_JOY_BUTTON_UP, 181, "joy_button_up"},
+   {wxEVT_JOY_MOVE, 181, "joy_move"},
+   {wxEVT_JOY_ZMOVE, 181, "joy_zmove"},
+   {wxEVT_UPDATE_UI, 182, "update_ui"},
+   {wxEVT_SYS_COLOUR_CHANGED, 183, "sys_colour_changed"},
+   {wxEVT_MOUSE_CAPTURE_CHANGED, 184, "mouse_capture_changed"},
+   {wxEVT_DISPLAY_CHANGED, 185, "display_changed"},
+   {wxEVT_PALETTE_CHANGED, 186, "palette_changed"},
+   {wxEVT_QUERY_NEW_PALETTE, 187, "query_new_palette"},
+   {wxEVT_NAVIGATION_KEY, 188, "navigation_key"},
+   {wxEVT_CREATE, 189, "create"},
+   {wxEVT_DESTROY, 190, "destroy"},
+   {wxEVT_HELP, 191, "help"},
+   {wxEVT_DETAILED_HELP, 191, "detailed_help"},
+   {wxEVT_CONTEXT_MENU, 192, "context_menu"},
+   {wxEVT_IDLE, 193, "idle"},
+   {wxEVT_GRID_CELL_LEFT_CLICK, 194, "grid_cell_left_click"},
+   {wxEVT_GRID_CELL_RIGHT_CLICK, 194, "grid_cell_right_click"},
+   {wxEVT_GRID_CELL_LEFT_DCLICK, 194, "grid_cell_left_dclick"},
+   {wxEVT_GRID_CELL_RIGHT_DCLICK, 194, "grid_cell_right_dclick"},
+   {wxEVT_GRID_LABEL_LEFT_CLICK, 194, "grid_label_left_click"},
+   {wxEVT_GRID_LABEL_RIGHT_CLICK, 194, "grid_label_right_click"},
+   {wxEVT_GRID_LABEL_LEFT_DCLICK, 194, "grid_label_left_dclick"},
+   {wxEVT_GRID_LABEL_RIGHT_DCLICK, 194, "grid_label_right_dclick"},
+   {wxEVT_GRID_ROW_SIZE, 194, "grid_row_size"},
+   {wxEVT_GRID_COL_SIZE, 194, "grid_col_size"},
+   {wxEVT_GRID_RANGE_SELECT, 194, "grid_range_select"},
+   {wxEVT_GRID_CELL_CHANGE, 194, "grid_cell_change"},
+   {wxEVT_GRID_SELECT_CELL, 194, "grid_select_cell"},
+   {wxEVT_GRID_EDITOR_SHOWN, 194, "grid_editor_shown"},
+   {wxEVT_GRID_EDITOR_HIDDEN, 194, "grid_editor_hidden"},
+   {wxEVT_GRID_EDITOR_CREATED, 194, "grid_editor_created"},
+   {wxEVT_GRID_CELL_BEGIN_DRAG, 194, "grid_cell_begin_drag"},
+   {wxEVT_SASH_DRAGGED, 196, "sash_dragged"},
+   {wxEVT_COMMAND_LIST_BEGIN_DRAG, 197, "command_list_begin_drag"},
+   {wxEVT_COMMAND_LIST_BEGIN_RDRAG, 197, "command_list_begin_rdrag"},
+   {wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 197, "command_list_begin_label_edit"},
+   {wxEVT_COMMAND_LIST_END_LABEL_EDIT, 197, "command_list_end_label_edit"},
+   {wxEVT_COMMAND_LIST_DELETE_ITEM, 197, "command_list_delete_item"},
+   {wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 197, "command_list_delete_all_items"},
+   {wxEVT_COMMAND_LIST_KEY_DOWN, 197, "command_list_key_down"},
+   {wxEVT_COMMAND_LIST_INSERT_ITEM, 197, "command_list_insert_item"},
+   {wxEVT_COMMAND_LIST_COL_CLICK, 197, "command_list_col_click"},
+   {wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 197, "command_list_col_right_click"},
+   {wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 197, "command_list_col_begin_drag"},
+   {wxEVT_COMMAND_LIST_COL_DRAGGING, 197, "command_list_col_dragging"},
+   {wxEVT_COMMAND_LIST_COL_END_DRAG, 197, "command_list_col_end_drag"},
+   {wxEVT_COMMAND_LIST_ITEM_SELECTED, 197, "command_list_item_selected"},
+   {wxEVT_COMMAND_LIST_ITEM_DESELECTED, 197, "command_list_item_deselected"},
+   {wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 197, "command_list_item_right_click"},
+   {wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 197, "command_list_item_middle_click"},
+   {wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 197, "command_list_item_activated"},
+   {wxEVT_COMMAND_LIST_ITEM_FOCUSED, 197, "command_list_item_focused"},
+   {wxEVT_COMMAND_LIST_CACHE_HINT, 197, "command_list_cache_hint"},
+   {wxEVT_DATE_CHANGED, 198, "date_changed"},
+   {wxEVT_CALENDAR_SEL_CHANGED, 199, "calendar_sel_changed"},
+   {wxEVT_CALENDAR_DAY_CHANGED, 199, "calendar_day_changed"},
+   {wxEVT_CALENDAR_MONTH_CHANGED, 199, "calendar_month_changed"},
+   {wxEVT_CALENDAR_YEAR_CHANGED, 199, "calendar_year_changed"},
+   {wxEVT_CALENDAR_DOUBLECLICKED, 199, "calendar_doubleclicked"},
+   {wxEVT_CALENDAR_WEEKDAY_CLICKED, 199, "calendar_weekday_clicked"},
+   {wxEVT_COMMAND_FILEPICKER_CHANGED, 200, "command_filepicker_changed"},
+   {wxEVT_COMMAND_DIRPICKER_CHANGED, 200, "command_dirpicker_changed"},
+   {wxEVT_COMMAND_COLOURPICKER_CHANGED, 201, "command_colourpicker_changed"},
+   {wxEVT_COMMAND_FONTPICKER_CHANGED, 202, "command_fontpicker_changed"},
+   {wxEVT_STC_CHANGE, 203, "stc_change"},
+   {wxEVT_STC_STYLENEEDED, 203, "stc_styleneeded"},
+   {wxEVT_STC_CHARADDED, 203, "stc_charadded"},
+   {wxEVT_STC_SAVEPOINTREACHED, 203, "stc_savepointreached"},
+   {wxEVT_STC_SAVEPOINTLEFT, 203, "stc_savepointleft"},
+   {wxEVT_STC_ROMODIFYATTEMPT, 203, "stc_romodifyattempt"},
+   {wxEVT_STC_KEY, 203, "stc_key"},
+   {wxEVT_STC_DOUBLECLICK, 203, "stc_doubleclick"},
+   {wxEVT_STC_UPDATEUI, 203, "stc_updateui"},
+   {wxEVT_STC_MODIFIED, 203, "stc_modified"},
+   {wxEVT_STC_MACRORECORD, 203, "stc_macrorecord"},
+   {wxEVT_STC_MARGINCLICK, 203, "stc_marginclick"},
+   {wxEVT_STC_NEEDSHOWN, 203, "stc_needshown"},
+   {wxEVT_STC_PAINTED, 203, "stc_painted"},
+   {wxEVT_STC_USERLISTSELECTION, 203, "stc_userlistselection"},
+   {wxEVT_STC_URIDROPPED, 203, "stc_uridropped"},
+   {wxEVT_STC_DWELLSTART, 203, "stc_dwellstart"},
+   {wxEVT_STC_DWELLEND, 203, "stc_dwellend"},
+   {wxEVT_STC_START_DRAG, 203, "stc_start_drag"},
+   {wxEVT_STC_DRAG_OVER, 203, "stc_drag_over"},
+   {wxEVT_STC_DO_DROP, 203, "stc_do_drop"},
+   {wxEVT_STC_ZOOM, 203, "stc_zoom"},
+   {wxEVT_STC_HOTSPOT_CLICK, 203, "stc_hotspot_click"},
+   {wxEVT_STC_HOTSPOT_DCLICK, 203, "stc_hotspot_dclick"},
+   {wxEVT_STC_CALLTIP_CLICK, 203, "stc_calltip_click"},
+   {wxEVT_STC_AUTOCOMP_SELECTION, 203, "stc_autocomp_selection"},
+   {wxEVT_COMMAND_TREE_BEGIN_DRAG, 208, "command_tree_begin_drag"},
+   {wxEVT_COMMAND_TREE_BEGIN_RDRAG, 208, "command_tree_begin_rdrag"},
+   {wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 208, "command_tree_begin_label_edit"},
+   {wxEVT_COMMAND_TREE_END_LABEL_EDIT, 208, "command_tree_end_label_edit"},
+   {wxEVT_COMMAND_TREE_DELETE_ITEM, 208, "command_tree_delete_item"},
+   {wxEVT_COMMAND_TREE_GET_INFO, 208, "command_tree_get_info"},
+   {wxEVT_COMMAND_TREE_SET_INFO, 208, "command_tree_set_info"},
+   {wxEVT_COMMAND_TREE_ITEM_EXPANDED, 208, "command_tree_item_expanded"},
+   {wxEVT_COMMAND_TREE_ITEM_EXPANDING, 208, "command_tree_item_expanding"},
+   {wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 208, "command_tree_item_collapsed"},
+   {wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 208, "command_tree_item_collapsing"},
+   {wxEVT_COMMAND_TREE_SEL_CHANGED, 208, "command_tree_sel_changed"},
+   {wxEVT_COMMAND_TREE_SEL_CHANGING, 208, "command_tree_sel_changing"},
+   {wxEVT_COMMAND_TREE_KEY_DOWN, 208, "command_tree_key_down"},
+   {wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 208, "command_tree_item_activated"},
+   {wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 208, "command_tree_item_right_click"},
+   {wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 208, "command_tree_item_middle_click"},
+   {wxEVT_COMMAND_TREE_END_DRAG, 208, "command_tree_end_drag"},
+   {wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 208, "command_tree_state_image_click"},
+   {wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 208, "command_tree_item_gettooltip"},
+   {wxEVT_COMMAND_TREE_ITEM_MENU, 208, "command_tree_item_menu"},
+   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 209, "command_notebook_page_changed"},
+   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 209, "command_notebook_page_changing"},
+   {wxEVT_COMMAND_SPINCTRL_UPDATED, 215, "command_spinctrl_updated"},
    {wxEVT_SCROLL_LINEUP + wxEVT_USER_FIRST, 165, "spin_up"},
    {wxEVT_SCROLL_LINEDOWN + wxEVT_USER_FIRST, 165, "spin_down"},
    {wxEVT_SCROLL_THUMBTRACK + wxEVT_USER_FIRST, 165, "spin"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 218, "command_splitter_sash_pos_changed"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 218, "command_splitter_sash_pos_changing"},
-   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 218, "command_splitter_doubleclicked"},
-   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 218, "command_splitter_unsplit"},
-   {wxEVT_COMMAND_HTML_LINK_CLICKED, 220, "command_html_link_clicked"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 223, "command_auinotebook_page_close"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 223, "command_auinotebook_page_changed"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 223, "command_auinotebook_page_changing"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 223, "command_auinotebook_button"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 223, "command_auinotebook_begin_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 223, "command_auinotebook_end_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 223, "command_auinotebook_drag_motion"},
-   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 223, "command_auinotebook_allow_dnd"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 217, "command_splitter_sash_pos_changed"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 217, "command_splitter_sash_pos_changing"},
+   {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, 222, "command_auinotebook_page_close"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 222, "command_auinotebook_page_changed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 222, "command_auinotebook_page_changing"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 222, "command_auinotebook_button"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 222, "command_auinotebook_begin_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 222, "command_auinotebook_end_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 222, "command_auinotebook_drag_motion"},
+   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 222, "command_auinotebook_allow_dnd"},
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 223, "command_auinotebook_tab_middle_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 222, "command_auinotebook_tab_middle_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 223, "command_auinotebook_tab_middle_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 222, "command_auinotebook_tab_middle_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 223, "command_auinotebook_tab_right_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 222, "command_auinotebook_tab_right_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 223, "command_auinotebook_tab_right_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 222, "command_auinotebook_tab_right_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 223, "command_auinotebook_page_closed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 222, "command_auinotebook_page_closed"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 223, "command_auinotebook_drag_done"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 222, "command_auinotebook_drag_done"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 223, "command_auinotebook_bg_dclick"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 222, "command_auinotebook_bg_dclick"},
 #endif
-   {wxEVT_AUI_PANE_BUTTON, 224, "aui_pane_button"},
-   {wxEVT_AUI_PANE_CLOSE, 224, "aui_pane_close"},
-   {wxEVT_AUI_PANE_MAXIMIZE, 224, "aui_pane_maximize"},
-   {wxEVT_AUI_PANE_RESTORE, 224, "aui_pane_restore"},
-   {wxEVT_AUI_RENDER, 224, "aui_render"},
-   {wxEVT_AUI_FIND_MANAGER, 224, "aui_find_manager"},
-   {wxEVT_TASKBAR_MOVE, 227, "taskbar_move"},
-   {wxEVT_TASKBAR_LEFT_DOWN, 227, "taskbar_left_down"},
-   {wxEVT_TASKBAR_LEFT_UP, 227, "taskbar_left_up"},
-   {wxEVT_TASKBAR_RIGHT_DOWN, 227, "taskbar_right_down"},
-   {wxEVT_TASKBAR_RIGHT_UP, 227, "taskbar_right_up"},
-   {wxEVT_TASKBAR_LEFT_DCLICK, 227, "taskbar_left_dclick"},
-   {wxEVT_TASKBAR_RIGHT_DCLICK, 227, "taskbar_right_dclick"},
+   {wxEVT_AUI_PANE_BUTTON, 223, "aui_pane_button"},
+   {wxEVT_AUI_PANE_CLOSE, 223, "aui_pane_close"},
+   {wxEVT_AUI_PANE_MAXIMIZE, 223, "aui_pane_maximize"},
+   {wxEVT_AUI_PANE_RESTORE, 223, "aui_pane_restore"},
+   {wxEVT_AUI_RENDER, 223, "aui_render"},
+   {wxEVT_AUI_FIND_MANAGER, 223, "aui_find_manager"},
+   {wxEVT_TASKBAR_MOVE, 226, "taskbar_move"},
+   {wxEVT_TASKBAR_LEFT_DOWN, 226, "taskbar_left_down"},
+   {wxEVT_TASKBAR_LEFT_UP, 226, "taskbar_left_up"},
+   {wxEVT_TASKBAR_RIGHT_DOWN, 226, "taskbar_right_down"},
+   {wxEVT_TASKBAR_RIGHT_UP, 226, "taskbar_right_up"},
+   {wxEVT_TASKBAR_LEFT_DCLICK, 226, "taskbar_left_dclick"},
+   {wxEVT_TASKBAR_RIGHT_DCLICK, 226, "taskbar_right_dclick"},
    {-1, 0, }
   };
   for(int i=0; event_types[i].ev_type != -1; i++) {
@@ -437,7 +423,11 @@ case 169: {// wxKeyEvent
  rt.addBool(ev->m_shiftDown);
  rt.addBool(ev->m_altDown);
  rt.addBool(ev->m_metaDown);
+#if !wxCHECK_VERSION(2,9,0)
  rt.addBool(ev->m_scanCode);
+#else
+ rt.addBool(false);
+#endif
  rt.addInt(ev->m_uniChar);
  rt.addUint(ev->m_rawCode);
  rt.addUint(ev->m_rawFlags);
@@ -468,14 +458,7 @@ case 172: {// wxPaintEvent
     rt.addTupleCount(2);
   break;
 }
-case 173: {// wxNcPaintEvent
-    evClass = (char*)"wxNcPaintEvent";
-    rt.addAtom((char*)"wxNcPaint");
-    rt.addAtom(Etype->eName);
-    rt.addTupleCount(2);
-  break;
-}
-case 174: {// wxEraseEvent
+case 173: {// wxEraseEvent
  wxEraseEvent * ev = (wxEraseEvent *) event;
  wxDC * GetDC = ev->GetDC();
     evClass = (char*)"wxEraseEvent";
@@ -485,105 +468,105 @@ case 174: {// wxEraseEvent
     rt.addTupleCount(3);
   break;
 }
-case 175: {// wxFocusEvent
+case 174: {// wxFocusEvent
     evClass = (char*)"wxFocusEvent";
     rt.addAtom((char*)"wxFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 176: {// wxChildFocusEvent
+case 175: {// wxChildFocusEvent
     evClass = (char*)"wxChildFocusEvent";
     rt.addAtom((char*)"wxChildFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 177: {// wxMenuEvent
+case 176: {// wxMenuEvent
     evClass = (char*)"wxMenuEvent";
     rt.addAtom((char*)"wxMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 178: {// wxCloseEvent
+case 177: {// wxCloseEvent
     evClass = (char*)"wxCloseEvent";
     rt.addAtom((char*)"wxClose");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 179: {// wxShowEvent
+case 178: {// wxShowEvent
     evClass = (char*)"wxShowEvent";
     rt.addAtom((char*)"wxShow");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 180: {// wxIconizeEvent
+case 179: {// wxIconizeEvent
     evClass = (char*)"wxIconizeEvent";
     rt.addAtom((char*)"wxIconize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 181: {// wxMaximizeEvent
+case 180: {// wxMaximizeEvent
     evClass = (char*)"wxMaximizeEvent";
     rt.addAtom((char*)"wxMaximize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 182: {// wxJoystickEvent
+case 181: {// wxJoystickEvent
     evClass = (char*)"wxJoystickEvent";
     rt.addAtom((char*)"wxJoystick");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 183: {// wxUpdateUIEvent
+case 182: {// wxUpdateUIEvent
     evClass = (char*)"wxUpdateUIEvent";
     rt.addAtom((char*)"wxUpdateUI");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 184: {// wxSysColourChangedEvent
+case 183: {// wxSysColourChangedEvent
     evClass = (char*)"wxSysColourChangedEvent";
     rt.addAtom((char*)"wxSysColourChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 185: {// wxMouseCaptureChangedEvent
+case 184: {// wxMouseCaptureChangedEvent
     evClass = (char*)"wxMouseCaptureChangedEvent";
     rt.addAtom((char*)"wxMouseCaptureChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 186: {// wxDisplayChangedEvent
+case 185: {// wxDisplayChangedEvent
     evClass = (char*)"wxDisplayChangedEvent";
     rt.addAtom((char*)"wxDisplayChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 187: {// wxPaletteChangedEvent
+case 186: {// wxPaletteChangedEvent
     evClass = (char*)"wxPaletteChangedEvent";
     rt.addAtom((char*)"wxPaletteChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 188: {// wxQueryNewPaletteEvent
+case 187: {// wxQueryNewPaletteEvent
     evClass = (char*)"wxQueryNewPaletteEvent";
     rt.addAtom((char*)"wxQueryNewPalette");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 189: {// wxNavigationKeyEvent
+case 188: {// wxNavigationKeyEvent
  wxNavigationKeyEvent * ev = (wxNavigationKeyEvent *) event;
     evClass = (char*)"wxNavigationKeyEvent";
     rt.addAtom((char*)"wxNavigationKey");
@@ -593,42 +576,42 @@ case 189: {// wxNavigationKeyEvent
     rt.addTupleCount(4);
   break;
 }
-case 190: {// wxWindowCreateEvent
+case 189: {// wxWindowCreateEvent
     evClass = (char*)"wxWindowCreateEvent";
     rt.addAtom((char*)"wxWindowCreate");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 191: {// wxWindowDestroyEvent
+case 190: {// wxWindowDestroyEvent
     evClass = (char*)"wxWindowDestroyEvent";
     rt.addAtom((char*)"wxWindowDestroy");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 192: {// wxHelpEvent
+case 191: {// wxHelpEvent
     evClass = (char*)"wxHelpEvent";
     rt.addAtom((char*)"wxHelp");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 193: {// wxContextMenuEvent
+case 192: {// wxContextMenuEvent
     evClass = (char*)"wxContextMenuEvent";
     rt.addAtom((char*)"wxContextMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 194: {// wxIdleEvent
+case 193: {// wxIdleEvent
     evClass = (char*)"wxIdleEvent";
     rt.addAtom((char*)"wxIdle");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 195: {// wxGridEvent
+case 194: {// wxGridEvent
  wxGridEvent * ev = (wxGridEvent *) event;
     evClass = (char*)"wxGridEvent";
     rt.addAtom((char*)"wxGrid");
@@ -645,7 +628,7 @@ case 195: {// wxGridEvent
     rt.addTupleCount(11);
   break;
 }
-case 197: {// wxSashEvent
+case 196: {// wxSashEvent
  wxSashEvent * ev = (wxSashEvent *) event;
     evClass = (char*)"wxSashEvent";
     rt.addAtom((char*)"wxSash");
@@ -656,7 +639,7 @@ case 197: {// wxSashEvent
     rt.addTupleCount(5);
   break;
 }
-case 198: {// wxListEvent
+case 197: {// wxListEvent
  wxListEvent * ev = (wxListEvent *) event;
     evClass = (char*)"wxListEvent";
     rt.addAtom((char*)"wxList");
@@ -669,7 +652,7 @@ case 198: {// wxListEvent
     rt.addTupleCount(7);
   break;
 }
-case 199: {// wxDateEvent
+case 198: {// wxDateEvent
  wxDateEvent * ev = (wxDateEvent *) event;
     evClass = (char*)"wxDateEvent";
     rt.addAtom((char*)"wxDate");
@@ -678,14 +661,14 @@ case 199: {// wxDateEvent
     rt.addTupleCount(3);
   break;
 }
-case 200: {// wxCalendarEvent
+case 199: {// wxCalendarEvent
     evClass = (char*)"wxCalendarEvent";
     rt.addAtom((char*)"wxCalendar");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 201: {// wxFileDirPickerEvent
+case 200: {// wxFileDirPickerEvent
  wxFileDirPickerEvent * ev = (wxFileDirPickerEvent *) event;
     evClass = (char*)"wxFileDirPickerEvent";
     rt.addAtom((char*)"wxFileDirPicker");
@@ -694,7 +677,7 @@ case 201: {// wxFileDirPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 202: {// wxColourPickerEvent
+case 201: {// wxColourPickerEvent
  wxColourPickerEvent * ev = (wxColourPickerEvent *) event;
     evClass = (char*)"wxColourPickerEvent";
     rt.addAtom((char*)"wxColourPicker");
@@ -703,7 +686,7 @@ case 202: {// wxColourPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 203: {// wxFontPickerEvent
+case 202: {// wxFontPickerEvent
  wxFontPickerEvent * ev = (wxFontPickerEvent *) event;
  wxFont * GetFont = new wxFont(ev->GetFont());
  app->newPtr((void *) GetFont,3, memenv);
@@ -714,7 +697,7 @@ case 203: {// wxFontPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 204: {// wxStyledTextEvent
+case 203: {// wxStyledTextEvent
  wxStyledTextEvent * ev = (wxStyledTextEvent *) event;
     evClass = (char*)"wxStyledTextEvent";
     rt.addAtom((char*)"wxStyledText");
@@ -742,7 +725,7 @@ case 204: {// wxStyledTextEvent
     rt.addTupleCount(22);
   break;
 }
-case 209: {// wxTreeEvent
+case 208: {// wxTreeEvent
  wxTreeEvent * ev = (wxTreeEvent *) event;
     evClass = (char*)"wxTreeEvent";
     rt.addAtom((char*)"wxTree");
@@ -753,14 +736,14 @@ case 209: {// wxTreeEvent
     rt.addTupleCount(5);
   break;
 }
-case 210: {// wxNotebookEvent
+case 209: {// wxNotebookEvent
     evClass = (char*)"wxNotebookEvent";
     rt.addAtom((char*)"wxNotebook");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 216: {// wxSpinEvent
+case 215: {// wxSpinEvent
  wxSpinEvent * ev = (wxSpinEvent *) event;
     evClass = (char*)"wxSpinEvent";
     rt.addAtom((char*)"wxSpin");
@@ -769,14 +752,14 @@ case 216: {// wxSpinEvent
     rt.addTupleCount(3);
   break;
 }
-case 218: {// wxSplitterEvent
+case 217: {// wxSplitterEvent
     evClass = (char*)"wxSplitterEvent";
     rt.addAtom((char*)"wxSplitter");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 220: {// wxHtmlLinkEvent
+case 219: {// wxHtmlLinkEvent
  wxHtmlLinkEvent * ev = (wxHtmlLinkEvent *) event;
     evClass = (char*)"wxHtmlLinkEvent";
     rt.addAtom((char*)"wxHtmlLink");
@@ -785,7 +768,7 @@ case 220: {// wxHtmlLinkEvent
     rt.addTupleCount(3);
   break;
 }
-case 223: {// wxAuiNotebookEvent
+case 222: {// wxAuiNotebookEvent
  wxAuiNotebookEvent * ev = (wxAuiNotebookEvent *) event;
  wxAuiNotebook * GetDragSource = ev->GetDragSource();
     evClass = (char*)"wxAuiNotebookEvent";
@@ -797,7 +780,7 @@ case 223: {// wxAuiNotebookEvent
     rt.addTupleCount(5);
   break;
 }
-case 224: {// wxAuiManagerEvent
+case 223: {// wxAuiManagerEvent
  wxAuiManagerEvent * ev = (wxAuiManagerEvent *) event;
  wxAuiManager * GetManager = ev->GetManager();
  wxAuiPaneInfo * GetPane = ev->GetPane();
@@ -814,7 +797,7 @@ case 224: {// wxAuiManagerEvent
     rt.addTupleCount(8);
   break;
 }
-case 227: {// wxTaskBarIconEvent
+case 226: {// wxTaskBarIconEvent
     evClass = (char*)"wxTaskBarIconEvent";
     rt.addAtom((char*)"wxTaskBarIcon");
     rt.addAtom(Etype->eName);
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 15012011ed..5fbe8a2a9e 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -27,6 +27,15 @@
 #include "wxe_macros.h"
 #include "wxe_derived_dest.h"
 
+#if !wxCHECK_VERSION(2,9,0)
+#define wxPenJoin int
+#define wxPenCap int
+#define wxImageResizeQuality int
+#define wxPolygonFillMode int
+#define wxMappingMode int
+#define wxRasterOperationMode int
+#define wxFloodFillStyle int
+#endif
 void WxeApp::wxe_dispatch(wxeCommand& Ecmd)
 {
  char * bp = Ecmd.buffer;
@@ -149,7 +158,7 @@ case wxWindow_new_3: { // wxWindow::wxWindow
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxWindow * Result = new EwxWindow(parent,(wxWindowID) *id,pos,size,style);
+ wxWindow * Result = new EwxWindow(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
@@ -326,7 +335,7 @@ case wxWindow_FindWindow_1_0: { // wxWindow::FindWindow
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * winid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->FindWindow((long) *winid);
+ wxWindow * Result = (wxWindow*)This->FindWindow(*winid);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -349,7 +358,7 @@ case wxWindow_FindWindowById: { // wxWindow::FindWindowById
 parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxWindow * Result = (wxWindow*)wxWindow::FindWindowById((long) *winid,parent);
+ wxWindow * Result = (wxWindow*)wxWindow::FindWindowById(*winid,parent);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -615,7 +624,7 @@ case wxWindow_GetScrollPos: { // wxWindow::GetScrollPos
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetScrollPos((int) *orient);
+ int Result = This->GetScrollPos(*orient);
  rt.addInt(Result);
  break;
 }
@@ -623,7 +632,7 @@ case wxWindow_GetScrollRange: { // wxWindow::GetScrollRange
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetScrollRange((int) *orient);
+ int Result = This->GetScrollRange(*orient);
  rt.addInt(Result);
  break;
 }
@@ -631,7 +640,7 @@ case wxWindow_GetScrollThumb: { // wxWindow::GetScrollThumb
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetScrollThumb((int) *orient);
+ int Result = This->GetScrollThumb(*orient);
  rt.addInt(Result);
  break;
 }
@@ -719,7 +728,7 @@ case wxWindow_HasScrollbar: { // wxWindow::HasScrollbar
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->HasScrollbar((int) *orient);
+ bool Result = This->HasScrollbar(*orient);
  rt.addBool(Result);
  break;
 }
@@ -767,7 +776,7 @@ case wxWindow_IsExposed_2: { // wxWindow::IsExposed
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsExposed((int) *x,(int) *y);
+ bool Result = This->IsExposed(*x,*y);
  rt.addBool(Result);
  break;
 }
@@ -778,7 +787,7 @@ case wxWindow_IsExposed_4: { // wxWindow::IsExposed
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsExposed((int) *x,(int) *y,(int) *w,(int) *h);
+ bool Result = This->IsExposed(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -877,7 +886,7 @@ case wxWindow_Move_3: { // wxWindow::Move
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Move((int) *x,(int) *y,flags);
+ This->Move(*x,*y,flags);
  break;
 }
 case wxWindow_Move_2: { // wxWindow::Move
@@ -975,7 +984,7 @@ case wxWindow_PopupMenu_3: { // wxWindow::PopupMenu
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->PopupMenu(menu,(int) *x,(int) *y);
+ bool Result = This->PopupMenu(menu,*x,*y);
  rt.addBool(Result);
  break;
 }
@@ -1071,7 +1080,7 @@ case wxWindow_ScrollLines: { // wxWindow::ScrollLines
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * lines = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ScrollLines((int) *lines);
+ bool Result = This->ScrollLines(*lines);
  rt.addBool(Result);
  break;
 }
@@ -1079,7 +1088,7 @@ case wxWindow_ScrollPages: { // wxWindow::ScrollPages
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * pages = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ScrollPages((int) *pages);
+ bool Result = This->ScrollPages(*pages);
  rt.addBool(Result);
  break;
 }
@@ -1100,7 +1109,7 @@ case wxWindow_ScrollWindow: { // wxWindow::ScrollWindow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->ScrollWindow((int) *dx,(int) *dy,rect);
+ This->ScrollWindow(*dx,*dy,rect);
  break;
 }
 case wxWindow_SetAcceleratorTable: { // wxWindow::SetAcceleratorTable
@@ -1114,7 +1123,7 @@ case wxWindow_SetAutoLayout: { // wxWindow::SetAutoLayout
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  bool * autoLayout = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAutoLayout((bool) *autoLayout);
+ This->SetAutoLayout(*autoLayout);
  break;
 }
 case wxWindow_SetBackgroundColour: { // wxWindow::SetBackgroundColour
@@ -1133,7 +1142,7 @@ case wxWindow_SetBackgroundStyle: { // wxWindow::SetBackgroundStyle
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxBackgroundStyle style = *(wxBackgroundStyle *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetBackgroundStyle((wxBackgroundStyle) style);
+ bool Result = This->SetBackgroundStyle(style);
  rt.addBool(Result);
  break;
 }
@@ -1149,7 +1158,7 @@ case wxWindow_SetClientSize_2: { // wxWindow::SetClientSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetClientSize((int) *width,(int) *height);
+ This->SetClientSize(*width,*height);
  break;
 }
 case wxWindow_SetClientSize_1_0: { // wxWindow::SetClientSize
@@ -1245,7 +1254,7 @@ case wxWindow_SetExtraStyle: { // wxWindow::SetExtraStyle
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * exStyle = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetExtraStyle((long) *exStyle);
+ This->SetExtraStyle(*exStyle);
  break;
 }
 case wxWindow_SetFocus: { // wxWindow::SetFocus
@@ -1293,7 +1302,7 @@ case wxWindow_SetId: { // wxWindow::SetId
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * winid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetId((wxWindowID) *winid);
+ This->SetId(*winid);
  break;
 }
 case wxWindow_SetLabel: { // wxWindow::SetLabel
@@ -1335,7 +1344,7 @@ case wxWindow_SetScrollbar: { // wxWindow::SetScrollbar
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollbar((int) *orient,(int) *pos,(int) *thumbVisible,(int) *range,refresh);
+ This->SetScrollbar(*orient,*pos,*thumbVisible,*range,refresh);
  break;
 }
 case wxWindow_SetScrollPos: { // wxWindow::SetScrollPos
@@ -1350,7 +1359,7 @@ case wxWindow_SetScrollPos: { // wxWindow::SetScrollPos
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollPos((int) *orient,(int) *pos,refresh);
+ This->SetScrollPos(*orient,*pos,refresh);
  break;
 }
 case wxWindow_SetSize_5: { // wxWindow::SetSize
@@ -1367,7 +1376,7 @@ case wxWindow_SetSize_5: { // wxWindow::SetSize
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSize((int) *x,(int) *y,(int) *width,(int) *height,sizeFlags);
+ This->SetSize(*x,*y,*width,*height,sizeFlags);
  break;
 }
 case wxWindow_SetSize_2_0: { // wxWindow::SetSize
@@ -1375,7 +1384,7 @@ case wxWindow_SetSize_2_0: { // wxWindow::SetSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSize((int) *width,(int) *height);
+ This->SetSize(*width,*height);
  break;
 }
 case wxWindow_SetSize_1: { // wxWindow::SetSize
@@ -1429,7 +1438,7 @@ case wxWindow_SetSizeHints_3: { // wxWindow::SetSizeHints
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSizeHints((int) *minW,(int) *minH,maxW,maxH,incW,incH);
+ This->SetSizeHints(*minW,*minH,maxW,maxH,incW,incH);
  break;
 }
 case wxWindow_SetSizeHints_2: { // wxWindow::SetSizeHints
@@ -1488,7 +1497,7 @@ case wxWindow_SetThemeEnabled: { // wxWindow::SetThemeEnabled
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  bool * enableTheme = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetThemeEnabled((bool) *enableTheme);
+ This->SetThemeEnabled(*enableTheme);
  break;
 }
 case wxWindow_SetToolTip_1_0: { // wxWindow::SetToolTip
@@ -1521,7 +1530,7 @@ case wxWindow_SetVirtualSize_2: { // wxWindow::SetVirtualSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetVirtualSize((int) *x,(int) *y);
+ This->SetVirtualSize(*x,*y);
  break;
 }
 case wxWindow_SetVirtualSizeHints_3: { // wxWindow::SetVirtualSizeHints
@@ -1540,7 +1549,7 @@ case wxWindow_SetVirtualSizeHints_3: { // wxWindow::SetVirtualSizeHints
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetVirtualSizeHints((int) *minW,(int) *minH,maxW,maxH);
+ This->SetVirtualSizeHints(*minW,*minH,maxW,maxH);
  break;
 }
 case wxWindow_SetVirtualSizeHints_2: { // wxWindow::SetVirtualSizeHints
@@ -1566,21 +1575,21 @@ case wxWindow_SetWindowStyle: { // wxWindow::SetWindowStyle
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyle((long) *style);
+ This->SetWindowStyle(*style);
  break;
 }
 case wxWindow_SetWindowStyleFlag: { // wxWindow::SetWindowStyleFlag
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyleFlag((long) *style);
+ This->SetWindowStyleFlag(*style);
  break;
 }
 case wxWindow_SetWindowVariant: { // wxWindow::SetWindowVariant
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxWindowVariant variant = *(wxWindowVariant *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetWindowVariant((wxWindowVariant) variant);
+ This->SetWindowVariant(variant);
  break;
 }
 case wxWindow_ShouldInheritColours: { // wxWindow::ShouldInheritColours
@@ -1655,13 +1664,13 @@ case wxWindow_WarpPointer: { // wxWindow::WarpPointer
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->WarpPointer((int) *x,(int) *y);
+ This->WarpPointer(*x,*y);
  break;
 }
 case wxTopLevelWindow_GetIcon: { // wxTopLevelWindow::GetIcon
  wxTopLevelWindow *This = (wxTopLevelWindow *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = &This->GetIcon();
+ const wxIcon * Result = new wxIcon(This->GetIcon()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -1813,7 +1822,7 @@ case wxTopLevelWindow_ShowFullScreen: { // wxTopLevelWindow::ShowFullScreen
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->ShowFullScreen((bool) *show,style);
+ bool Result = This->ShowFullScreen(*show,style);
  rt.addBool(Result);
  break;
 }
@@ -1843,7 +1852,7 @@ case wxFrame_new_4: { // wxFrame::wxFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxFrame * Result = new EwxFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxFrame * Result = new EwxFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFrame");
  break;
@@ -1882,7 +1891,7 @@ case wxFrame_Create: { // wxFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -1965,7 +1974,7 @@ case wxFrame_ProcessCommand: { // wxFrame::ProcessCommand
  wxFrame *This = (wxFrame *) getPtr(bp,memenv); bp += 4;
  int * winid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ProcessCommand((int) *winid);
+ bool Result = This->ProcessCommand(*winid);
  rt.addBool(Result);
  break;
 }
@@ -1993,7 +2002,7 @@ case wxFrame_SetStatusBarPane: { // wxFrame::SetStatusBarPane
  wxFrame *This = (wxFrame *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStatusBarPane((int) *n);
+ This->SetStatusBarPane(*n);
  break;
 }
 case wxFrame_SetStatusText: { // wxFrame::SetStatusText
@@ -2058,7 +2067,7 @@ case wxMiniFrame_new_4: { // wxMiniFrame::wxMiniFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxMiniFrame * Result = new EwxMiniFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxMiniFrame * Result = new EwxMiniFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMiniFrame");
  break;
@@ -2091,7 +2100,7 @@ case wxMiniFrame_Create: { // wxMiniFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -2128,7 +2137,7 @@ case wxSplashScreen_new_6: { // wxSplashScreen::wxSplashScreen
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxSplashScreen * Result = new EwxSplashScreen(*bitmap,(long) *splashStyle,(int) *milliseconds,parent,(wxWindowID) *id,pos,size,style);
+ wxSplashScreen * Result = new EwxSplashScreen(*bitmap,*splashStyle,*milliseconds,parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSplashScreen");
  break;
@@ -2166,7 +2175,7 @@ case wxPanel_new_6: { // wxPanel::wxPanel
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxPanel * Result = new EwxPanel(parent,(int) *x,(int) *y,(int) *width,(int) *height,style);
+ wxPanel * Result = new EwxPanel(parent,*x,*y,*width,*height,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxPanel");
  break;
@@ -2254,7 +2263,7 @@ case wxScrolledWindow_CalcScrolledPosition_4: { // wxScrolledWindow::CalcScrolle
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CalcScrolledPosition((int) *x,(int) *y,&xx,&yy);
+ This->CalcScrolledPosition(*x,*y,&xx,&yy);
  rt.addInt(xx);
  rt.addInt(yy);
  rt.addTupleCount(2);
@@ -2277,7 +2286,7 @@ case wxScrolledWindow_CalcUnscrolledPosition_4: { // wxScrolledWindow::CalcUnscr
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CalcUnscrolledPosition((int) *x,(int) *y,&xx,&yy);
+ This->CalcUnscrolledPosition(*x,*y,&xx,&yy);
  rt.addInt(xx);
  rt.addInt(yy);
  rt.addTupleCount(2);
@@ -2298,7 +2307,7 @@ case wxScrolledWindow_EnableScrolling: { // wxScrolledWindow::EnableScrolling
  bool * x_scrolling = (bool *) bp; bp += 4;
  bool * y_scrolling = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableScrolling((bool) *x_scrolling,(bool) *y_scrolling);
+ This->EnableScrolling(*x_scrolling,*y_scrolling);
  break;
 }
 case wxScrolledWindow_GetScrollPixelsPerUnit: { // wxScrolledWindow::GetScrollPixelsPerUnit
@@ -2342,7 +2351,7 @@ case wxScrolledWindow_Scroll: { // wxScrolledWindow::Scroll
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Scroll((int) *x,(int) *y);
+ This->Scroll(*x,*y);
  break;
 }
 case wxScrolledWindow_SetScrollbars: { // wxScrolledWindow::SetScrollbars
@@ -2367,7 +2376,7 @@ case wxScrolledWindow_SetScrollbars: { // wxScrolledWindow::SetScrollbars
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollbars((int) *pixelsPerUnitX,(int) *pixelsPerUnitY,(int) *noUnitsX,(int) *noUnitsY,xPos,yPos,noRefresh);
+ This->SetScrollbars(*pixelsPerUnitX,*pixelsPerUnitY,*noUnitsX,*noUnitsY,xPos,yPos,noRefresh);
  break;
 }
 case wxScrolledWindow_SetScrollRate: { // wxScrolledWindow::SetScrollRate
@@ -2375,7 +2384,7 @@ case wxScrolledWindow_SetScrollRate: { // wxScrolledWindow::SetScrollRate
  int * xstep = (int *) bp; bp += 4;
  int * ystep = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollRate((int) *xstep,(int) *ystep);
+ This->SetScrollRate(*xstep,*ystep);
  break;
 }
 case wxScrolledWindow_SetTargetWindow: { // wxScrolledWindow::SetTargetWindow
@@ -2427,7 +2436,7 @@ case wxSashWindow_GetSashVisible: { // wxSashWindow::GetSashVisible
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  wxSashEdgePosition edge = *(wxSashEdgePosition *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetSashVisible((wxSashEdgePosition) edge);
+ bool Result = This->GetSashVisible(edge);
  rt.addBool(Result);
  break;
 }
@@ -2463,28 +2472,28 @@ case wxSashWindow_SetMaximumSizeX: { // wxSashWindow::SetMaximumSizeX
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * max = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaximumSizeX((int) *max);
+ This->SetMaximumSizeX(*max);
  break;
 }
 case wxSashWindow_SetMaximumSizeY: { // wxSashWindow::SetMaximumSizeY
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * max = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaximumSizeY((int) *max);
+ This->SetMaximumSizeY(*max);
  break;
 }
 case wxSashWindow_SetMinimumSizeX: { // wxSashWindow::SetMinimumSizeX
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * min = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinimumSizeX((int) *min);
+ This->SetMinimumSizeX(*min);
  break;
 }
 case wxSashWindow_SetMinimumSizeY: { // wxSashWindow::SetMinimumSizeY
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * min = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinimumSizeY((int) *min);
+ This->SetMinimumSizeY(*min);
  break;
 }
 case wxSashWindow_SetSashVisible: { // wxSashWindow::SetSashVisible
@@ -2492,7 +2501,7 @@ case wxSashWindow_SetSashVisible: { // wxSashWindow::SetSashVisible
  wxSashEdgePosition edge = *(wxSashEdgePosition *) bp; bp += 4;;
  bool * sash = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSashVisible((wxSashEdgePosition) edge,(bool) *sash);
+ This->SetSashVisible(edge,*sash);
  break;
 }
 case wxSashLayoutWindow_new_0: { // wxSashLayoutWindow::wxSashLayoutWindow
@@ -2583,7 +2592,7 @@ case wxSashLayoutWindow_SetAlignment: { // wxSashLayoutWindow::SetAlignment
  wxSashLayoutWindow *This = (wxSashLayoutWindow *) getPtr(bp,memenv); bp += 4;
  wxLayoutAlignment align = *(wxLayoutAlignment *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetAlignment((wxLayoutAlignment) align);
+ This->SetAlignment(align);
  break;
 }
 case wxSashLayoutWindow_SetDefaultSize: { // wxSashLayoutWindow::SetDefaultSize
@@ -2599,7 +2608,7 @@ case wxSashLayoutWindow_SetOrientation: { // wxSashLayoutWindow::SetOrientation
  wxSashLayoutWindow *This = (wxSashLayoutWindow *) getPtr(bp,memenv); bp += 4;
  wxLayoutOrientation orient = *(wxLayoutOrientation *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetOrientation((wxLayoutOrientation) orient);
+ This->SetOrientation(orient);
  break;
 }
 case wxGrid_new_0: { // wxGrid::wxGrid
@@ -2631,7 +2640,7 @@ case wxGrid_new_3: { // wxGrid::wxGrid
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxGrid * Result = new EwxGrid(parent,(wxWindowID) *id,pos,size,style);
+ wxGrid * Result = new EwxGrid(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGrid");
  break;
@@ -2655,7 +2664,7 @@ case wxGrid_new_4: { // wxGrid::wxGrid
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxGrid * Result = new EwxGrid(parent,(int) *x,(int) *y,w,h,style);
+ wxGrid * Result = new EwxGrid(parent,*x,*y,w,h,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGrid");
  break;
@@ -2712,7 +2721,7 @@ case wxGrid_AutoSizeColumn: { // wxGrid::AutoSizeColumn
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AutoSizeColumn((int) *col,setAsMin);
+ This->AutoSizeColumn(*col,setAsMin);
  break;
 }
 case wxGrid_AutoSizeColumns: { // wxGrid::AutoSizeColumns
@@ -2738,7 +2747,7 @@ case wxGrid_AutoSizeRow: { // wxGrid::AutoSizeRow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AutoSizeRow((int) *row,setAsMin);
+ This->AutoSizeRow(*row,setAsMin);
  break;
 }
 case wxGrid_AutoSizeRows: { // wxGrid::AutoSizeRows
@@ -2806,7 +2815,7 @@ case wxGrid_CellToRect_2: { // wxGrid::CellToRect
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxRect Result = This->CellToRect((int) *row,(int) *col);
+ wxRect Result = This->CellToRect(*row,*col);
  rt.add(Result);
  break;
 }
@@ -2844,7 +2853,7 @@ selmode = *(wxGrid::wxGridSelectionModes *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->CreateGrid((int) *numRows,(int) *numCols,(wxGrid::wxGridSelectionModes) selmode);
+ bool Result = This->CreateGrid(*numRows,*numCols,selmode);
  rt.addBool(Result);
  break;
 }
@@ -2972,7 +2981,7 @@ case wxGrid_EnableEditing: { // wxGrid::EnableEditing
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * edit = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableEditing((bool) *edit);
+ This->EnableEditing(*edit);
  break;
 }
 case wxGrid_EnableGridLines: { // wxGrid::EnableGridLines
@@ -3020,7 +3029,7 @@ case wxGrid_GetCellAlignment: { // wxGrid::GetCellAlignment
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->GetCellAlignment((int) *row,(int) *col,&horiz,&vert);
+ This->GetCellAlignment(*row,*col,&horiz,&vert);
  rt.addInt(horiz);
  rt.addInt(vert);
  rt.addTupleCount(2);
@@ -3031,7 +3040,7 @@ case wxGrid_GetCellBackgroundColour: { // wxGrid::GetCellBackgroundColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetCellBackgroundColour((int) *row,(int) *col);
+ wxColour Result = This->GetCellBackgroundColour(*row,*col);
  rt.add(Result);
  break;
 }
@@ -3040,7 +3049,7 @@ case wxGrid_GetCellEditor: { // wxGrid::GetCellEditor
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellEditor * Result = (wxGridCellEditor*)This->GetCellEditor((int) *row,(int) *col);
+ wxGridCellEditor * Result = (wxGridCellEditor*)This->GetCellEditor(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellEditor");
  break;
 }
@@ -3049,7 +3058,7 @@ case wxGrid_GetCellFont: { // wxGrid::GetCellFont
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetCellFont((int) *row,(int) *col)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new wxFont(This->GetCellFont(*row,*col)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -3058,7 +3067,7 @@ case wxGrid_GetCellRenderer: { // wxGrid::GetCellRenderer
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetCellRenderer((int) *row,(int) *col);
+ wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetCellRenderer(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellRenderer");
  break;
 }
@@ -3067,7 +3076,7 @@ case wxGrid_GetCellTextColour: { // wxGrid::GetCellTextColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetCellTextColour((int) *row,(int) *col);
+ wxColour Result = This->GetCellTextColour(*row,*col);
  rt.add(Result);
  break;
 }
@@ -3076,7 +3085,7 @@ case wxGrid_GetCellValue_2: { // wxGrid::GetCellValue
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetCellValue((int) *row,(int) *col);
+ wxString Result = This->GetCellValue(*row,*col);
  rt.add(Result);
  break;
 }
@@ -3112,7 +3121,7 @@ case wxGrid_GetColLabelValue: { // wxGrid::GetColLabelValue
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetColLabelValue((int) *col);
+ wxString Result = This->GetColLabelValue(*col);
  rt.add(Result);
  break;
 }
@@ -3181,7 +3190,7 @@ case wxGrid_GetDefaultEditorForCell_2: { // wxGrid::GetDefaultEditorForCell
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellEditor * Result = (wxGridCellEditor*)This->GetDefaultEditorForCell((int) *row,(int) *col);
+ wxGridCellEditor * Result = (wxGridCellEditor*)This->GetDefaultEditorForCell(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellEditor");
  break;
 }
@@ -3217,7 +3226,7 @@ case wxGrid_GetDefaultRendererForCell: { // wxGrid::GetDefaultRendererForCell
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetDefaultRendererForCell((int) *row,(int) *col);
+ wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetDefaultRendererForCell(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellRenderer");
  break;
 }
@@ -3313,7 +3322,7 @@ case wxGrid_GetOrCreateCellAttr: { // wxGrid::GetOrCreateCellAttr
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellAttr * Result = (wxGridCellAttr*)This->GetOrCreateCellAttr((int) *row,(int) *col);
+ wxGridCellAttr * Result = (wxGridCellAttr*)This->GetOrCreateCellAttr(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellAttr");
  break;
 }
@@ -3346,7 +3355,7 @@ case wxGrid_GetRowLabelValue: { // wxGrid::GetRowLabelValue
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetRowLabelValue((int) *row);
+ wxString Result = This->GetRowLabelValue(*row);
  rt.add(Result);
  break;
 }
@@ -3354,7 +3363,7 @@ case wxGrid_GetRowSize: { // wxGrid::GetRowSize
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetRowSize((int) *row);
+ int Result = This->GetRowSize(*row);
  rt.addInt(Result);
  break;
 }
@@ -3541,7 +3550,7 @@ case wxGrid_IsInSelection_2: { // wxGrid::IsInSelection
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsInSelection((int) *row,(int) *col);
+ bool Result = This->IsInSelection(*row,*col);
  rt.addBool(Result);
  break;
 }
@@ -3560,7 +3569,7 @@ case wxGrid_IsReadOnly: { // wxGrid::IsReadOnly
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsReadOnly((int) *row,(int) *col);
+ bool Result = This->IsReadOnly(*row,*col);
  rt.addBool(Result);
  break;
 }
@@ -3583,7 +3592,7 @@ case wxGrid_IsVisible_3: { // wxGrid::IsVisible
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsVisible((int) *row,(int) *col,wholeCellVisible);
+ bool Result = This->IsVisible(*row,*col,wholeCellVisible);
  rt.addBool(Result);
  break;
 }
@@ -3609,7 +3618,7 @@ case wxGrid_MakeCellVisible_2: { // wxGrid::MakeCellVisible
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MakeCellVisible((int) *row,(int) *col);
+ This->MakeCellVisible(*row,*col);
  break;
 }
 case wxGrid_MakeCellVisible_1: { // wxGrid::MakeCellVisible
@@ -3625,7 +3634,7 @@ case wxGrid_MoveCursorDown: { // wxGrid::MoveCursorDown
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorDown((bool) *expandSelection);
+ bool Result = This->MoveCursorDown(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3633,7 +3642,7 @@ case wxGrid_MoveCursorLeft: { // wxGrid::MoveCursorLeft
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorLeft((bool) *expandSelection);
+ bool Result = This->MoveCursorLeft(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3641,7 +3650,7 @@ case wxGrid_MoveCursorRight: { // wxGrid::MoveCursorRight
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorRight((bool) *expandSelection);
+ bool Result = This->MoveCursorRight(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3649,7 +3658,7 @@ case wxGrid_MoveCursorUp: { // wxGrid::MoveCursorUp
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorUp((bool) *expandSelection);
+ bool Result = This->MoveCursorUp(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3657,7 +3666,7 @@ case wxGrid_MoveCursorDownBlock: { // wxGrid::MoveCursorDownBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorDownBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorDownBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3665,7 +3674,7 @@ case wxGrid_MoveCursorLeftBlock: { // wxGrid::MoveCursorLeftBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorLeftBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorLeftBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3673,7 +3682,7 @@ case wxGrid_MoveCursorRightBlock: { // wxGrid::MoveCursorRightBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorRightBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorRightBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3681,7 +3690,7 @@ case wxGrid_MoveCursorUpBlock: { // wxGrid::MoveCursorUpBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorUpBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorUpBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3736,7 +3745,7 @@ case wxGrid_SelectBlock_5: { // wxGrid::SelectBlock
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SelectBlock((int) *topRow,(int) *leftCol,(int) *bottomRow,(int) *rightCol,addToSelected);
+ This->SelectBlock(*topRow,*leftCol,*bottomRow,*rightCol,addToSelected);
  break;
 }
 case wxGrid_SelectBlock_3: { // wxGrid::SelectBlock
@@ -3768,7 +3777,7 @@ case wxGrid_SelectCol: { // wxGrid::SelectCol
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SelectCol((int) *col,addToSelected);
+ This->SelectCol(*col,addToSelected);
  break;
 }
 case wxGrid_SelectRow: { // wxGrid::SelectRow
@@ -3781,7 +3790,7 @@ case wxGrid_SelectRow: { // wxGrid::SelectRow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SelectRow((int) *row,addToSelected);
+ This->SelectRow(*row,addToSelected);
  break;
 }
 case wxGrid_SetCellAlignment_4: { // wxGrid::SetCellAlignment
@@ -3791,7 +3800,7 @@ case wxGrid_SetCellAlignment_4: { // wxGrid::SetCellAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellAlignment((int) *row,(int) *col,(int) *horiz,(int) *vert);
+ This->SetCellAlignment(*row,*col,*horiz,*vert);
  break;
 }
 case wxGrid_SetCellAlignment_3: { // wxGrid::SetCellAlignment
@@ -3800,14 +3809,14 @@ case wxGrid_SetCellAlignment_3: { // wxGrid::SetCellAlignment
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellAlignment((int) *align,(int) *row,(int) *col);
+ This->SetCellAlignment(*align,*row,*col);
  break;
 }
 case wxGrid_SetCellAlignment_1: { // wxGrid::SetCellAlignment
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * align = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellAlignment((int) *align);
+ This->SetCellAlignment(*align);
  break;
 }
 case wxGrid_SetCellBackgroundColour_3_0: { // wxGrid::SetCellBackgroundColour
@@ -3820,7 +3829,7 @@ case wxGrid_SetCellBackgroundColour_3_0: { // wxGrid::SetCellBackgroundColour
  int * valA = (int *) bp; bp += 4;
  wxColour val = wxColour(*valR,*valG,*valB,*valA);
  if(!This) throw wxe_badarg(0);
- This->SetCellBackgroundColour((int) *row,(int) *col,val);
+ This->SetCellBackgroundColour(*row,*col,val);
  break;
 }
 case wxGrid_SetCellBackgroundColour_1: { // wxGrid::SetCellBackgroundColour
@@ -3844,7 +3853,7 @@ case wxGrid_SetCellBackgroundColour_3_1: { // wxGrid::SetCellBackgroundColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellBackgroundColour(colour,(int) *row,(int) *col);
+ This->SetCellBackgroundColour(colour,*row,*col);
  break;
 }
 case wxGrid_SetCellEditor: { // wxGrid::SetCellEditor
@@ -3853,7 +3862,7 @@ case wxGrid_SetCellEditor: { // wxGrid::SetCellEditor
  int * col = (int *) bp; bp += 4;
  wxGridCellEditor *editor = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellEditor((int) *row,(int) *col,editor);
+ This->SetCellEditor(*row,*col,editor);
  break;
 }
 case wxGrid_SetCellFont: { // wxGrid::SetCellFont
@@ -3862,7 +3871,7 @@ case wxGrid_SetCellFont: { // wxGrid::SetCellFont
  int * col = (int *) bp; bp += 4;
  wxFont *val = (wxFont *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellFont((int) *row,(int) *col,*val);
+ This->SetCellFont(*row,*col,*val);
  break;
 }
 case wxGrid_SetCellRenderer: { // wxGrid::SetCellRenderer
@@ -3871,7 +3880,7 @@ case wxGrid_SetCellRenderer: { // wxGrid::SetCellRenderer
  int * col = (int *) bp; bp += 4;
  wxGridCellRenderer *renderer = (wxGridCellRenderer *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellRenderer((int) *row,(int) *col,renderer);
+ This->SetCellRenderer(*row,*col,renderer);
  break;
 }
 case wxGrid_SetCellTextColour_3_0: { // wxGrid::SetCellTextColour
@@ -3884,7 +3893,7 @@ case wxGrid_SetCellTextColour_3_0: { // wxGrid::SetCellTextColour
  int * valA = (int *) bp; bp += 4;
  wxColour val = wxColour(*valR,*valG,*valB,*valA);
  if(!This) throw wxe_badarg(0);
- This->SetCellTextColour((int) *row,(int) *col,val);
+ This->SetCellTextColour(*row,*col,val);
  break;
 }
 case wxGrid_SetCellTextColour_3_1: { // wxGrid::SetCellTextColour
@@ -3897,7 +3906,7 @@ case wxGrid_SetCellTextColour_3_1: { // wxGrid::SetCellTextColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellTextColour(val,(int) *row,(int) *col);
+ This->SetCellTextColour(val,*row,*col);
  break;
 }
 case wxGrid_SetCellTextColour_1: { // wxGrid::SetCellTextColour
@@ -3919,7 +3928,7 @@ case wxGrid_SetCellValue_3_0: { // wxGrid::SetCellValue
  wxString s = wxString(bp, wxConvUTF8);
  bp += *sLen+((8-((0+ *sLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetCellValue((int) *row,(int) *col,s);
+ This->SetCellValue(*row,*col,s);
  break;
 }
 case wxGrid_SetCellValue_2: { // wxGrid::SetCellValue
@@ -3942,7 +3951,7 @@ case wxGrid_SetCellValue_3_1: { // wxGrid::SetCellValue
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellValue(val,(int) *row,(int) *col);
+ This->SetCellValue(val,*row,*col);
  break;
 }
 case wxGrid_SetColAttr: { // wxGrid::SetColAttr
@@ -3950,21 +3959,21 @@ case wxGrid_SetColAttr: { // wxGrid::SetColAttr
  int * col = (int *) bp; bp += 4;
  wxGridCellAttr *attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColAttr((int) *col,attr);
+ This->SetColAttr(*col,attr);
  break;
 }
 case wxGrid_SetColFormatBool: { // wxGrid::SetColFormatBool
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColFormatBool((int) *col);
+ This->SetColFormatBool(*col);
  break;
 }
 case wxGrid_SetColFormatNumber: { // wxGrid::SetColFormatNumber
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColFormatNumber((int) *col);
+ This->SetColFormatNumber(*col);
  break;
 }
 case wxGrid_SetColFormatFloat: { // wxGrid::SetColFormatFloat
@@ -3981,7 +3990,7 @@ case wxGrid_SetColFormatFloat: { // wxGrid::SetColFormatFloat
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetColFormatFloat((int) *col,width,precision);
+ This->SetColFormatFloat(*col,width,precision);
  break;
 }
 case wxGrid_SetColFormatCustom: { // wxGrid::SetColFormatCustom
@@ -3991,7 +4000,7 @@ case wxGrid_SetColFormatCustom: { // wxGrid::SetColFormatCustom
  wxString typeName = wxString(bp, wxConvUTF8);
  bp += *typeNameLen+((8-((4+ *typeNameLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetColFormatCustom((int) *col,typeName);
+ This->SetColFormatCustom(*col,typeName);
  break;
 }
 case wxGrid_SetColLabelAlignment: { // wxGrid::SetColLabelAlignment
@@ -3999,14 +4008,14 @@ case wxGrid_SetColLabelAlignment: { // wxGrid::SetColLabelAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColLabelAlignment((int) *horiz,(int) *vert);
+ This->SetColLabelAlignment(*horiz,*vert);
  break;
 }
 case wxGrid_SetColLabelSize: { // wxGrid::SetColLabelSize
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColLabelSize((int) *height);
+ This->SetColLabelSize(*height);
  break;
 }
 case wxGrid_SetColLabelValue: { // wxGrid::SetColLabelValue
@@ -4016,7 +4025,7 @@ case wxGrid_SetColLabelValue: { // wxGrid::SetColLabelValue
  wxString val = wxString(bp, wxConvUTF8);
  bp += *valLen+((8-((4+ *valLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetColLabelValue((int) *col,val);
+ This->SetColLabelValue(*col,val);
  break;
 }
 case wxGrid_SetColMinimalWidth: { // wxGrid::SetColMinimalWidth
@@ -4024,14 +4033,14 @@ case wxGrid_SetColMinimalWidth: { // wxGrid::SetColMinimalWidth
  int * col = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColMinimalWidth((int) *col,(int) *width);
+ This->SetColMinimalWidth(*col,*width);
  break;
 }
 case wxGrid_SetColMinimalAcceptableWidth: { // wxGrid::SetColMinimalAcceptableWidth
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColMinimalAcceptableWidth((int) *width);
+ This->SetColMinimalAcceptableWidth(*width);
  break;
 }
 case wxGrid_SetColSize: { // wxGrid::SetColSize
@@ -4039,7 +4048,7 @@ case wxGrid_SetColSize: { // wxGrid::SetColSize
  int * col = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColSize((int) *col,(int) *width);
+ This->SetColSize(*col,*width);
  break;
 }
 case wxGrid_SetDefaultCellAlignment: { // wxGrid::SetDefaultCellAlignment
@@ -4047,7 +4056,7 @@ case wxGrid_SetDefaultCellAlignment: { // wxGrid::SetDefaultCellAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDefaultCellAlignment((int) *horiz,(int) *vert);
+ This->SetDefaultCellAlignment(*horiz,*vert);
  break;
 }
 case wxGrid_SetDefaultCellBackgroundColour: { // wxGrid::SetDefaultCellBackgroundColour
@@ -4103,7 +4112,7 @@ case wxGrid_SetDefaultColSize: { // wxGrid::SetDefaultColSize
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetDefaultColSize((int) *width,resizeExistingCols);
+ This->SetDefaultColSize(*width,resizeExistingCols);
  break;
 }
 case wxGrid_SetDefaultRowSize: { // wxGrid::SetDefaultRowSize
@@ -4116,7 +4125,7 @@ case wxGrid_SetDefaultRowSize: { // wxGrid::SetDefaultRowSize
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetDefaultRowSize((int) *height,resizeExistingRows);
+ This->SetDefaultRowSize(*height,resizeExistingRows);
  break;
 }
 case wxGrid_SetGridCursor: { // wxGrid::SetGridCursor
@@ -4124,7 +4133,7 @@ case wxGrid_SetGridCursor: { // wxGrid::SetGridCursor
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetGridCursor((int) *row,(int) *col);
+ This->SetGridCursor(*row,*col);
  break;
 }
 case wxGrid_SetGridLineColour: { // wxGrid::SetGridLineColour
@@ -4172,7 +4181,7 @@ case wxGrid_SetMargins: { // wxGrid::SetMargins
  int * extraWidth = (int *) bp; bp += 4;
  int * extraHeight = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMargins((int) *extraWidth,(int) *extraHeight);
+ This->SetMargins(*extraWidth,*extraHeight);
  break;
 }
 case wxGrid_SetReadOnly: { // wxGrid::SetReadOnly
@@ -4187,7 +4196,7 @@ case wxGrid_SetReadOnly: { // wxGrid::SetReadOnly
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetReadOnly((int) *row,(int) *col,isReadOnly);
+ This->SetReadOnly(*row,*col,isReadOnly);
  break;
 }
 case wxGrid_SetRowAttr: { // wxGrid::SetRowAttr
@@ -4195,7 +4204,7 @@ case wxGrid_SetRowAttr: { // wxGrid::SetRowAttr
  int * row = (int *) bp; bp += 4;
  wxGridCellAttr *attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowAttr((int) *row,attr);
+ This->SetRowAttr(*row,attr);
  break;
 }
 case wxGrid_SetRowLabelAlignment: { // wxGrid::SetRowLabelAlignment
@@ -4203,14 +4212,14 @@ case wxGrid_SetRowLabelAlignment: { // wxGrid::SetRowLabelAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowLabelAlignment((int) *horiz,(int) *vert);
+ This->SetRowLabelAlignment(*horiz,*vert);
  break;
 }
 case wxGrid_SetRowLabelSize: { // wxGrid::SetRowLabelSize
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowLabelSize((int) *width);
+ This->SetRowLabelSize(*width);
  break;
 }
 case wxGrid_SetRowLabelValue: { // wxGrid::SetRowLabelValue
@@ -4220,7 +4229,7 @@ case wxGrid_SetRowLabelValue: { // wxGrid::SetRowLabelValue
  wxString val = wxString(bp, wxConvUTF8);
  bp += *valLen+((8-((4+ *valLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetRowLabelValue((int) *row,val);
+ This->SetRowLabelValue(*row,val);
  break;
 }
 case wxGrid_SetRowMinimalHeight: { // wxGrid::SetRowMinimalHeight
@@ -4228,14 +4237,14 @@ case wxGrid_SetRowMinimalHeight: { // wxGrid::SetRowMinimalHeight
  int * row = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowMinimalHeight((int) *row,(int) *width);
+ This->SetRowMinimalHeight(*row,*width);
  break;
 }
 case wxGrid_SetRowMinimalAcceptableHeight: { // wxGrid::SetRowMinimalAcceptableHeight
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowMinimalAcceptableHeight((int) *width);
+ This->SetRowMinimalAcceptableHeight(*width);
  break;
 }
 case wxGrid_SetRowSize: { // wxGrid::SetRowSize
@@ -4243,21 +4252,21 @@ case wxGrid_SetRowSize: { // wxGrid::SetRowSize
  int * row = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowSize((int) *row,(int) *height);
+ This->SetRowSize(*row,*height);
  break;
 }
 case wxGrid_SetScrollLineX: { // wxGrid::SetScrollLineX
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollLineX((int) *x);
+ This->SetScrollLineX(*x);
  break;
 }
 case wxGrid_SetScrollLineY: { // wxGrid::SetScrollLineY
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollLineY((int) *y);
+ This->SetScrollLineY(*y);
  break;
 }
 case wxGrid_SetSelectionBackground: { // wxGrid::SetSelectionBackground
@@ -4286,7 +4295,7 @@ case wxGrid_SetSelectionMode: { // wxGrid::SetSelectionMode
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  wxGrid::wxGridSelectionModes selmode = *(wxGrid::wxGridSelectionModes *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionMode((wxGrid::wxGridSelectionModes) selmode);
+ This->SetSelectionMode(selmode);
  break;
 }
 case wxGrid_ShowCellEditControl: { // wxGrid::ShowCellEditControl
@@ -4305,7 +4314,7 @@ case wxGrid_XToCol: { // wxGrid::XToCol
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- int Result = This->XToCol((int) *x,clipToMinMax);
+ int Result = This->XToCol(*x,clipToMinMax);
  rt.addInt(Result);
  break;
 }
@@ -4313,7 +4322,7 @@ case wxGrid_XToEdgeOfCol: { // wxGrid::XToEdgeOfCol
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->XToEdgeOfCol((int) *x);
+ int Result = This->XToEdgeOfCol(*x);
  rt.addInt(Result);
  break;
 }
@@ -4321,7 +4330,7 @@ case wxGrid_YToEdgeOfRow: { // wxGrid::YToEdgeOfRow
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->YToEdgeOfRow((int) *y);
+ int Result = This->YToEdgeOfRow(*y);
  rt.addInt(Result);
  break;
 }
@@ -4329,7 +4338,7 @@ case wxGrid_YToRow: { // wxGrid::YToRow
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->YToRow((int) *y);
+ int Result = This->YToRow(*y);
  rt.addInt(Result);
  break;
 }
@@ -4347,7 +4356,7 @@ case wxGridCellRenderer_Draw: { // wxGridCellRenderer::Draw
  int * col = (int *) bp; bp += 4;
  bool * isSelected = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Draw(*grid,*attr,*dc,rect,(int) *row,(int) *col,(bool) *isSelected);
+ This->Draw(*grid,*attr,*dc,rect,*row,*col,*isSelected);
  break;
 }
 case wxGridCellRenderer_GetBestSize: { // wxGridCellRenderer::GetBestSize
@@ -4358,7 +4367,7 @@ case wxGridCellRenderer_GetBestSize: { // wxGridCellRenderer::GetBestSize
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSize Result = This->GetBestSize(*grid,*attr,*dc,(int) *row,(int) *col);
+ wxSize Result = This->GetBestSize(*grid,*attr,*dc,*row,*col);
  rt.add(Result);
  break;
 }
@@ -4368,7 +4377,7 @@ case wxGridCellEditor_Create: { // wxGridCellEditor::Create
  int * id = (int *) bp; bp += 4;
  wxEvtHandler *evtHandler = (wxEvtHandler *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Create(parent,(wxWindowID) *id,evtHandler);
+ This->Create(parent,*id,evtHandler);
  break;
 }
 case wxGridCellEditor_IsCreated: { // wxGridCellEditor::IsCreated
@@ -4399,9 +4408,10 @@ attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show,attr);
+ This->Show(*show,attr);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGridCellEditor_PaintBackground: { // wxGridCellEditor::PaintBackground
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * rectCellX = (int *) bp; bp += 4;
@@ -4414,25 +4424,28 @@ case wxGridCellEditor_PaintBackground: { // wxGridCellEditor::PaintBackground
  This->PaintBackground(rectCell,attr);
  break;
 }
+#endif
 case wxGridCellEditor_BeginEdit: { // wxGridCellEditor::BeginEdit
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  wxGrid *grid = (wxGrid *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->BeginEdit((int) *row,(int) *col,grid);
+ This->BeginEdit(*row,*col,grid);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGridCellEditor_EndEdit: { // wxGridCellEditor::EndEdit
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  wxGrid *grid = (wxGrid *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->EndEdit((int) *row,(int) *col,grid);
+ bool Result = This->EndEdit(*row,*col,grid);
  rt.addBool(Result);
  break;
 }
+#endif
 case wxGridCellEditor_Reset: { // wxGridCellEditor::Reset
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
@@ -4552,14 +4565,14 @@ case wxGridCellFloatRenderer_SetPrecision: { // wxGridCellFloatRenderer::SetPrec
  wxGridCellFloatRenderer *This = (wxGridCellFloatRenderer *) getPtr(bp,memenv); bp += 4;
  int * precision = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrecision((int) *precision);
+ This->SetPrecision(*precision);
  break;
 }
 case wxGridCellFloatRenderer_SetWidth: { // wxGridCellFloatRenderer::SetWidth
  wxGridCellFloatRenderer *This = (wxGridCellFloatRenderer *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxGridCellFloatRenderer_destroy: { // wxGridCellFloatRenderer::destroy
@@ -4753,7 +4766,7 @@ case wxGridCellAttr_SetAlignment: { // wxGridCellAttr::SetAlignment
  int * hAlign = (int *) bp; bp += 4;
  int * vAlign = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAlignment((int) *hAlign,(int) *vAlign);
+ This->SetAlignment(*hAlign,*vAlign);
  break;
 }
 case wxGridCellAttr_SetReadOnly: { // wxGridCellAttr::SetReadOnly
@@ -4863,7 +4876,7 @@ case wxGridCellAttr_GetRenderer: { // wxGridCellAttr::GetRenderer
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetRenderer(grid,(int) *row,(int) *col);
+ wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetRenderer(grid,*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellRenderer");
  break;
 }
@@ -4873,7 +4886,7 @@ case wxGridCellAttr_GetEditor: { // wxGridCellAttr::GetEditor
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellEditor * Result = (wxGridCellEditor*)This->GetEditor(grid,(int) *row,(int) *col);
+ wxGridCellEditor * Result = (wxGridCellEditor*)This->GetEditor(grid,*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellEditor");
  break;
 }
@@ -4892,7 +4905,7 @@ case wxGridCellAttr_SetDefAttr: { // wxGridCellAttr::SetDefAttr
  break;
 }
 case wxDC_Blit: { // wxDC::Blit
- int rop=wxCOPY;
+ wxRasterOperationMode rop=wxCOPY;
  bool useMask=false;
  wxPoint srcPtMask= wxDefaultPosition;
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
@@ -4908,7 +4921,7 @@ case wxDC_Blit: { // wxDC::Blit
  wxPoint srcPt = wxPoint(*srcPtX,*srcPtY);
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- rop = (int)*(int *) bp; bp += 4;
+rop = *(wxRasterOperationMode *) bp; bp += 4;;
   } break;
   case 2: {bp += 4;
  useMask = *(bool *) bp; bp += 4;
@@ -4930,7 +4943,7 @@ case wxDC_CalcBoundingBox: { // wxDC::CalcBoundingBox
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CalcBoundingBox((wxCoord) *x,(wxCoord) *y);
+ This->CalcBoundingBox(*x,*y);
  break;
 }
 case wxDC_Clear: { // wxDC::Clear
@@ -4939,12 +4952,14 @@ case wxDC_Clear: { // wxDC::Clear
  This->Clear();
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxDC_ComputeScaleAndOrigin: { // wxDC::ComputeScaleAndOrigin
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
  This->ComputeScaleAndOrigin();
  break;
 }
+#endif
 case wxDC_CrossHair: { // wxDC::CrossHair
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * ptX = (int *) bp; bp += 4;
@@ -4964,7 +4979,7 @@ case wxDC_DeviceToLogicalX: { // wxDC::DeviceToLogicalX
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalX((wxCoord) *x);
+ wxCoord Result = This->DeviceToLogicalX(*x);
  rt.addInt(Result);
  break;
 }
@@ -4972,7 +4987,7 @@ case wxDC_DeviceToLogicalXRel: { // wxDC::DeviceToLogicalXRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalXRel((wxCoord) *x);
+ wxCoord Result = This->DeviceToLogicalXRel(*x);
  rt.addInt(Result);
  break;
 }
@@ -4980,7 +4995,7 @@ case wxDC_DeviceToLogicalY: { // wxDC::DeviceToLogicalY
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalY((wxCoord) *y);
+ wxCoord Result = This->DeviceToLogicalY(*y);
  rt.addInt(Result);
  break;
 }
@@ -4988,7 +5003,7 @@ case wxDC_DeviceToLogicalYRel: { // wxDC::DeviceToLogicalYRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalYRel((wxCoord) *y);
+ wxCoord Result = This->DeviceToLogicalYRel(*y);
  rt.addInt(Result);
  break;
 }
@@ -5041,7 +5056,7 @@ case wxDC_DrawCircle: { // wxDC::DrawCircle
  wxPoint pt = wxPoint(*ptX,*ptY);
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->DrawCircle(pt,(wxCoord) *radius);
+ This->DrawCircle(pt,*radius);
  break;
 }
 case wxDC_DrawEllipse_2: { // wxDC::DrawEllipse
@@ -5079,7 +5094,7 @@ case wxDC_DrawEllipticArc: { // wxDC::DrawEllipticArc
  double * sa = (double *) bp; bp += 8;
  double * ea = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawEllipticArc(pt,sz,(double) *sa,(double) *ea);
+ This->DrawEllipticArc(pt,sz,*sa,*ea);
  break;
 }
 case wxDC_DrawIcon: { // wxDC::DrawIcon
@@ -5155,7 +5170,7 @@ case wxDC_DrawLines: { // wxDC::DrawLines
 case wxDC_DrawPolygon: { // wxDC::DrawPolygon
  wxCoord xoffset=0;
  wxCoord yoffset=0;
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * pointsLen = (int *) bp; bp += 4;
  wxPoint *points;
@@ -5172,7 +5187,7 @@ case wxDC_DrawPolygon: { // wxDC::DrawPolygon
  yoffset = (wxCoord)*(int *) bp; bp += 4;
   } break;
   case 3: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -5222,7 +5237,7 @@ case wxDC_DrawRotatedText: { // wxDC::DrawRotatedText
  wxPoint pt = wxPoint(*ptX,*ptY);
  double * angle = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRotatedText(text,pt,(double) *angle);
+ This->DrawRotatedText(text,pt,*angle);
  break;
 }
 case wxDC_DrawRoundedRectangle_3: { // wxDC::DrawRoundedRectangle
@@ -5236,7 +5251,7 @@ case wxDC_DrawRoundedRectangle_3: { // wxDC::DrawRoundedRectangle
  bp += 4; /* Align */
  double * radius = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRoundedRectangle(pt,sz,(double) *radius);
+ This->DrawRoundedRectangle(pt,sz,*radius);
  break;
 }
 case wxDC_DrawRoundedRectangle_2: { // wxDC::DrawRoundedRectangle
@@ -5249,7 +5264,7 @@ case wxDC_DrawRoundedRectangle_2: { // wxDC::DrawRoundedRectangle
  bp += 4; /* Align */
  double * radius = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRoundedRectangle(r,(double) *radius);
+ This->DrawRoundedRectangle(r,*radius);
  break;
 }
 case wxDC_DrawText: { // wxDC::DrawText
@@ -5277,7 +5292,7 @@ case wxDC_EndPage: { // wxDC::EndPage
  break;
 }
 case wxDC_FloodFill: { // wxDC::FloodFill
- int style=wxFLOOD_SURFACE;
+ wxFloodFillStyle style=wxFLOOD_SURFACE;
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * ptX = (int *) bp; bp += 4;
  int * ptY = (int *) bp; bp += 4;
@@ -5290,7 +5305,7 @@ case wxDC_FloodFill: { // wxDC::FloodFill
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- style = (int)*(int *) bp; bp += 4;
+style = *(wxFloodFillStyle *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -5591,14 +5606,14 @@ nDirection = *(wxDirection *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->GradientFillLinear(rect,initialColour,destColour,(wxDirection) nDirection);
+ This->GradientFillLinear(rect,initialColour,destColour,nDirection);
  break;
 }
 case wxDC_LogicalToDeviceX: { // wxDC::LogicalToDeviceX
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceX((wxCoord) *x);
+ wxCoord Result = This->LogicalToDeviceX(*x);
  rt.addInt(Result);
  break;
 }
@@ -5606,7 +5621,7 @@ case wxDC_LogicalToDeviceXRel: { // wxDC::LogicalToDeviceXRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceXRel((wxCoord) *x);
+ wxCoord Result = This->LogicalToDeviceXRel(*x);
  rt.addInt(Result);
  break;
 }
@@ -5614,7 +5629,7 @@ case wxDC_LogicalToDeviceY: { // wxDC::LogicalToDeviceY
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceY((wxCoord) *y);
+ wxCoord Result = This->LogicalToDeviceY(*y);
  rt.addInt(Result);
  break;
 }
@@ -5622,7 +5637,7 @@ case wxDC_LogicalToDeviceYRel: { // wxDC::LogicalToDeviceYRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceYRel((wxCoord) *y);
+ wxCoord Result = This->LogicalToDeviceYRel(*y);
  rt.addInt(Result);
  break;
 }
@@ -5672,7 +5687,7 @@ case wxDC_SetAxisOrientation: { // wxDC::SetAxisOrientation
  bool * xLeftRight = (bool *) bp; bp += 4;
  bool * yBottomUp = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAxisOrientation((bool) *xLeftRight,(bool) *yBottomUp);
+ This->SetAxisOrientation(*xLeftRight,*yBottomUp);
  break;
 }
 case wxDC_SetBackground: { // wxDC::SetBackground
@@ -5686,7 +5701,7 @@ case wxDC_SetBackgroundMode: { // wxDC::SetBackgroundMode
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBackgroundMode((int) *mode);
+ This->SetBackgroundMode(*mode);
  break;
 }
 case wxDC_SetBrush: { // wxDC::SetBrush
@@ -5731,7 +5746,7 @@ case wxDC_SetDeviceOrigin: { // wxDC::SetDeviceOrigin
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDeviceOrigin((wxCoord) *x,(wxCoord) *y);
+ This->SetDeviceOrigin(*x,*y);
  break;
 }
 case wxDC_SetFont: { // wxDC::SetFont
@@ -5745,21 +5760,21 @@ case wxDC_SetLayoutDirection: { // wxDC::SetLayoutDirection
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  wxLayoutDirection dir = *(wxLayoutDirection *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetLayoutDirection((wxLayoutDirection) dir);
+ This->SetLayoutDirection(dir);
  break;
 }
 case wxDC_SetLogicalFunction: { // wxDC::SetLogicalFunction
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
- int * function = (int *) bp; bp += 4;
+ wxRasterOperationMode function = *(wxRasterOperationMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetLogicalFunction((int) *function);
+ This->SetLogicalFunction(function);
  break;
 }
 case wxDC_SetMapMode: { // wxDC::SetMapMode
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
- int * mode = (int *) bp; bp += 4;
+ wxMappingMode mode = *(wxMappingMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetMapMode((int) *mode);
+ This->SetMapMode(mode);
  break;
 }
 case wxDC_SetPalette: { // wxDC::SetPalette
@@ -5804,7 +5819,7 @@ case wxDC_SetUserScale: { // wxDC::SetUserScale
  double * x = (double *) bp; bp += 8;
  double * y = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->SetUserScale((double) *x,(double) *y);
+ This->SetUserScale(*x,*y);
  break;
 }
 case wxDC_StartDoc: { // wxDC::StartDoc
@@ -5826,7 +5841,7 @@ case wxDC_StartPage: { // wxDC::StartPage
 case wxMirrorDC_new: { // wxMirrorDC::wxMirrorDC
  wxDC *dc = (wxDC *) getPtr(bp,memenv); bp += 4;
  bool * mirror = (bool *) bp; bp += 4;
- wxMirrorDC * Result = new EwxMirrorDC(*dc,(bool) *mirror);
+ wxMirrorDC * Result = new EwxMirrorDC(*dc,*mirror);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMirrorDC");
  break;
@@ -5850,22 +5865,28 @@ case wxPostScriptDC_new_1: { // wxPostScriptDC::wxPostScriptDC
  rt.addRef(getRef((void *)Result,memenv), "wxPostScriptDC");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxPostScriptDC_SetResolution: { // wxPostScriptDC::SetResolution
  int * ppi = (int *) bp; bp += 4;
- wxPostScriptDC::SetResolution((int) *ppi);
+ wxPostScriptDC::SetResolution(*ppi);
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxPostScriptDC_GetResolution: { // wxPostScriptDC::GetResolution
  int Result = wxPostScriptDC::GetResolution();
  rt.addInt(Result);
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxWindowDC_new_0: { // wxWindowDC::wxWindowDC
  wxWindowDC * Result = new EwxWindowDC();
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxWindowDC");
  break;
 }
+#endif
 case wxWindowDC_new_1: { // wxWindowDC::wxWindowDC
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxWindowDC * Result = new EwxWindowDC(win);
@@ -5873,12 +5894,14 @@ case wxWindowDC_new_1: { // wxWindowDC::wxWindowDC
  rt.addRef(getRef((void *)Result,memenv), "wxWindowDC");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxClientDC_new_0: { // wxClientDC::wxClientDC
  wxClientDC * Result = new EwxClientDC();
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxClientDC");
  break;
 }
+#endif
 case wxClientDC_new_1: { // wxClientDC::wxClientDC
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxClientDC * Result = new EwxClientDC(win);
@@ -5886,12 +5909,14 @@ case wxClientDC_new_1: { // wxClientDC::wxClientDC
  rt.addRef(getRef((void *)Result,memenv), "wxClientDC");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxPaintDC_new_0: { // wxPaintDC::wxPaintDC
  wxPaintDC * Result = new EwxPaintDC();
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxPaintDC");
  break;
 }
+#endif
 case wxPaintDC_new_1: { // wxPaintDC::wxPaintDC
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxPaintDC * Result = new EwxPaintDC(win);
@@ -6085,6 +6110,7 @@ case wxGraphicsContext_CreateBrush: { // wxGraphicsContext::CreateBrush
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsContext_CreateRadialGradientBrush: { // wxGraphicsContext::CreateRadialGradientBrush
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6104,10 +6130,12 @@ case wxGraphicsContext_CreateRadialGradientBrush: { // wxGraphicsContext::Create
  int * cColorA = (int *) bp; bp += 4;
  wxColour cColor = wxColour(*cColorR,*cColorG,*cColorB,*cColorA);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush((wxDouble) *xo,(wxDouble) *yo,(wxDouble) *xc,(wxDouble) *yc,(wxDouble) *radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush(*xo,*yo,*xc,*yc,*radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsContext_CreateLinearGradientBrush: { // wxGraphicsContext::CreateLinearGradientBrush
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6126,10 +6154,11 @@ case wxGraphicsContext_CreateLinearGradientBrush: { // wxGraphicsContext::Create
  int * c2A = (int *) bp; bp += 4;
  wxColour c2 = wxColour(*c2R,*c2G,*c2B,*c2A);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2,c1,c2)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush(*x1,*y1,*x2,*y2,c1,c2)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
 case wxGraphicsContext_CreateFont: { // wxGraphicsContext::CreateFont
  wxColour col= *wxBLACK;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
@@ -6211,7 +6240,7 @@ case wxGraphicsContext_Clip_4: { // wxGraphicsContext::Clip
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Clip((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->Clip(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_ResetClip: { // wxGraphicsContext::ResetClip
@@ -6228,7 +6257,7 @@ case wxGraphicsContext_DrawBitmap: { // wxGraphicsContext::DrawBitmap
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawBitmap(*bmp,(wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawBitmap(*bmp,*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawEllipse: { // wxGraphicsContext::DrawEllipse
@@ -6239,7 +6268,7 @@ case wxGraphicsContext_DrawEllipse: { // wxGraphicsContext::DrawEllipse
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawEllipse((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawEllipse(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawIcon: { // wxGraphicsContext::DrawIcon
@@ -6250,11 +6279,11 @@ case wxGraphicsContext_DrawIcon: { // wxGraphicsContext::DrawIcon
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawIcon(*icon,(wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawIcon(*icon,*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawLines: { // wxGraphicsContext::DrawLines
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  int * pointsLen = (int *) bp; bp += 4;
  wxPoint2DDouble *points;
@@ -6265,7 +6294,7 @@ case wxGraphicsContext_DrawLines: { // wxGraphicsContext::DrawLines
    points[i] = wxPoint2DDouble(x,y);}
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6274,12 +6303,12 @@ case wxGraphicsContext_DrawLines: { // wxGraphicsContext::DrawLines
  break;
 }
 case wxGraphicsContext_DrawPath: { // wxGraphicsContext::DrawPath
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  wxGraphicsPath *path = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6294,7 +6323,7 @@ case wxGraphicsContext_DrawRectangle: { // wxGraphicsContext::DrawRectangle
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawRectangle(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawRoundedRectangle: { // wxGraphicsContext::DrawRoundedRectangle
@@ -6306,7 +6335,7 @@ case wxGraphicsContext_DrawRoundedRectangle: { // wxGraphicsContext::DrawRounded
  wxDouble * h = (wxDouble *) bp; bp += 8;
  wxDouble * radius = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRoundedRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h,(wxDouble) *radius);
+ This->DrawRoundedRectangle(*x,*y,*w,*h,*radius);
  break;
 }
 case wxGraphicsContext_DrawText_3: { // wxGraphicsContext::DrawText
@@ -6317,7 +6346,7 @@ case wxGraphicsContext_DrawText_3: { // wxGraphicsContext::DrawText
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y);
+ This->DrawText(str,*x,*y);
  break;
 }
 case wxGraphicsContext_DrawText_4_0: { // wxGraphicsContext::DrawText
@@ -6329,7 +6358,7 @@ case wxGraphicsContext_DrawText_4_0: { // wxGraphicsContext::DrawText
  wxDouble * y = (wxDouble *) bp; bp += 8;
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y,(wxDouble) *angle);
+ This->DrawText(str,*x,*y,*angle);
  break;
 }
 case wxGraphicsContext_DrawText_4_1: { // wxGraphicsContext::DrawText
@@ -6341,7 +6370,7 @@ case wxGraphicsContext_DrawText_4_1: { // wxGraphicsContext::DrawText
  wxDouble * y = (wxDouble *) bp; bp += 8;
  wxGraphicsBrush *backgroundBrush = (wxGraphicsBrush *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y,*backgroundBrush);
+ This->DrawText(str,*x,*y,*backgroundBrush);
  break;
 }
 case wxGraphicsContext_DrawText_5: { // wxGraphicsContext::DrawText
@@ -6354,16 +6383,16 @@ case wxGraphicsContext_DrawText_5: { // wxGraphicsContext::DrawText
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  wxGraphicsBrush *backgroundBrush = (wxGraphicsBrush *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y,(wxDouble) *angle,*backgroundBrush);
+ This->DrawText(str,*x,*y,*angle,*backgroundBrush);
  break;
 }
 case wxGraphicsContext_FillPath: { // wxGraphicsContext::FillPath
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  wxGraphicsPath *path = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6411,7 +6440,7 @@ case wxGraphicsContext_Rotate: { // wxGraphicsContext::Rotate
  bp += 4; /* Align */
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Rotate((wxDouble) *angle);
+ This->Rotate(*angle);
  break;
 }
 case wxGraphicsContext_Scale: { // wxGraphicsContext::Scale
@@ -6420,7 +6449,7 @@ case wxGraphicsContext_Scale: { // wxGraphicsContext::Scale
  wxDouble * xScale = (wxDouble *) bp; bp += 8;
  wxDouble * yScale = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Scale((wxDouble) *xScale,(wxDouble) *yScale);
+ This->Scale(*xScale,*yScale);
  break;
 }
 case wxGraphicsContext_Translate: { // wxGraphicsContext::Translate
@@ -6429,7 +6458,7 @@ case wxGraphicsContext_Translate: { // wxGraphicsContext::Translate
  wxDouble * dx = (wxDouble *) bp; bp += 8;
  wxDouble * dy = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Translate((wxDouble) *dx,(wxDouble) *dy);
+ This->Translate(*dx,*dy);
  break;
 }
 case wxGraphicsContext_GetTransform: { // wxGraphicsContext::GetTransform
@@ -6508,7 +6537,7 @@ case wxGraphicsContext_StrokeLine: { // wxGraphicsContext::StrokeLine
  wxDouble * x2 = (wxDouble *) bp; bp += 8;
  wxDouble * y2 = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->StrokeLine((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2);
+ This->StrokeLine(*x1,*y1,*x2,*y2);
  break;
 }
 case wxGraphicsContext_StrokeLines: { // wxGraphicsContext::StrokeLines
@@ -6579,7 +6608,7 @@ case wxGraphicsMatrix_Rotate: { // wxGraphicsMatrix::Rotate
  bp += 4; /* Align */
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Rotate((wxDouble) *angle);
+ This->Rotate(*angle);
  break;
 }
 case wxGraphicsMatrix_Scale: { // wxGraphicsMatrix::Scale
@@ -6588,7 +6617,7 @@ case wxGraphicsMatrix_Scale: { // wxGraphicsMatrix::Scale
  wxDouble * xScale = (wxDouble *) bp; bp += 8;
  wxDouble * yScale = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Scale((wxDouble) *xScale,(wxDouble) *yScale);
+ This->Scale(*xScale,*yScale);
  break;
 }
 case wxGraphicsMatrix_Translate: { // wxGraphicsMatrix::Translate
@@ -6597,7 +6626,7 @@ case wxGraphicsMatrix_Translate: { // wxGraphicsMatrix::Translate
  wxDouble * dx = (wxDouble *) bp; bp += 8;
  wxDouble * dy = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Translate((wxDouble) *dx,(wxDouble) *dy);
+ This->Translate(*dx,*dy);
  break;
 }
 case wxGraphicsMatrix_Set: { // wxGraphicsMatrix::Set
@@ -6669,7 +6698,7 @@ case wxGraphicsPath_MoveToPoint_2: { // wxGraphicsPath::MoveToPoint
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->MoveToPoint((wxDouble) *x,(wxDouble) *y);
+ This->MoveToPoint(*x,*y);
  break;
 }
 case wxGraphicsPath_MoveToPoint_1: { // wxGraphicsPath::MoveToPoint
@@ -6692,7 +6721,7 @@ case wxGraphicsPath_AddArc_6: { // wxGraphicsPath::AddArc
  wxDouble * endAngle = (wxDouble *) bp; bp += 8;
  bool * clockwise = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AddArc((wxDouble) *x,(wxDouble) *y,(wxDouble) *r,(wxDouble) *startAngle,(wxDouble) *endAngle,(bool) *clockwise);
+ This->AddArc(*x,*y,*r,*startAngle,*endAngle,*clockwise);
  break;
 }
 case wxGraphicsPath_AddArc_5: { // wxGraphicsPath::AddArc
@@ -6706,7 +6735,7 @@ case wxGraphicsPath_AddArc_5: { // wxGraphicsPath::AddArc
  wxDouble * endAngle = (wxDouble *) bp; bp += 8;
  bool * clockwise = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AddArc(c,(wxDouble) *r,(wxDouble) *startAngle,(wxDouble) *endAngle,(bool) *clockwise);
+ This->AddArc(c,*r,*startAngle,*endAngle,*clockwise);
  break;
 }
 case wxGraphicsPath_AddArcToPoint: { // wxGraphicsPath::AddArcToPoint
@@ -6718,7 +6747,7 @@ case wxGraphicsPath_AddArcToPoint: { // wxGraphicsPath::AddArcToPoint
  wxDouble * y2 = (wxDouble *) bp; bp += 8;
  wxDouble * r = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddArcToPoint((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2,(wxDouble) *r);
+ This->AddArcToPoint(*x1,*y1,*x2,*y2,*r);
  break;
 }
 case wxGraphicsPath_AddCircle: { // wxGraphicsPath::AddCircle
@@ -6728,7 +6757,7 @@ case wxGraphicsPath_AddCircle: { // wxGraphicsPath::AddCircle
  wxDouble * y = (wxDouble *) bp; bp += 8;
  wxDouble * r = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddCircle((wxDouble) *x,(wxDouble) *y,(wxDouble) *r);
+ This->AddCircle(*x,*y,*r);
  break;
 }
 case wxGraphicsPath_AddCurveToPoint_6: { // wxGraphicsPath::AddCurveToPoint
@@ -6741,7 +6770,7 @@ case wxGraphicsPath_AddCurveToPoint_6: { // wxGraphicsPath::AddCurveToPoint
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddCurveToPoint((wxDouble) *cx1,(wxDouble) *cy1,(wxDouble) *cx2,(wxDouble) *cy2,(wxDouble) *x,(wxDouble) *y);
+ This->AddCurveToPoint(*cx1,*cy1,*cx2,*cy2,*x,*y);
  break;
 }
 case wxGraphicsPath_AddCurveToPoint_3: { // wxGraphicsPath::AddCurveToPoint
@@ -6768,7 +6797,7 @@ case wxGraphicsPath_AddEllipse: { // wxGraphicsPath::AddEllipse
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddEllipse((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->AddEllipse(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsPath_AddLineToPoint_2: { // wxGraphicsPath::AddLineToPoint
@@ -6777,7 +6806,7 @@ case wxGraphicsPath_AddLineToPoint_2: { // wxGraphicsPath::AddLineToPoint
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddLineToPoint((wxDouble) *x,(wxDouble) *y);
+ This->AddLineToPoint(*x,*y);
  break;
 }
 case wxGraphicsPath_AddLineToPoint_1: { // wxGraphicsPath::AddLineToPoint
@@ -6805,7 +6834,7 @@ case wxGraphicsPath_AddQuadCurveToPoint: { // wxGraphicsPath::AddQuadCurveToPoin
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddQuadCurveToPoint((wxDouble) *cx,(wxDouble) *cy,(wxDouble) *x,(wxDouble) *y);
+ This->AddQuadCurveToPoint(*cx,*cy,*x,*y);
  break;
 }
 case wxGraphicsPath_AddRectangle: { // wxGraphicsPath::AddRectangle
@@ -6816,7 +6845,7 @@ case wxGraphicsPath_AddRectangle: { // wxGraphicsPath::AddRectangle
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->AddRectangle(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsPath_AddRoundedRectangle: { // wxGraphicsPath::AddRoundedRectangle
@@ -6828,7 +6857,7 @@ case wxGraphicsPath_AddRoundedRectangle: { // wxGraphicsPath::AddRoundedRectangl
  wxDouble * h = (wxDouble *) bp; bp += 8;
  wxDouble * radius = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddRoundedRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h,(wxDouble) *radius);
+ This->AddRoundedRectangle(*x,*y,*w,*h,*radius);
  break;
 }
 case wxGraphicsPath_CloseSubpath: { // wxGraphicsPath::CloseSubpath
@@ -6838,23 +6867,23 @@ case wxGraphicsPath_CloseSubpath: { // wxGraphicsPath::CloseSubpath
  break;
 }
 case wxGraphicsPath_Contains_3: { // wxGraphicsPath::Contains
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsPath *This = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Contains((wxDouble) *x,(wxDouble) *y,fillStyle);
+ bool Result = This->Contains(*x,*y,fillStyle);
  rt.addBool(Result);
  break;
 }
 case wxGraphicsPath_Contains_2: { // wxGraphicsPath::Contains
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsPath *This = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
  wxDouble * cX = (wxDouble *) bp; bp += 8;
@@ -6862,7 +6891,7 @@ case wxGraphicsPath_Contains_2: { // wxGraphicsPath::Contains
  wxPoint2DDouble c = wxPoint2DDouble(*cX,*cY);
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6930,6 +6959,7 @@ case wxGraphicsRenderer_CreateBrush: { // wxGraphicsRenderer::CreateBrush
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsRenderer_CreateLinearGradientBrush: { // wxGraphicsRenderer::CreateLinearGradientBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6948,10 +6978,12 @@ case wxGraphicsRenderer_CreateLinearGradientBrush: { // wxGraphicsRenderer::Crea
  int * c2A = (int *) bp; bp += 4;
  wxColour c2 = wxColour(*c2R,*c2G,*c2B,*c2A);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2,c1,c2)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush(*x1,*y1,*x2,*y2,c1,c2)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsRenderer_CreateRadialGradientBrush: { // wxGraphicsRenderer::CreateRadialGradientBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6971,10 +7003,11 @@ case wxGraphicsRenderer_CreateRadialGradientBrush: { // wxGraphicsRenderer::Crea
  int * cColorA = (int *) bp; bp += 4;
  wxColour cColor = wxColour(*cColorR,*cColorG,*cColorB,*cColorA);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush((wxDouble) *xo,(wxDouble) *yo,(wxDouble) *xc,(wxDouble) *yc,(wxDouble) *radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush(*xo,*yo,*xc,*yc,*radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
 case wxGraphicsRenderer_CreateFont: { // wxGraphicsRenderer::CreateFont
  wxColour col= *wxBLACK;
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
@@ -7050,7 +7083,7 @@ case wxGraphicsRenderer_CreatePath: { // wxGraphicsRenderer::CreatePath
 #endif // wxUSE_GRAPHICS_CONTEXT
 case wxMenuBar_new_1: { // wxMenuBar::wxMenuBar
  int * style = (int *) bp; bp += 4;
- wxMenuBar * Result = new EwxMenuBar((long) *style);
+ wxMenuBar * Result = new EwxMenuBar(*style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuBar");
  break;
@@ -7077,7 +7110,7 @@ case wxMenuBar_Check: { // wxMenuBar::Check
  int * itemid = (int *) bp; bp += 4;
  bool * check = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Check((int) *itemid,(bool) *check);
+ This->Check(*itemid,*check);
  break;
 }
 case wxMenuBar_Enable_2: { // wxMenuBar::Enable
@@ -7085,7 +7118,7 @@ case wxMenuBar_Enable_2: { // wxMenuBar::Enable
  int * itemid = (int *) bp; bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Enable((int) *itemid,(bool) *enable);
+ This->Enable(*itemid,*enable);
  break;
 }
 case wxMenuBar_Enable_1: { // wxMenuBar::Enable
@@ -7107,7 +7140,7 @@ case wxMenuBar_EnableTop: { // wxMenuBar::EnableTop
  int * pos = (int *) bp; bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableTop((size_t) *pos,(bool) *flag);
+ This->EnableTop(*pos,*flag);
  break;
 }
 case wxMenuBar_FindMenu: { // wxMenuBar::FindMenu
@@ -7138,7 +7171,7 @@ case wxMenuBar_FindItem: { // wxMenuBar::FindItem
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->FindItem((int) *id,menu);
+ wxMenuItem * Result = (wxMenuItem*)This->FindItem(*id,menu);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7146,7 +7179,7 @@ case wxMenuBar_GetHelpString: { // wxMenuBar::GetHelpString
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetHelpString((int) *itemid);
+ wxString Result = This->GetHelpString(*itemid);
  rt.add(Result);
  break;
 }
@@ -7154,7 +7187,7 @@ case wxMenuBar_GetLabel_1: { // wxMenuBar::GetLabel
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLabel((int) *itemid);
+ wxString Result = This->GetLabel(*itemid);
  rt.add(Result);
  break;
 }
@@ -7169,7 +7202,7 @@ case wxMenuBar_GetLabelTop: { // wxMenuBar::GetLabelTop
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLabelTop((size_t) *pos);
+ wxString Result = This->GetLabelTop(*pos);
  rt.add(Result);
  break;
 }
@@ -7177,7 +7210,7 @@ case wxMenuBar_GetMenu: { // wxMenuBar::GetMenu
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenu * Result = (wxMenu*)This->GetMenu((size_t) *pos);
+ wxMenu * Result = (wxMenu*)This->GetMenu(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxMenu");
  break;
 }
@@ -7196,7 +7229,7 @@ case wxMenuBar_Insert: { // wxMenuBar::Insert
  wxString title = wxString(bp, wxConvUTF8);
  bp += *titleLen+((8-((0+ *titleLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->Insert((size_t) *pos,menu,title);
+ bool Result = This->Insert(*pos,menu,title);
  rt.addBool(Result);
  break;
 }
@@ -7204,7 +7237,7 @@ case wxMenuBar_IsChecked: { // wxMenuBar::IsChecked
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsChecked((int) *itemid);
+ bool Result = This->IsChecked(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7212,7 +7245,7 @@ case wxMenuBar_IsEnabled_1: { // wxMenuBar::IsEnabled
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsEnabled((int) *itemid);
+ bool Result = This->IsEnabled(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7227,7 +7260,7 @@ case wxMenuBar_Remove: { // wxMenuBar::Remove
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenu * Result = (wxMenu*)This->Remove((size_t) *pos);
+ wxMenu * Result = (wxMenu*)This->Remove(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxMenu");
  break;
 }
@@ -7239,7 +7272,7 @@ case wxMenuBar_Replace: { // wxMenuBar::Replace
  wxString title = wxString(bp, wxConvUTF8);
  bp += *titleLen+((8-((0+ *titleLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- wxMenu * Result = (wxMenu*)This->Replace((size_t) *pos,menu,title);
+ wxMenu * Result = (wxMenu*)This->Replace(*pos,menu,title);
  rt.addRef(getRef((void *)Result,memenv), "wxMenu");
  break;
 }
@@ -7250,7 +7283,7 @@ case wxMenuBar_SetHelpString: { // wxMenuBar::SetHelpString
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetHelpString((int) *itemid,helpString);
+ This->SetHelpString(*itemid,helpString);
  break;
 }
 case wxMenuBar_SetLabel_2: { // wxMenuBar::SetLabel
@@ -7260,7 +7293,7 @@ case wxMenuBar_SetLabel_2: { // wxMenuBar::SetLabel
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetLabel((int) *itemid,label);
+ This->SetLabel(*itemid,label);
  break;
 }
 case wxMenuBar_SetLabel_1: { // wxMenuBar::SetLabel
@@ -7279,7 +7312,7 @@ case wxMenuBar_SetLabelTop: { // wxMenuBar::SetLabelTop
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetLabelTop((size_t) *pos,label);
+ This->SetLabelTop(*pos,label);
  break;
 }
 case wxControl_GetLabel: { // wxControl::GetLabel
@@ -7345,7 +7378,7 @@ case wxControlWithItems_Delete: { // wxControlWithItems::Delete
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Delete((int) *n);
+ This->Delete(*n);
  break;
 }
 case wxControlWithItems_FindString: { // wxControlWithItems::FindString
@@ -7368,7 +7401,7 @@ case wxControlWithItems_getClientData: { // wxControlWithItems::GetClientObject
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxeErlTerm * Result = (wxeErlTerm*)This->GetClientObject((int) *n);
+ wxeErlTerm * Result = (wxeErlTerm*)This->GetClientObject(*n);
  rt.addExt2Term(Result);
  break;
 }
@@ -7377,7 +7410,7 @@ case wxControlWithItems_setClientData: { // wxControlWithItems::SetClientObject
  unsigned int * n = (unsigned int *) bp; bp += 4;
  wxeErlTerm * clientData =  new wxeErlTerm(Ecmd.bin[0]);
  if(!This) throw wxe_badarg(0);
- This->SetClientObject((int) *n,clientData);
+ This->SetClientObject(*n,clientData);
  break;
 }
 case wxControlWithItems_GetCount: { // wxControlWithItems::GetCount
@@ -7398,7 +7431,7 @@ case wxControlWithItems_GetString: { // wxControlWithItems::GetString
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetString((int) *n);
+ wxString Result = This->GetString(*n);
  rt.add(Result);
  break;
 }
@@ -7416,7 +7449,7 @@ case wxControlWithItems_Insert_2: { // wxControlWithItems::Insert
  bp += *itemLen+((8-((0+ *itemLen) & 7)) & 7);
  unsigned int * pos = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->Insert(item,(int) *pos);
+ int Result = This->Insert(item,*pos);
  rt.addInt(Result);
  break;
 }
@@ -7428,7 +7461,7 @@ case wxControlWithItems_Insert_3: { // wxControlWithItems::Insert
  unsigned int * pos = (unsigned int *) bp; bp += 4;
  wxeErlTerm * clientData =  new wxeErlTerm(Ecmd.bin[0]);
  if(!This) throw wxe_badarg(0);
- int Result = This->Insert(item,(int) *pos,clientData);
+ int Result = This->Insert(item,*pos,clientData);
  rt.addInt(Result);
  break;
 }
@@ -7443,14 +7476,14 @@ case wxControlWithItems_Select: { // wxControlWithItems::Select
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Select((int) *n);
+ This->Select(*n);
  break;
 }
 case wxControlWithItems_SetSelection: { // wxControlWithItems::SetSelection
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *n);
+ This->SetSelection(*n);
  break;
 }
 case wxControlWithItems_SetString: { // wxControlWithItems::SetString
@@ -7460,7 +7493,7 @@ case wxControlWithItems_SetString: { // wxControlWithItems::SetString
  wxString s = wxString(bp, wxConvUTF8);
  bp += *sLen+((8-((4+ *sLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetString((int) *n,s);
+ This->SetString(*n,s);
  break;
 }
 case wxControlWithItems_SetStringSelection: { // wxControlWithItems::SetStringSelection
@@ -7519,7 +7552,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Append((int) *itemid,text,help,(wxItemKind) kind);
+ wxMenuItem * Result = (wxMenuItem*)This->Append(*itemid,text,help,kind);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7542,7 +7575,7 @@ case wxMenu_Append_4_0: { // wxMenu::Append
  bp += *helpLen+((8-((4+ *helpLen) & 7)) & 7);
  bool * isCheckable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Append((int) *itemid,text,help,(bool) *isCheckable);
+ This->Append(*itemid,text,help,*isCheckable);
  break;
 }
 case wxMenu_Append_4_1: { // wxMenu::Append
@@ -7562,7 +7595,7 @@ case wxMenu_Append_4_1: { // wxMenu::Append
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Append((int) *itemid,text,submenu,help);
+ wxMenuItem * Result = (wxMenuItem*)This->Append(*itemid,text,submenu,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7581,7 +7614,7 @@ case wxMenu_AppendCheckItem: { // wxMenu::AppendCheckItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->AppendCheckItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->AppendCheckItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7600,7 +7633,7 @@ case wxMenu_AppendRadioItem: { // wxMenu::AppendRadioItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->AppendRadioItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->AppendRadioItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7622,14 +7655,14 @@ case wxMenu_Check: { // wxMenu::Check
  int * itemid = (int *) bp; bp += 4;
  bool * check = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Check((int) *itemid,(bool) *check);
+ This->Check(*itemid,*check);
  break;
 }
 case wxMenu_Delete_1_0: { // wxMenu::Delete
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Delete((int) *itemid);
+ bool Result = This->Delete(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7645,7 +7678,7 @@ case wxMenu_Destroy_1_0: { // wxMenu::Destroy
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Destroy((int) *itemid);
+ bool Result = This->Destroy(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7662,7 +7695,7 @@ case wxMenu_Enable: { // wxMenu::Enable
  int * itemid = (int *) bp; bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Enable((int) *itemid,(bool) *enable);
+ This->Enable(*itemid,*enable);
  break;
 }
 case wxMenu_FindItem_1: { // wxMenu::FindItem
@@ -7680,7 +7713,7 @@ case wxMenu_FindItem_2: { // wxMenu::FindItem
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->FindItem((int) *itemid,menu);
+ wxMenuItem * Result = (wxMenuItem*)This->FindItem(*itemid,menu);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7688,7 +7721,7 @@ case wxMenu_FindItemByPosition: { // wxMenu::FindItemByPosition
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * position = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->FindItemByPosition((size_t) *position);
+ wxMenuItem * Result = (wxMenuItem*)This->FindItemByPosition(*position);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7696,7 +7729,7 @@ case wxMenu_GetHelpString: { // wxMenu::GetHelpString
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetHelpString((int) *itemid);
+ wxString Result = This->GetHelpString(*itemid);
  rt.add(Result);
  break;
 }
@@ -7704,7 +7737,7 @@ case wxMenu_GetLabel: { // wxMenu::GetLabel
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLabel((int) *itemid);
+ wxString Result = This->GetLabel(*itemid);
  rt.add(Result);
  break;
 }
@@ -7738,7 +7771,7 @@ case wxMenu_Insert_2: { // wxMenu::Insert
  int * pos = (int *) bp; bp += 4;
  wxMenuItem *item = (wxMenuItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Insert((size_t) *pos,item);
+ wxMenuItem * Result = (wxMenuItem*)This->Insert(*pos,item);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7766,7 +7799,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Insert((size_t) *pos,(int) *itemid,text,help,(wxItemKind) kind);
+ wxMenuItem * Result = (wxMenuItem*)This->Insert(*pos,*itemid,text,help,kind);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7788,7 +7821,7 @@ case wxMenu_Insert_5_1: { // wxMenu::Insert
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Insert((size_t) *pos,(int) *itemid,text,submenu,help);
+ wxMenuItem * Result = (wxMenuItem*)This->Insert(*pos,*itemid,text,submenu,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7804,7 +7837,7 @@ case wxMenu_Insert_5_0: { // wxMenu::Insert
  bp += *helpLen+((8-((4+ *helpLen) & 7)) & 7);
  bool * isCheckable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Insert((size_t) *pos,(int) *itemid,text,help,(bool) *isCheckable);
+ This->Insert(*pos,*itemid,text,help,*isCheckable);
  break;
 }
 case wxMenu_InsertCheckItem: { // wxMenu::InsertCheckItem
@@ -7823,7 +7856,7 @@ case wxMenu_InsertCheckItem: { // wxMenu::InsertCheckItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->InsertCheckItem((size_t) *pos,(int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->InsertCheckItem(*pos,*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7843,7 +7876,7 @@ case wxMenu_InsertRadioItem: { // wxMenu::InsertRadioItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->InsertRadioItem((size_t) *pos,(int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->InsertRadioItem(*pos,*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7851,7 +7884,7 @@ case wxMenu_InsertSeparator: { // wxMenu::InsertSeparator
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->InsertSeparator((size_t) *pos);
+ wxMenuItem * Result = (wxMenuItem*)This->InsertSeparator(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7859,7 +7892,7 @@ case wxMenu_IsChecked: { // wxMenu::IsChecked
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsChecked((int) *itemid);
+ bool Result = This->IsChecked(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7867,7 +7900,7 @@ case wxMenu_IsEnabled: { // wxMenu::IsEnabled
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsEnabled((int) *itemid);
+ bool Result = This->IsEnabled(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7901,7 +7934,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Prepend((int) *itemid,text,help,(wxItemKind) kind);
+ wxMenuItem * Result = (wxMenuItem*)This->Prepend(*itemid,text,help,kind);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7922,7 +7955,7 @@ case wxMenu_Prepend_4_1: { // wxMenu::Prepend
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Prepend((int) *itemid,text,submenu,help);
+ wxMenuItem * Result = (wxMenuItem*)This->Prepend(*itemid,text,submenu,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7937,7 +7970,7 @@ case wxMenu_Prepend_4_0: { // wxMenu::Prepend
  bp += *helpLen+((8-((4+ *helpLen) & 7)) & 7);
  bool * isCheckable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Prepend((int) *itemid,text,help,(bool) *isCheckable);
+ This->Prepend(*itemid,text,help,*isCheckable);
  break;
 }
 case wxMenu_PrependCheckItem: { // wxMenu::PrependCheckItem
@@ -7955,7 +7988,7 @@ case wxMenu_PrependCheckItem: { // wxMenu::PrependCheckItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->PrependCheckItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->PrependCheckItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7974,7 +8007,7 @@ case wxMenu_PrependRadioItem: { // wxMenu::PrependRadioItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->PrependRadioItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->PrependRadioItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7989,7 +8022,7 @@ case wxMenu_Remove_1_0: { // wxMenu::Remove
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Remove((int) *itemid);
+ wxMenuItem * Result = (wxMenuItem*)This->Remove(*itemid);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -8008,7 +8041,7 @@ case wxMenu_SetHelpString: { // wxMenu::SetHelpString
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetHelpString((int) *itemid,helpString);
+ This->SetHelpString(*itemid,helpString);
  break;
 }
 case wxMenu_SetLabel: { // wxMenu::SetLabel
@@ -8018,7 +8051,7 @@ case wxMenu_SetLabel: { // wxMenu::SetLabel
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetLabel((int) *itemid,label);
+ This->SetLabel(*itemid,label);
  break;
 }
 case wxMenu_SetTitle: { // wxMenu::SetTitle
@@ -8061,7 +8094,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
 subMenu = (wxMenu *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxMenuItem * Result = new EwxMenuItem(parentMenu,id,text,help,(wxItemKind) kind,subMenu);
+ wxMenuItem * Result = new EwxMenuItem(parentMenu,id,text,help,kind,subMenu);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
@@ -8276,7 +8309,7 @@ data = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,label,*bitmap,*bmpDisabled,(wxItemKind) kind,shortHelp,longHelp,data);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,label,*bitmap,*bmpDisabled,kind,shortHelp,longHelp,data);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8301,7 +8334,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,label,*bitmap,shortHelp,(wxItemKind) kind);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,label,*bitmap,shortHelp,kind);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8341,7 +8374,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelpString,longHelpString);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelpString,longHelpString);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8365,7 +8398,7 @@ case wxToolBar_AddTool_3: { // wxToolBar::AddTool
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,*bitmap,shortHelpString,longHelpString);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,*bitmap,shortHelpString,longHelpString);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8399,7 +8432,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,*bitmap,*bmpDisabled,(bool) *toggle,(wxCoord) *xPos,yPos,clientData,shortHelp,longHelp);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,*bitmap,*bmpDisabled,*toggle,*xPos,yPos,clientData,shortHelp,longHelp);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8434,7 +8467,7 @@ data = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddCheckTool((int) *toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddCheckTool(*toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8469,7 +8502,7 @@ data = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddRadioTool((int) *toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddRadioTool(*toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8477,7 +8510,7 @@ case wxToolBar_DeleteTool: { // wxToolBar::DeleteTool
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteTool((int) *toolid);
+ bool Result = This->DeleteTool(*toolid);
  rt.addBool(Result);
  break;
 }
@@ -8485,7 +8518,7 @@ case wxToolBar_DeleteToolByPos: { // wxToolBar::DeleteToolByPos
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteToolByPos((size_t) *pos);
+ bool Result = This->DeleteToolByPos(*pos);
  rt.addBool(Result);
  break;
 }
@@ -8494,14 +8527,14 @@ case wxToolBar_EnableTool: { // wxToolBar::EnableTool
  int * toolid = (int *) bp; bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableTool((int) *toolid,(bool) *enable);
+ This->EnableTool(*toolid,*enable);
  break;
 }
 case wxToolBar_FindById: { // wxToolBar::FindById
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindById((int) *toolid);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindById(*toolid);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8509,7 +8542,7 @@ case wxToolBar_FindControl: { // wxToolBar::FindControl
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxControl * Result = (wxControl*)This->FindControl((int) *toolid);
+ wxControl * Result = (wxControl*)This->FindControl(*toolid);
  rt.addRef(getRef((void *)Result,memenv), "wxControl");
  break;
 }
@@ -8518,7 +8551,7 @@ case wxToolBar_FindToolForPosition: { // wxToolBar::FindToolForPosition
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindToolForPosition((wxCoord) *x,(wxCoord) *y);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindToolForPosition(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8547,7 +8580,7 @@ case wxToolBar_GetToolEnabled: { // wxToolBar::GetToolEnabled
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetToolEnabled((int) *toolid);
+ bool Result = This->GetToolEnabled(*toolid);
  rt.addBool(Result);
  break;
 }
@@ -8555,7 +8588,7 @@ case wxToolBar_GetToolLongHelp: { // wxToolBar::GetToolLongHelp
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetToolLongHelp((int) *toolid);
+ wxString Result = This->GetToolLongHelp(*toolid);
  rt.add(Result);
  break;
 }
@@ -8570,7 +8603,7 @@ case wxToolBar_GetToolPos: { // wxToolBar::GetToolPos
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetToolPos((int) *id);
+ int Result = This->GetToolPos(*id);
  rt.addInt(Result);
  break;
 }
@@ -8585,7 +8618,7 @@ case wxToolBar_GetToolShortHelp: { // wxToolBar::GetToolShortHelp
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetToolShortHelp((int) *toolid);
+ wxString Result = This->GetToolShortHelp(*toolid);
  rt.add(Result);
  break;
 }
@@ -8593,7 +8626,7 @@ case wxToolBar_GetToolState: { // wxToolBar::GetToolState
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetToolState((int) *toolid);
+ bool Result = This->GetToolState(*toolid);
  rt.addBool(Result);
  break;
 }
@@ -8602,7 +8635,7 @@ case wxToolBar_InsertControl: { // wxToolBar::InsertControl
  int * pos = (int *) bp; bp += 4;
  wxControl *control = (wxControl *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertControl((size_t) *pos,control);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertControl(*pos,control);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8610,7 +8643,7 @@ case wxToolBar_InsertSeparator: { // wxToolBar::InsertSeparator
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertSeparator((size_t) *pos);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertSeparator(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8650,7 +8683,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool((size_t) *pos,(int) *toolid,label,*bitmap,*bmpDisabled,(wxItemKind) kind,shortHelp,longHelp,clientData);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool(*pos,*toolid,label,*bitmap,*bmpDisabled,kind,shortHelp,longHelp,clientData);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8659,7 +8692,7 @@ case wxToolBar_InsertTool_2: { // wxToolBar::InsertTool
  int * pos = (int *) bp; bp += 4;
  wxToolBarToolBase *tool = (wxToolBarToolBase *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool((size_t) *pos,tool);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool(*pos,tool);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8695,7 +8728,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool((size_t) *pos,(int) *toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelp,longHelp);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool(*pos,*toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelp,longHelp);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8710,7 +8743,7 @@ case wxToolBar_RemoveTool: { // wxToolBar::RemoveTool
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->RemoveTool((int) *toolid);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->RemoveTool(*toolid);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8719,7 +8752,7 @@ case wxToolBar_SetMargins: { // wxToolBar::SetMargins
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMargins((int) *x,(int) *y);
+ This->SetMargins(*x,*y);
  break;
 }
 case wxToolBar_SetToolBitmapSize: { // wxToolBar::SetToolBitmapSize
@@ -8738,14 +8771,14 @@ case wxToolBar_SetToolLongHelp: { // wxToolBar::SetToolLongHelp
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetToolLongHelp((int) *toolid,helpString);
+ This->SetToolLongHelp(*toolid,helpString);
  break;
 }
 case wxToolBar_SetToolPacking: { // wxToolBar::SetToolPacking
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * packing = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetToolPacking((int) *packing);
+ This->SetToolPacking(*packing);
  break;
 }
 case wxToolBar_SetToolShortHelp: { // wxToolBar::SetToolShortHelp
@@ -8755,14 +8788,14 @@ case wxToolBar_SetToolShortHelp: { // wxToolBar::SetToolShortHelp
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetToolShortHelp((int) *id,helpString);
+ This->SetToolShortHelp(*id,helpString);
  break;
 }
 case wxToolBar_SetToolSeparation: { // wxToolBar::SetToolSeparation
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * separation = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetToolSeparation((int) *separation);
+ This->SetToolSeparation(*separation);
  break;
 }
 case wxToolBar_ToggleTool: { // wxToolBar::ToggleTool
@@ -8770,7 +8803,7 @@ case wxToolBar_ToggleTool: { // wxToolBar::ToggleTool
  int * toolid = (int *) bp; bp += 4;
  bool * toggle = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ToggleTool((int) *toolid,(bool) *toggle);
+ This->ToggleTool(*toolid,*toggle);
  break;
 }
 case wxStatusBar_new_0: { // wxStatusBar::wxStatusBar
@@ -8824,7 +8857,7 @@ case wxStatusBar_GetFieldRect: { // wxStatusBar::GetFieldRect
  int * rectH = (int *) bp; bp += 4;
  wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH);
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetFieldRect((int) *i,rect);
+ bool Result = This->GetFieldRect(*i,rect);
  rt.addBool(Result);
  break;
 }
@@ -8889,14 +8922,14 @@ case wxStatusBar_SetFieldsCount: { // wxStatusBar::SetFieldsCount
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetFieldsCount((int) *number,widths);
+ This->SetFieldsCount(*number,widths);
  break;
 }
 case wxStatusBar_SetMinHeight: { // wxStatusBar::SetMinHeight
  wxStatusBar *This = (wxStatusBar *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinHeight((int) *height);
+ This->SetMinHeight(*height);
  break;
 }
 case wxStatusBar_SetStatusText: { // wxStatusBar::SetStatusText
@@ -8945,7 +8978,7 @@ case wxBitmap_new_3: { // wxBitmap::wxBitmap
  depth = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxBitmap * Result = new EwxBitmap((int) *width,(int) *height,depth);
+ wxBitmap * Result = new EwxBitmap(*width,*height,depth);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
@@ -8960,7 +8993,7 @@ case wxBitmap_new_4: { // wxBitmap::wxBitmap
  depth = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxBitmap * Result = new EwxBitmap(bits,(int) *width,(int) *height,depth);
+ wxBitmap * Result = new EwxBitmap(bits,*width,*height,depth);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
@@ -8975,7 +9008,7 @@ case wxBitmap_new_2_0: { // wxBitmap::wxBitmap
 type = *(wxBitmapType *) bp; bp += 4;;
   } break;
  }};
- wxBitmap * Result = new EwxBitmap(filename,(wxBitmapType) type);
+ wxBitmap * Result = new EwxBitmap(filename,type);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
@@ -9021,7 +9054,7 @@ case wxBitmap_Create: { // wxBitmap::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,depth);
+ bool Result = This->Create(*width,*height,depth);
  rt.addBool(Result);
  break;
 }
@@ -9084,7 +9117,7 @@ type = *(wxBitmapType *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->LoadFile(name,(wxBitmapType) type);
+ bool Result = This->LoadFile(name,type);
  rt.addBool(Result);
  break;
 }
@@ -9109,7 +9142,7 @@ palette = (wxPalette *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->SaveFile(name,(wxBitmapType) type,palette);
+ bool Result = This->SaveFile(name,type,palette);
  rt.addBool(Result);
  break;
 }
@@ -9117,14 +9150,14 @@ case wxBitmap_SetDepth: { // wxBitmap::SetDepth
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * depth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDepth((int) *depth);
+ This->SetDepth(*depth);
  break;
 }
 case wxBitmap_SetHeight: { // wxBitmap::SetHeight
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHeight((int) *height);
+ This->SetHeight(*height);
  break;
 }
 case wxBitmap_SetMask: { // wxBitmap::SetMask
@@ -9145,7 +9178,7 @@ case wxBitmap_SetWidth: { // wxBitmap::SetWidth
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxIcon_new_0: { // wxIcon::wxIcon
@@ -9172,7 +9205,7 @@ type = *(wxBitmapType *) bp; bp += 4;;
  desiredHeight = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxIcon * Result = new EwxIcon(filename,(wxBitmapType) type,desiredWidth,desiredHeight);
+ wxIcon * Result = new EwxIcon(filename,type,desiredWidth,desiredHeight);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
@@ -9202,7 +9235,7 @@ case wxIconBundle_new_2: { // wxIconBundle::wxIconBundle
  wxString file = wxString(bp, wxConvUTF8);
  bp += *fileLen+((8-((4+ *fileLen) & 7)) & 7);
  int * type = (int *) bp; bp += 4;
- wxIconBundle * Result = new wxIconBundle(file,(long) *type);
+ wxIconBundle * Result = new wxIconBundle(file,*type);
  newPtr((void *) Result, 61, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxIconBundle");
  break;
@@ -9234,7 +9267,7 @@ case wxIconBundle_AddIcon_2: { // wxIconBundle::AddIcon
  bp += *fileLen+((8-((0+ *fileLen) & 7)) & 7);
  int * type = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AddIcon(file,(long) *type);
+ This->AddIcon(file,*type);
  break;
 }
 case wxIconBundle_AddIcon_1: { // wxIconBundle::AddIcon
@@ -9250,7 +9283,7 @@ case wxIconBundle_GetIcon_1_1: { // wxIconBundle::GetIcon
  int * sizeH = (int *) bp; bp += 4;
  wxSize size = wxSize(*sizeW,*sizeH);
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = &This->GetIcon(size);
+ const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -9264,7 +9297,7 @@ case wxIconBundle_GetIcon_1_0: { // wxIconBundle::GetIcon
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = &This->GetIcon(size);
+ const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -9276,7 +9309,7 @@ case wxCursor_new_0: { // wxCursor::wxCursor
 }
 case wxCursor_new_1_0: { // wxCursor::wxCursor
  int * cursorId = (int *) bp; bp += 4;
- wxCursor * Result = new EwxCursor((int) *cursorId);
+ wxCursor * Result = new EwxCursor(*cursorId);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCursor");
  break;
@@ -9288,6 +9321,7 @@ case wxCursor_new_1_1: { // wxCursor::wxCursor
  rt.addRef(getRef((void *)Result,memenv), "wxCursor");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxCursor_new_4: { // wxCursor::wxCursor
  int hotSpotX=-1;
  int hotSpotY=-1;
@@ -9302,11 +9336,12 @@ case wxCursor_new_4: { // wxCursor::wxCursor
  hotSpotY = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxCursor * Result = new EwxCursor(bits,(int) *width,(int) *height,hotSpotX,hotSpotY);
+ wxCursor * Result = new EwxCursor(bits,*width,*height,hotSpotX,hotSpotY);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCursor");
  break;
 }
+#endif
 case wxCursor_Ok: { // wxCursor::Ok
  wxCursor *This = (wxCursor *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
@@ -9335,7 +9370,7 @@ case wxMask_new_2_1: { // wxMask::wxMask
 case wxMask_new_2_0: { // wxMask::wxMask
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * paletteIndex = (int *) bp; bp += 4;
- wxMask * Result = new EwxMask(*bitmap,(int) *paletteIndex);
+ wxMask * Result = new EwxMask(*bitmap,*paletteIndex);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMask");
  break;
@@ -9365,7 +9400,7 @@ case wxMask_Create_2_0: { // wxMask::Create
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * paletteIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(*bitmap,(int) *paletteIndex);
+ bool Result = This->Create(*bitmap,*paletteIndex);
  rt.addBool(Result);
  break;
 }
@@ -9392,7 +9427,7 @@ case wxImage_new_3_0: { // wxImage::wxImage
  clear = *(bool *) bp; bp += 4;
   } break;
  }};
- wxImage * Result = new EwxImage((int) *width,(int) *height,clear);
+ wxImage * Result = new EwxImage(*width,*height,clear);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
@@ -9408,7 +9443,7 @@ case wxImage_new_4: { // wxImage::wxImage
   } break;
  }};
  if(!static_data) {data = (unsigned char *) malloc(Ecmd.bin[0]->size);memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);};
- wxImage * Result = new EwxImage((int) *width,(int) *height,data,static_data);
+ wxImage * Result = new EwxImage(*width,*height,data,static_data);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
@@ -9425,7 +9460,7 @@ case wxImage_new_5: { // wxImage::wxImage
   } break;
  }};
  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 * Result = new EwxImage((int) *width,(int) *height,data,alpha,static_data);
+ wxImage * Result = new EwxImage(*width,*height,data,alpha,static_data);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
@@ -9471,7 +9506,7 @@ case wxImage_Blur: { // wxImage::Blur
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Blur((int) *radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->Blur(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9479,7 +9514,7 @@ case wxImage_BlurHorizontal: { // wxImage::BlurHorizontal
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->BlurHorizontal((int) *radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->BlurHorizontal(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9487,7 +9522,7 @@ case wxImage_BlurVertical: { // wxImage::BlurVertical
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->BlurVertical((int) *radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->BlurVertical(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9536,7 +9571,7 @@ case wxImage_ConvertToMono: { // wxImage::ConvertToMono
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->ConvertToMono((char) *r,(char) *g,(char) *b)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->ConvertToMono(*r,*g,*b)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9559,7 +9594,7 @@ case wxImage_Create_3: { // wxImage::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,clear);
+ bool Result = This->Create(*width,*height,clear);
  rt.addBool(Result);
  break;
 }
@@ -9577,7 +9612,7 @@ case wxImage_Create_4: { // wxImage::Create
  }};
  if(!static_data) {data = (unsigned char *) malloc(Ecmd.bin[0]->size);memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,data,static_data);
+ bool Result = This->Create(*width,*height,data,static_data);
  rt.addBool(Result);
  break;
 }
@@ -9596,7 +9631,7 @@ case wxImage_Create_5: { // wxImage::Create
  }};
  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);};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,data,alpha,static_data);
+ bool Result = This->Create(*width,*height,data,alpha,static_data);
  rt.addBool(Result);
  break;
 }
@@ -9645,7 +9680,7 @@ case wxImage_GetAlpha_2: { // wxImage::GetAlpha
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetAlpha((int) *x,(int) *y);
+ char Result = This->GetAlpha(*x,*y);
  rt.addUint(Result);
  break;
 }
@@ -9663,7 +9698,7 @@ case wxImage_GetBlue: { // wxImage::GetBlue
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetBlue((int) *x,(int) *y);
+ char Result = This->GetBlue(*x,*y);
  rt.addUint(Result);
  break;
 }
@@ -9681,18 +9716,18 @@ case wxImage_GetGreen: { // wxImage::GetGreen
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetGreen((int) *x,(int) *y);
+ char Result = This->GetGreen(*x,*y);
  rt.addUint(Result);
  break;
 }
 case wxImage_GetImageCount: { // wxImage::GetImageCount
- long type=wxBITMAP_TYPE_ANY;
+ wxBitmapType type=wxBITMAP_TYPE_ANY;
  int * nameLen = (int *) bp; bp += 4;
  wxString name = wxString(bp, wxConvUTF8);
  bp += *nameLen+((8-((4+ *nameLen) & 7)) & 7);
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- type = (long)*(int *) bp; bp += 4;
+type = *(wxBitmapType *) bp; bp += 4;;
   } break;
  }};
  int Result = wxImage::GetImageCount(name,type);
@@ -9753,7 +9788,7 @@ case wxImage_GetRed: { // wxImage::GetRed
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetRed((int) *x,(int) *y);
+ char Result = This->GetRed(*x,*y);
  rt.addUint(Result);
  break;
 }
@@ -9842,7 +9877,7 @@ case wxImage_IsTransparent: { // wxImage::IsTransparent
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsTransparent((int) *x,(int) *y,threshold);
+ bool Result = This->IsTransparent(*x,*y,threshold);
  rt.addBool(Result);
  break;
 }
@@ -9923,22 +9958,22 @@ case wxImage_Replace: { // wxImage::Replace
  unsigned int * g2 = (unsigned int *) bp; bp += 4;
  unsigned int * b2 = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Replace((char) *r1,(char) *g1,(char) *b1,(char) *r2,(char) *g2,(char) *b2);
+ This->Replace(*r1,*g1,*b1,*r2,*g2,*b2);
  break;
 }
 case wxImage_Rescale: { // wxImage::Rescale
- int quality=wxIMAGE_QUALITY_NORMAL;
+ wxImageResizeQuality quality=wxIMAGE_QUALITY_NORMAL;
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- quality = (int)*(int *) bp; bp += 4;
+quality = *(wxImageResizeQuality *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = &This->Rescale((int) *width,(int) *height,quality);
+ wxImage * Result = &This->Rescale(*width,*height,quality);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9991,7 +10026,7 @@ case wxImage_Rotate: { // wxImage::Rotate
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Rotate((double) *angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->Rotate(*angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10000,7 +10035,7 @@ case wxImage_RotateHue: { // wxImage::RotateHue
  bp += 4; /* Align */
  double * angle = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->RotateHue((double) *angle);
+ This->RotateHue(*angle);
  break;
 }
 case wxImage_Rotate90: { // wxImage::Rotate90
@@ -10034,7 +10069,7 @@ case wxImage_SaveFile_2_0: { // wxImage::SaveFile
  bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7);
  int * type = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SaveFile(name,(int) *type);
+ bool Result = This->SaveFile(name,*type);
  rt.addBool(Result);
  break;
 }
@@ -10052,18 +10087,18 @@ case wxImage_SaveFile_2_1: { // wxImage::SaveFile
  break;
 }
 case wxImage_Scale: { // wxImage::Scale
- int quality=wxIMAGE_QUALITY_NORMAL;
+ wxImageResizeQuality quality=wxIMAGE_QUALITY_NORMAL;
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- quality = (int)*(int *) bp; bp += 4;
+quality = *(wxImageResizeQuality *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Scale((int) *width,(int) *height,quality)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->Scale(*width,*height,quality)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10101,7 +10136,7 @@ case wxImage_SetAlpha_3: { // wxImage::SetAlpha
  int * y = (int *) bp; bp += 4;
  unsigned int * alpha = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAlpha((int) *x,(int) *y,(char) *alpha);
+ This->SetAlpha(*x,*y,*alpha);
  break;
 }
 case wxImage_SetAlpha_2: { // wxImage::SetAlpha
@@ -10148,7 +10183,7 @@ case wxImage_SetData_4: { // wxImage::SetData
  }};
  if(!static_data) {data = (unsigned char *) malloc(Ecmd.bin[0]->size);memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);};
  if(!This) throw wxe_badarg(0);
- This->SetData(data,(int) *new_width,(int) *new_height,static_data);
+ This->SetData(data,*new_width,*new_height,static_data);
  break;
 }
 case wxImage_SetMask: { // wxImage::SetMask
@@ -10170,7 +10205,7 @@ case wxImage_SetMaskColour: { // wxImage::SetMaskColour
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaskColour((char) *r,(char) *g,(char) *b);
+ This->SetMaskColour(*r,*g,*b);
  break;
 }
 case wxImage_SetMaskFromImage: { // wxImage::SetMaskFromImage
@@ -10180,7 +10215,7 @@ case wxImage_SetMaskFromImage: { // wxImage::SetMaskFromImage
  unsigned int * mg = (unsigned int *) bp; bp += 4;
  unsigned int * mb = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetMaskFromImage(*mask,(char) *mr,(char) *mg,(char) *mb);
+ bool Result = This->SetMaskFromImage(*mask,*mr,*mg,*mb);
  rt.addBool(Result);
  break;
 }
@@ -10203,7 +10238,7 @@ case wxImage_SetOption_2_0: { // wxImage::SetOption
  bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7);
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOption(name,(int) *value);
+ This->SetOption(name,*value);
  break;
 }
 case wxImage_SetPalette: { // wxImage::SetPalette
@@ -10221,7 +10256,7 @@ case wxImage_SetRGB_5: { // wxImage::SetRGB
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRGB((int) *x,(int) *y,(char) *r,(char) *g,(char) *b);
+ This->SetRGB(*x,*y,*r,*g,*b);
  break;
 }
 case wxImage_SetRGB_4: { // wxImage::SetRGB
@@ -10235,7 +10270,7 @@ case wxImage_SetRGB_4: { // wxImage::SetRGB
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRGB(rect,(char) *r,(char) *g,(char) *b);
+ This->SetRGB(rect,*r,*g,*b);
  break;
 }
 case wxBrush_new_0: { // wxBrush::wxBrush
@@ -10271,8 +10306,8 @@ case wxBrush_new_1: { // wxBrush::wxBrush
 case wxBrush_GetColour: { // wxBrush::GetColour
  wxBrush *This = (wxBrush *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour * Result = &This->GetColour();
- rt.add((*Result));
+ wxColour Result = This->GetColour();
+ rt.add(Result);
  break;
 }
 case wxBrush_GetStipple: { // wxBrush::GetStipple
@@ -10320,7 +10355,7 @@ case wxBrush_SetColour_3: { // wxBrush::SetColour
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColour((char) *r,(char) *g,(char) *b);
+ This->SetColour(*r,*g,*b);
  break;
 }
 case wxBrush_SetStipple: { // wxBrush::SetStipple
@@ -10334,7 +10369,7 @@ case wxBrush_SetStyle: { // wxBrush::SetStyle
  wxBrush *This = (wxBrush *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyle((int) *style);
+ This->SetStyle(*style);
  break;
 }
 case wxPen_new_0: { // wxPen::wxPen
@@ -10374,8 +10409,8 @@ case wxPen_GetCap: { // wxPen::GetCap
 case wxPen_GetColour: { // wxPen::GetColour
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour * Result = &This->GetColour();
- rt.add((*Result));
+ wxColour Result = This->GetColour();
+ rt.add(Result);
  break;
 }
 case wxPen_GetJoin: { // wxPen::GetJoin
@@ -10408,9 +10443,9 @@ case wxPen_IsOk: { // wxPen::IsOk
 }
 case wxPen_SetCap: { // wxPen::SetCap
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
- int * capStyle = (int *) bp; bp += 4;
+ wxPenCap capStyle = *(wxPenCap *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetCap((int) *capStyle);
+ This->SetCap(capStyle);
  break;
 }
 case wxPen_SetColour_1: { // wxPen::SetColour
@@ -10430,28 +10465,28 @@ case wxPen_SetColour_3: { // wxPen::SetColour
  unsigned int * green = (unsigned int *) bp; bp += 4;
  unsigned int * blue = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColour((char) *red,(char) *green,(char) *blue);
+ This->SetColour(*red,*green,*blue);
  break;
 }
 case wxPen_SetJoin: { // wxPen::SetJoin
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
- int * joinStyle = (int *) bp; bp += 4;
+ wxPenJoin joinStyle = *(wxPenJoin *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetJoin((int) *joinStyle);
+ This->SetJoin(joinStyle);
  break;
 }
 case wxPen_SetStyle: { // wxPen::SetStyle
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyle((int) *style);
+ This->SetStyle(*style);
  break;
 }
 case wxPen_SetWidth: { // wxPen::SetWidth
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxRegion_new_0: { // wxRegion::wxRegion
@@ -10465,7 +10500,7 @@ case wxRegion_new_4: { // wxRegion::wxRegion
  int * y = (int *) bp; bp += 4;
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
- wxRegion * Result = new EwxRegion((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ wxRegion * Result = new EwxRegion(*x,*y,*w,*h);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxRegion");
  break;
@@ -10511,7 +10546,7 @@ case wxRegion_Contains_2: { // wxRegion::Contains
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->Contains((wxCoord) *x,(wxCoord) *y);
+ int Result = This->Contains(*x,*y);
  rt.addInt(Result);
  break;
 }
@@ -10532,7 +10567,7 @@ case wxRegion_Contains_4: { // wxRegion::Contains
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->Contains((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ int Result = This->Contains(*x,*y,*w,*h);
  rt.addInt(Result);
  break;
 }
@@ -10569,7 +10604,7 @@ case wxRegion_Intersect_4: { // wxRegion::Intersect
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Intersect((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Intersect(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10607,7 +10642,7 @@ case wxRegion_Subtract_4: { // wxRegion::Subtract
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Subtract((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Subtract(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10636,7 +10671,7 @@ case wxRegion_Offset_2: { // wxRegion::Offset
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Offset((wxCoord) *x,(wxCoord) *y);
+ bool Result = This->Offset(*x,*y);
  rt.addBool(Result);
  break;
 }
@@ -10657,7 +10692,7 @@ case wxRegion_Union_4: { // wxRegion::Union
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Union((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Union(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10715,7 +10750,7 @@ case wxRegion_Xor_4: { // wxRegion::Xor
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Xor((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Xor(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10751,7 +10786,7 @@ case wxAcceleratorTable_new_2: { // wxAcceleratorTable::wxAcceleratorTable
  wxAcceleratorEntry *entries;
  entries = (wxAcceleratorEntry *) driver_alloc(sizeof(wxAcceleratorEntry) * *entriesLen); for(int i=0; i < *entriesLen; i++) { entries[i] = * (wxAcceleratorEntry *) getPtr(bp,memenv); bp += 4;}
  bp += ((0+ *entriesLen)%2 )*4;
- wxAcceleratorTable * Result = new EwxAcceleratorTable((int) *n,entries);
+ wxAcceleratorTable * Result = new EwxAcceleratorTable(*n,entries);
  newPtr((void *) Result, 1, memenv);
  driver_free(entries);
  rt.addRef(getRef((void *)Result,memenv), "wxAcceleratorTable");
@@ -10828,7 +10863,7 @@ item = (wxMenuItem *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Set((int) *flags,(int) *keyCode,(int) *cmd,item);
+ This->Set(*flags,*keyCode,*cmd,item);
  break;
 }
 case wxAcceleratorEntry_destroy: { // wxAcceleratorEntry::destroy
@@ -10841,7 +10876,7 @@ case wxCaret_new_3: { // wxCaret::wxCaret
  wxWindow *window = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
- wxCaret * Result = new EwxCaret(window,(int) *width,(int) *height);
+ wxCaret * Result = new EwxCaret(window,*width,*height);
  newPtr((void *) Result, 70, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCaret");
  break;
@@ -10868,7 +10903,7 @@ case wxCaret_Create_3: { // wxCaret::Create
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(window,(int) *width,(int) *height);
+ bool Result = This->Create(window,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -10934,7 +10969,7 @@ case wxCaret_Move_2: { // wxCaret::Move
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Move((int) *x,(int) *y);
+ This->Move(*x,*y);
  break;
 }
 case wxCaret_Move_1: { // wxCaret::Move
@@ -10948,7 +10983,7 @@ case wxCaret_Move_1: { // wxCaret::Move
 }
 case wxCaret_SetBlinkTime: { // wxCaret::SetBlinkTime
  int * milliseconds = (int *) bp; bp += 4;
- wxCaret::SetBlinkTime((int) *milliseconds);
+ wxCaret::SetBlinkTime(*milliseconds);
  break;
 }
 case wxCaret_SetSize_2: { // wxCaret::SetSize
@@ -10956,7 +10991,7 @@ case wxCaret_SetSize_2: { // wxCaret::SetSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSize((int) *width,(int) *height);
+ This->SetSize(*width,*height);
  break;
 }
 case wxCaret_SetSize_1: { // wxCaret::SetSize
@@ -11057,7 +11092,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Add((int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Add(*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11083,7 +11118,7 @@ case wxSizer_AddSpacer: { // wxSizer::AddSpacer
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * size = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->AddSpacer((int) *size);
+ wxSizerItem * Result = (wxSizerItem*)This->AddSpacer(*size);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11141,7 +11176,7 @@ case wxSizer_Detach_1_0: { // wxSizer::Detach
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Detach((int) *index);
+ bool Result = This->Detach(*index);
  rt.addBool(Result);
  break;
 }
@@ -11203,7 +11238,7 @@ case wxSizer_GetItem_1: { // wxSizer::GetItem
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->GetItem((size_t) *index);
+ wxSizerItem * Result = (wxSizerItem*)This->GetItem(*index);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11260,7 +11295,7 @@ case wxSizer_Hide_1: { // wxSizer::Hide
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Hide((size_t) *index);
+ bool Result = This->Hide(*index);
  rt.addBool(Result);
  break;
 }
@@ -11288,7 +11323,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,window,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,window,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11316,7 +11351,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,sizer,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,sizer,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11344,7 +11379,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,(int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11354,7 +11389,7 @@ case wxSizer_Insert_3_3: { // wxSizer::Insert
  wxWindow * window = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxSizerFlags *flags = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,window,*flags);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,window,*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11364,7 +11399,7 @@ case wxSizer_Insert_3_2: { // wxSizer::Insert
  wxSizer *sizer = (wxSizer *) getPtr(bp,memenv); bp += 4;
  wxSizerFlags *flags = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,sizer,*flags);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,sizer,*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11373,7 +11408,7 @@ case wxSizer_Insert_2: { // wxSizer::Insert
  int * index = (int *) bp; bp += 4;
  wxSizerItem *item = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,item);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,item);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11382,7 +11417,7 @@ case wxSizer_InsertSpacer: { // wxSizer::InsertSpacer
  int * index = (int *) bp; bp += 4;
  int * size = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->InsertSpacer((size_t) *index,(int) *size);
+ wxSizerItem * Result = (wxSizerItem*)This->InsertSpacer(*index,*size);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11396,7 +11431,7 @@ case wxSizer_InsertStretchSpacer: { // wxSizer::InsertStretchSpacer
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->InsertStretchSpacer((size_t) *index,prop);
+ wxSizerItem * Result = (wxSizerItem*)This->InsertStretchSpacer(*index,prop);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11420,7 +11455,7 @@ case wxSizer_IsShown_1_0: { // wxSizer::IsShown
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsShown((size_t) *index);
+ bool Result = This->IsShown(*index);
  rt.addBool(Result);
  break;
 }
@@ -11506,7 +11541,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Prepend((int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Prepend(*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11540,7 +11575,7 @@ case wxSizer_PrependSpacer: { // wxSizer::PrependSpacer
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * size = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->PrependSpacer((int) *size);
+ wxSizerItem * Result = (wxSizerItem*)This->PrependSpacer(*size);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11576,7 +11611,7 @@ case wxSizer_Remove_1_0: { // wxSizer::Remove
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Remove((int) *index);
+ bool Result = This->Remove(*index);
  rt.addBool(Result);
  break;
 }
@@ -11617,7 +11652,7 @@ case wxSizer_Replace_2: { // wxSizer::Replace
  int * index = (int *) bp; bp += 4;
  wxSizerItem *newitem = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Replace((size_t) *index,newitem);
+ bool Result = This->Replace(*index,newitem);
  rt.addBool(Result);
  break;
 }
@@ -11628,7 +11663,7 @@ case wxSizer_SetDimension: { // wxSizer::SetDimension
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDimension((int) *x,(int) *y,(int) *width,(int) *height);
+ This->SetDimension(*x,*y,*width,*height);
  break;
 }
 case wxSizer_SetMinSize_2: { // wxSizer::SetMinSize
@@ -11636,7 +11671,7 @@ case wxSizer_SetMinSize_2: { // wxSizer::SetMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinSize((int) *width,(int) *height);
+ This->SetMinSize(*width,*height);
  break;
 }
 case wxSizer_SetMinSize_1: { // wxSizer::SetMinSize
@@ -11654,7 +11689,7 @@ case wxSizer_SetItemMinSize_3_2: { // wxSizer::SetItemMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize(window,(int) *width,(int) *height);
+ bool Result = This->SetItemMinSize(window,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -11675,7 +11710,7 @@ case wxSizer_SetItemMinSize_3_1: { // wxSizer::SetItemMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize(sizer,(int) *width,(int) *height);
+ bool Result = This->SetItemMinSize(sizer,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -11696,7 +11731,7 @@ case wxSizer_SetItemMinSize_3_0: { // wxSizer::SetItemMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize((size_t) *index,(int) *width,(int) *height);
+ bool Result = This->SetItemMinSize(*index,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -11707,7 +11742,7 @@ case wxSizer_SetItemMinSize_2_0: { // wxSizer::SetItemMinSize
  int * sizeH = (int *) bp; bp += 4;
  wxSize size = wxSize(*sizeW,*sizeH);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize((size_t) *index,size);
+ bool Result = This->SetItemMinSize(*index,size);
  rt.addBool(Result);
  break;
 }
@@ -11771,7 +11806,7 @@ case wxSizer_Show_2_0: { // wxSizer::Show
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Show((size_t) *index,show);
+ bool Result = This->Show(*index,show);
  rt.addBool(Result);
  break;
 }
@@ -11779,7 +11814,7 @@ case wxSizer_Show_1: { // wxSizer::Show
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show);
+ This->Show(*show);
  break;
 }
 case wxSizerFlags_new: { // wxSizerFlags::wxSizerFlags
@@ -11798,7 +11833,7 @@ case wxSizerFlags_Align: { // wxSizerFlags::Align
  wxSizerFlags *This = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  int * alignment = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerFlags * Result = &This->Align((int) *alignment);
+ wxSizerFlags * Result = &This->Align(*alignment);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerFlags");
  break;
 }
@@ -11807,7 +11842,7 @@ case wxSizerFlags_Border_2: { // wxSizerFlags::Border
  int * direction = (int *) bp; bp += 4;
  int * borderInPixels = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerFlags * Result = &This->Border((int) *direction,(int) *borderInPixels);
+ wxSizerFlags * Result = &This->Border(*direction,*borderInPixels);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerFlags");
  break;
 }
@@ -11857,7 +11892,7 @@ case wxSizerFlags_Proportion: { // wxSizerFlags::Proportion
  wxSizerFlags *This = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  int * proportion = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerFlags * Result = &This->Proportion((int) *proportion);
+ wxSizerFlags * Result = &This->Proportion(*proportion);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerFlags");
  break;
 }
@@ -11880,7 +11915,7 @@ case wxSizerItem_new_5_1: { // wxSizerItem::wxSizerItem
  int * flag = (int *) bp; bp += 4;
  int * border = (int *) bp; bp += 4;
  wxObject *userData = (wxObject *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem(window,(int) *proportion,(int) *flag,(int) *border,userData);
+ wxSizerItem * Result = new EwxSizerItem(window,*proportion,*flag,*border,userData);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -11899,7 +11934,7 @@ case wxSizerItem_new_5_0: { // wxSizerItem::wxSizerItem
  int * flag = (int *) bp; bp += 4;
  int * border = (int *) bp; bp += 4;
  wxObject *userData = (wxObject *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem(sizer,(int) *proportion,(int) *flag,(int) *border,userData);
+ wxSizerItem * Result = new EwxSizerItem(sizer,*proportion,*flag,*border,userData);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -11919,7 +11954,7 @@ case wxSizerItem_new_6: { // wxSizerItem::wxSizerItem
  int * flag = (int *) bp; bp += 4;
  int * border = (int *) bp; bp += 4;
  wxObject *userData = (wxObject *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem((int) *width,(int) *height,(int) *proportion,(int) *flag,(int) *border,userData);
+ wxSizerItem * Result = new EwxSizerItem(*width,*height,*proportion,*flag,*border,userData);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -11928,7 +11963,7 @@ case wxSizerItem_new_3: { // wxSizerItem::wxSizerItem
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  wxSizerFlags *flags = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem((int) *width,(int) *height,*flags);
+ wxSizerItem * Result = new EwxSizerItem(*width,*height,*flags);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -12074,7 +12109,7 @@ case wxSizerItem_SetBorder: { // wxSizerItem::SetBorder
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  int * border = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBorder((int) *border);
+ This->SetBorder(*border);
  break;
 }
 case wxSizerItem_SetDimension: { // wxSizerItem::SetDimension
@@ -12093,7 +12128,7 @@ case wxSizerItem_SetFlag: { // wxSizerItem::SetFlag
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  int * flag = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlag((int) *flag);
+ This->SetFlag(*flag);
  break;
 }
 case wxSizerItem_SetInitSize: { // wxSizerItem::SetInitSize
@@ -12101,7 +12136,7 @@ case wxSizerItem_SetInitSize: { // wxSizerItem::SetInitSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInitSize((int) *x,(int) *y);
+ This->SetInitSize(*x,*y);
  break;
 }
 case wxSizerItem_SetMinSize_1: { // wxSizerItem::SetMinSize
@@ -12118,14 +12153,14 @@ case wxSizerItem_SetMinSize_2: { // wxSizerItem::SetMinSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinSize((int) *x,(int) *y);
+ This->SetMinSize(*x,*y);
  break;
 }
 case wxSizerItem_SetProportion: { // wxSizerItem::SetProportion
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  int * proportion = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetProportion((int) *proportion);
+ This->SetProportion(*proportion);
  break;
 }
 case wxSizerItem_SetRatio_2: { // wxSizerItem::SetRatio
@@ -12133,7 +12168,7 @@ case wxSizerItem_SetRatio_2: { // wxSizerItem::SetRatio
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRatio((int) *width,(int) *height);
+ This->SetRatio(*width,*height);
  break;
 }
 case wxSizerItem_SetRatio_1_1: { // wxSizerItem::SetRatio
@@ -12149,7 +12184,7 @@ case wxSizerItem_SetRatio_1_0: { // wxSizerItem::SetRatio
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  float * ratio = (float *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRatio((float) *ratio);
+ This->SetRatio(*ratio);
  break;
 }
 case wxSizerItem_SetSizer: { // wxSizerItem::SetSizer
@@ -12173,7 +12208,7 @@ case wxSizerItem_SetSpacer_2: { // wxSizerItem::SetSpacer
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSpacer((int) *width,(int) *height);
+ This->SetSpacer(*width,*height);
  break;
 }
 case wxSizerItem_SetWindow: { // wxSizerItem::SetWindow
@@ -12187,12 +12222,12 @@ case wxSizerItem_Show: { // wxSizerItem::Show
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show);
+ This->Show(*show);
  break;
 }
 case wxBoxSizer_new: { // wxBoxSizer::wxBoxSizer
  int * orient = (int *) bp; bp += 4;
- wxBoxSizer * Result = new EwxBoxSizer((int) *orient);
+ wxBoxSizer * Result = new EwxBoxSizer(*orient);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBoxSizer");
  break;
@@ -12207,7 +12242,7 @@ case wxBoxSizer_GetOrientation: { // wxBoxSizer::GetOrientation
 case wxStaticBoxSizer_new_2: { // wxStaticBoxSizer::wxStaticBoxSizer
  wxStaticBox *box = (wxStaticBox *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
- wxStaticBoxSizer * Result = new EwxStaticBoxSizer(box,(int) *orient);
+ wxStaticBoxSizer * Result = new EwxStaticBoxSizer(box,*orient);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBoxSizer");
  break;
@@ -12223,7 +12258,7 @@ case wxStaticBoxSizer_new_3: { // wxStaticBoxSizer::wxStaticBoxSizer
  bp += *labelLen+((8-((0+ *labelLen) & 7)) & 7);
   } break;
  }};
- wxStaticBoxSizer * Result = new EwxStaticBoxSizer((int) *orient,win,label);
+ wxStaticBoxSizer * Result = new EwxStaticBoxSizer(*orient,win,label);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBoxSizer");
  break;
@@ -12240,7 +12275,7 @@ case wxGridSizer_new_4: { // wxGridSizer::wxGridSizer
  int * cols = (int *) bp; bp += 4;
  int * vgap = (int *) bp; bp += 4;
  int * hgap = (int *) bp; bp += 4;
- wxGridSizer * Result = new EwxGridSizer((int) *rows,(int) *cols,(int) *vgap,(int) *hgap);
+ wxGridSizer * Result = new EwxGridSizer(*rows,*cols,*vgap,*hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGridSizer");
  break;
@@ -12258,7 +12293,7 @@ case wxGridSizer_new_2: { // wxGridSizer::wxGridSizer
  hgap = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxGridSizer * Result = new EwxGridSizer((int) *cols,vgap,hgap);
+ wxGridSizer * Result = new EwxGridSizer(*cols,vgap,hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGridSizer");
  break;
@@ -12295,28 +12330,28 @@ case wxGridSizer_SetCols: { // wxGridSizer::SetCols
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * cols = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCols((int) *cols);
+ This->SetCols(*cols);
  break;
 }
 case wxGridSizer_SetHGap: { // wxGridSizer::SetHGap
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * gap = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHGap((int) *gap);
+ This->SetHGap(*gap);
  break;
 }
 case wxGridSizer_SetRows: { // wxGridSizer::SetRows
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * rows = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRows((int) *rows);
+ This->SetRows(*rows);
  break;
 }
 case wxGridSizer_SetVGap: { // wxGridSizer::SetVGap
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * gap = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetVGap((int) *gap);
+ This->SetVGap(*gap);
  break;
 }
 case wxFlexGridSizer_new_4: { // wxFlexGridSizer::wxFlexGridSizer
@@ -12324,7 +12359,7 @@ case wxFlexGridSizer_new_4: { // wxFlexGridSizer::wxFlexGridSizer
  int * cols = (int *) bp; bp += 4;
  int * vgap = (int *) bp; bp += 4;
  int * hgap = (int *) bp; bp += 4;
- wxFlexGridSizer * Result = new EwxFlexGridSizer((int) *rows,(int) *cols,(int) *vgap,(int) *hgap);
+ wxFlexGridSizer * Result = new EwxFlexGridSizer(*rows,*cols,*vgap,*hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFlexGridSizer");
  break;
@@ -12342,7 +12377,7 @@ case wxFlexGridSizer_new_2: { // wxFlexGridSizer::wxFlexGridSizer
  hgap = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxFlexGridSizer * Result = new EwxFlexGridSizer((int) *cols,vgap,hgap);
+ wxFlexGridSizer * Result = new EwxFlexGridSizer(*cols,vgap,hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFlexGridSizer");
  break;
@@ -12357,7 +12392,7 @@ case wxFlexGridSizer_AddGrowableCol: { // wxFlexGridSizer::AddGrowableCol
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AddGrowableCol((size_t) *idx,proportion);
+ This->AddGrowableCol(*idx,proportion);
  break;
 }
 case wxFlexGridSizer_AddGrowableRow: { // wxFlexGridSizer::AddGrowableRow
@@ -12370,7 +12405,7 @@ case wxFlexGridSizer_AddGrowableRow: { // wxFlexGridSizer::AddGrowableRow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AddGrowableRow((size_t) *idx,proportion);
+ This->AddGrowableRow(*idx,proportion);
  break;
 }
 case wxFlexGridSizer_GetFlexibleDirection: { // wxFlexGridSizer::GetFlexibleDirection
@@ -12391,28 +12426,28 @@ case wxFlexGridSizer_RemoveGrowableCol: { // wxFlexGridSizer::RemoveGrowableCol
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  int * idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RemoveGrowableCol((size_t) *idx);
+ This->RemoveGrowableCol(*idx);
  break;
 }
 case wxFlexGridSizer_RemoveGrowableRow: { // wxFlexGridSizer::RemoveGrowableRow
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  int * idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RemoveGrowableRow((size_t) *idx);
+ This->RemoveGrowableRow(*idx);
  break;
 }
 case wxFlexGridSizer_SetFlexibleDirection: { // wxFlexGridSizer::SetFlexibleDirection
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  int * direction = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlexibleDirection((int) *direction);
+ This->SetFlexibleDirection(*direction);
  break;
 }
 case wxFlexGridSizer_SetNonFlexibleGrowMode: { // wxFlexGridSizer::SetNonFlexibleGrowMode
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  wxFlexSizerGrowMode mode = *(wxFlexSizerGrowMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetNonFlexibleGrowMode((wxFlexSizerGrowMode) mode);
+ This->SetNonFlexibleGrowMode(mode);
  break;
 }
 case wxGridBagSizer_new: { // wxGridBagSizer::wxGridBagSizer
@@ -12525,7 +12560,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Add((int) *width,(int) *height,pos,span,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Add(*width,*height,pos,span,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -12613,7 +12648,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Add((int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Add(*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -12715,7 +12750,7 @@ case wxGridBagSizer_GetCellSize: { // wxGridBagSizer::GetCellSize
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSize Result = This->GetCellSize((int) *row,(int) *col);
+ wxSize Result = This->GetCellSize(*row,*col);
  rt.add(Result);
  break;
 }
@@ -12746,7 +12781,7 @@ case wxGridBagSizer_GetItemPosition_1_0: { // wxGridBagSizer::GetItemPosition
  wxGridBagSizer *This = (wxGridBagSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGBPosition Result = This->GetItemPosition((size_t) *index);
+ wxGBPosition Result = This->GetItemPosition(*index);
  rt.add(Result);
  break;
 }
@@ -12770,7 +12805,7 @@ case wxGridBagSizer_GetItemSpan_1_0: { // wxGridBagSizer::GetItemSpan
  wxGridBagSizer *This = (wxGridBagSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGBSpan Result = This->GetItemSpan((size_t) *index);
+ wxGBSpan Result = This->GetItemSpan(*index);
  rt.add(Result);
  break;
 }
@@ -12812,7 +12847,7 @@ case wxGridBagSizer_SetItemPosition_2_0: { // wxGridBagSizer::SetItemPosition
  int * posC = (int *) bp; bp += 4;
  wxGBPosition pos = wxGBPosition(*posR,*posC);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemPosition((size_t) *index,pos);
+ bool Result = This->SetItemPosition(*index,pos);
  rt.addBool(Result);
  break;
 }
@@ -12845,7 +12880,7 @@ case wxGridBagSizer_SetItemSpan_2_0: { // wxGridBagSizer::SetItemSpan
  int * spanCS = (int *) bp; bp += 4;
  wxGBSpan span = wxGBSpan(*spanRS,*spanCS);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemSpan((size_t) *index,span);
+ bool Result = This->SetItemSpan(*index,span);
  rt.addBool(Result);
  break;
 }
@@ -12925,7 +12960,7 @@ case wxFont_new_5: { // wxFont::wxFont
 encoding = *(wxFontEncoding *) bp; bp += 4;;
   } break;
  }};
- wxFont * Result = new EwxFont((int) *size,(wxFontFamily) family,(wxFontStyle) style,(int) *weight,underlined,face,(wxFontEncoding) encoding);
+ wxFont * Result = new EwxFont(*size,family,style,*weight,underlined,face,encoding);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
@@ -13007,7 +13042,7 @@ case wxFont_Ok: { // wxFont::Ok
 }
 case wxFont_SetDefaultEncoding: { // wxFont::SetDefaultEncoding
  wxFontEncoding encoding = *(wxFontEncoding *) bp; bp += 4;;
- wxFont::SetDefaultEncoding((wxFontEncoding) encoding);
+ wxFont::SetDefaultEncoding(encoding);
  break;
 }
 case wxFont_SetFaceName: { // wxFont::SetFaceName
@@ -13024,45 +13059,45 @@ case wxFont_SetFamily: { // wxFont::SetFamily
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  wxFontFamily family = *(wxFontFamily *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetFamily((wxFontFamily) family);
+ This->SetFamily(family);
  break;
 }
 case wxFont_SetPointSize: { // wxFont::SetPointSize
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  int * pointSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPointSize((int) *pointSize);
+ This->SetPointSize(*pointSize);
  break;
 }
 case wxFont_SetStyle: { // wxFont::SetStyle
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  wxFontStyle style = *(wxFontStyle *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetStyle((wxFontStyle) style);
+ This->SetStyle(style);
  break;
 }
 case wxFont_SetUnderlined: { // wxFont::SetUnderlined
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  bool * underlined = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUnderlined((bool) *underlined);
+ This->SetUnderlined(*underlined);
  break;
 }
 case wxFont_SetWeight: { // wxFont::SetWeight
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  int * weight = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWeight((int) *weight);
+ This->SetWeight(*weight);
  break;
 }
 case wxToolTip_Enable: { // wxToolTip::Enable
  bool * flag = (bool *) bp; bp += 4;
- wxToolTip::Enable((bool) *flag);
+ wxToolTip::Enable(*flag);
  break;
 }
 case wxToolTip_SetDelay: { // wxToolTip::SetDelay
  int * msecs = (int *) bp; bp += 4;
- wxToolTip::SetDelay((long) *msecs);
+ wxToolTip::SetDelay(*msecs);
  break;
 }
 case wxToolTip_new: { // wxToolTip::wxToolTip
@@ -13130,7 +13165,7 @@ case wxButton_new_3: { // wxButton::wxButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxButton * Result = new EwxButton(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxButton * Result = new EwxButton(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxButton");
  break;
@@ -13177,7 +13212,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -13230,7 +13265,7 @@ case wxBitmapButton_new_4: { // wxBitmapButton::wxBitmapButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxBitmapButton * Result = new EwxBitmapButton(parent,(wxWindowID) *id,*bitmap,pos,size,style,*validator);
+ wxBitmapButton * Result = new EwxBitmapButton(parent,*id,*bitmap,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapButton");
  break;
@@ -13271,35 +13306,35 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,*bitmap,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*bitmap,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
 case wxBitmapButton_GetBitmapDisabled: { // wxBitmapButton::GetBitmapDisabled
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapDisabled();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapDisabled()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapFocus: { // wxBitmapButton::GetBitmapFocus
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapFocus();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapFocus()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapLabel: { // wxBitmapButton::GetBitmapLabel
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapLabel();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapLabel()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapSelected: { // wxBitmapButton::GetBitmapSelected
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapSelected();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapSelected()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -13367,7 +13402,7 @@ case wxToggleButton_new_4: { // wxToggleButton::wxToggleButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxToggleButton * Result = new EwxToggleButton(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxToggleButton * Result = new EwxToggleButton(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxToggleButton");
  break;
@@ -13404,7 +13439,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -13419,7 +13454,7 @@ case wxToggleButton_SetValue: { // wxToggleButton::SetValue
  wxToggleButton *This = (wxToggleButton *) getPtr(bp,memenv); bp += 4;
  bool * state = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((bool) *state);
+ This->SetValue(*state);
  break;
 }
 case wxCalendarCtrl_new_0: { // wxCalendarCtrl::wxCalendarCtrl
@@ -13462,7 +13497,7 @@ case wxCalendarCtrl_new_3: { // wxCalendarCtrl::wxCalendarCtrl
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxCalendarCtrl * Result = new EwxCalendarCtrl(parent,(wxWindowID) *id,date,pos,size,style);
+ wxCalendarCtrl * Result = new EwxCalendarCtrl(parent,*id,date,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarCtrl");
  break;
@@ -13504,7 +13539,7 @@ case wxCalendarCtrl_Create: { // wxCalendarCtrl::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,date,pos,size,style);
+ bool Result = This->Create(parent,*id,date,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -13525,10 +13560,11 @@ case wxCalendarCtrl_SetDate: { // wxCalendarCtrl::SetDate
 case wxCalendarCtrl_GetDate: { // wxCalendarCtrl::GetDate
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxDateTime * Result = &This->GetDate();
- rt.add((*Result));
+ const wxDateTime Result = This->GetDate();
+ rt.add(Result);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxCalendarCtrl_EnableYearChange: { // wxCalendarCtrl::EnableYearChange
  bool enable=true;
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
@@ -13542,6 +13578,7 @@ case wxCalendarCtrl_EnableYearChange: { // wxCalendarCtrl::EnableYearChange
  This->EnableYearChange(enable);
  break;
 }
+#endif
 case wxCalendarCtrl_EnableMonthChange: { // wxCalendarCtrl::EnableMonthChange
  bool enable=true;
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
@@ -13662,7 +13699,7 @@ case wxCalendarCtrl_GetAttr: { // wxCalendarCtrl::GetAttr
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  int * day = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCalendarDateAttr * Result = (wxCalendarDateAttr*)This->GetAttr((size_t) *day);
+ wxCalendarDateAttr * Result = (wxCalendarDateAttr*)This->GetAttr(*day);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarDateAttr");
  break;
 }
@@ -13671,21 +13708,21 @@ case wxCalendarCtrl_SetAttr: { // wxCalendarCtrl::SetAttr
  int * day = (int *) bp; bp += 4;
  wxCalendarDateAttr *attr = (wxCalendarDateAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAttr((size_t) *day,attr);
+ This->SetAttr(*day,attr);
  break;
 }
 case wxCalendarCtrl_SetHoliday: { // wxCalendarCtrl::SetHoliday
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  int * day = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHoliday((size_t) *day);
+ This->SetHoliday(*day);
  break;
 }
 case wxCalendarCtrl_ResetAttr: { // wxCalendarCtrl::ResetAttr
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  int * day = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ResetAttr((size_t) *day);
+ This->ResetAttr(*day);
  break;
 }
 case wxCalendarCtrl_HitTest: { // wxCalendarCtrl::HitTest
@@ -13743,7 +13780,7 @@ font = (wxFont *) getPtr(bp,memenv); bp += 4;
 border = *(wxCalendarDateBorder *) bp; bp += 4;;
   } break;
  }};
- wxCalendarDateAttr * Result = new wxCalendarDateAttr(colText,colBack,colBorder,*font,(wxCalendarDateBorder) border);
+ wxCalendarDateAttr * Result = new wxCalendarDateAttr(colText,colBack,colBorder,*font,border);
  newPtr((void *) Result, 88, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarDateAttr");
  break;
@@ -13762,7 +13799,7 @@ case wxCalendarDateAttr_new_2_0: { // wxCalendarDateAttr::wxCalendarDateAttr
  bp += 4; /* Align */
   } break;
  }};
- wxCalendarDateAttr * Result = new wxCalendarDateAttr((wxCalendarDateBorder) border,colBorder);
+ wxCalendarDateAttr * Result = new wxCalendarDateAttr(border,colBorder);
  newPtr((void *) Result, 88, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarDateAttr");
  break;
@@ -13811,14 +13848,14 @@ case wxCalendarDateAttr_SetBorder: { // wxCalendarDateAttr::SetBorder
  wxCalendarDateAttr *This = (wxCalendarDateAttr *) getPtr(bp,memenv); bp += 4;
  wxCalendarDateBorder border = *(wxCalendarDateBorder *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetBorder((wxCalendarDateBorder) border);
+ This->SetBorder(border);
  break;
 }
 case wxCalendarDateAttr_SetHoliday: { // wxCalendarDateAttr::SetHoliday
  wxCalendarDateAttr *This = (wxCalendarDateAttr *) getPtr(bp,memenv); bp += 4;
  bool * holiday = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHoliday((bool) *holiday);
+ This->SetHoliday(*holiday);
  break;
 }
 case wxCalendarDateAttr_HasTextColour: { // wxCalendarDateAttr::HasTextColour
@@ -13934,7 +13971,7 @@ case wxCheckBox_new_4: { // wxCheckBox::wxCheckBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxCheckBox * Result = new EwxCheckBox(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxCheckBox * Result = new EwxCheckBox(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCheckBox");
  break;
@@ -13977,7 +14014,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14020,14 +14057,14 @@ case wxCheckBox_SetValue: { // wxCheckBox::SetValue
  wxCheckBox *This = (wxCheckBox *) getPtr(bp,memenv); bp += 4;
  bool * state = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((bool) *state);
+ This->SetValue(*state);
  break;
 }
 case wxCheckBox_Set3StateValue: { // wxCheckBox::Set3StateValue
  wxCheckBox *This = (wxCheckBox *) getPtr(bp,memenv); bp += 4;
  wxCheckBoxState state = *(wxCheckBoxState *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->Set3StateValue((wxCheckBoxState) state);
+ This->Set3StateValue(state);
  break;
 }
 case wxCheckListBox_new_0: { // wxCheckListBox::wxCheckListBox
@@ -14075,7 +14112,7 @@ case wxCheckListBox_new_3: { // wxCheckListBox::wxCheckListBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxCheckListBox * Result = new EwxCheckListBox(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ wxCheckListBox * Result = new EwxCheckListBox(parent,*id,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCheckListBox");
  break;
@@ -14090,14 +14127,14 @@ case wxCheckListBox_Check: { // wxCheckListBox::Check
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Check((int) *index,check);
+ This->Check(*index,check);
  break;
 }
 case wxCheckListBox_IsChecked: { // wxCheckListBox::IsChecked
  wxCheckListBox *This = (wxCheckListBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * index = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsChecked((int) *index);
+ bool Result = This->IsChecked(*index);
  rt.addBool(Result);
  break;
 }
@@ -14140,7 +14177,7 @@ case wxChoice_new_3: { // wxChoice::wxChoice
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxChoice * Result = new EwxChoice(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ wxChoice * Result = new EwxChoice(parent,*id,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxChoice");
  break;
@@ -14182,7 +14219,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ bool Result = This->Create(parent,*id,pos,size,choices,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14190,7 +14227,7 @@ case wxChoice_Delete: { // wxChoice::Delete
  wxChoice *This = (wxChoice *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Delete((int) *n);
+ This->Delete(*n);
  break;
 }
 case wxChoice_GetColumns: { // wxChoice::GetColumns
@@ -14264,7 +14301,7 @@ case wxComboBox_new_3: { // wxComboBox::wxComboBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxComboBox * Result = new EwxComboBox(parent,(wxWindowID) *id,value,pos,size,choices,style,*validator);
+ wxComboBox * Result = new EwxComboBox(parent,*id,value,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxComboBox");
  break;
@@ -14303,7 +14340,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,value,pos,size,choices,style,*validator);
+ bool Result = This->Create(parent,*id,value,pos,size,choices,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14395,7 +14432,7 @@ case wxComboBox_Replace: { // wxComboBox::Replace
  wxString value = wxString(bp, wxConvUTF8);
  bp += *valueLen+((8-((0+ *valueLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->Replace((long) *from,(long) *to,value);
+ This->Replace(*from,*to,value);
  break;
 }
 case wxComboBox_Remove: { // wxComboBox::Remove
@@ -14403,14 +14440,14 @@ case wxComboBox_Remove: { // wxComboBox::Remove
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Remove((long) *from,(long) *to);
+ This->Remove(*from,*to);
  break;
 }
 case wxComboBox_SetInsertionPoint: { // wxComboBox::SetInsertionPoint
  wxComboBox *This = (wxComboBox *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInsertionPoint((long) *pos);
+ This->SetInsertionPoint(*pos);
  break;
 }
 case wxComboBox_SetInsertionPointEnd: { // wxComboBox::SetInsertionPointEnd
@@ -14423,7 +14460,7 @@ case wxComboBox_SetSelection_1: { // wxComboBox::SetSelection
  wxComboBox *This = (wxComboBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *n);
+ This->SetSelection(*n);
  break;
 }
 case wxComboBox_SetSelection_2: { // wxComboBox::SetSelection
@@ -14431,7 +14468,7 @@ case wxComboBox_SetSelection_2: { // wxComboBox::SetSelection
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((long) *from,(long) *to);
+ This->SetSelection(*from,*to);
  break;
 }
 case wxComboBox_SetValue: { // wxComboBox::SetValue
@@ -14484,7 +14521,7 @@ case wxGauge_new_4: { // wxGauge::wxGauge
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxGauge * Result = new EwxGauge(parent,(wxWindowID) *id,(int) *range,pos,size,style,*validator);
+ wxGauge * Result = new EwxGauge(parent,*id,*range,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGauge");
  break;
@@ -14519,7 +14556,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,(int) *range,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*range,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14562,28 +14599,28 @@ case wxGauge_SetBezelFace: { // wxGauge::SetBezelFace
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * w = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBezelFace((int) *w);
+ This->SetBezelFace(*w);
  break;
 }
 case wxGauge_SetRange: { // wxGauge::SetRange
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * r = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *r);
+ This->SetRange(*r);
  break;
 }
 case wxGauge_SetShadowWidth: { // wxGauge::SetShadowWidth
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * w = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetShadowWidth((int) *w);
+ This->SetShadowWidth(*w);
  break;
 }
 case wxGauge_SetValue: { // wxGauge::SetValue
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *pos);
+ This->SetValue(*pos);
  break;
 }
 case wxGauge_Pulse: { // wxGauge::Pulse
@@ -14793,7 +14830,7 @@ case wxGenericDirCtrl_SetFilterIndex: { // wxGenericDirCtrl::SetFilterIndex
  wxGenericDirCtrl *This = (wxGenericDirCtrl *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFilterIndex((int) *n);
+ This->SetFilterIndex(*n);
  break;
 }
 case wxGenericDirCtrl_SetPath: { // wxGenericDirCtrl::SetPath
@@ -14831,7 +14868,7 @@ case wxStaticBox_new_4: { // wxStaticBox::wxStaticBox
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStaticBox * Result = new EwxStaticBox(parent,(wxWindowID) *id,label,pos,size,style);
+ wxStaticBox * Result = new EwxStaticBox(parent,*id,label,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBox");
  break;
@@ -14870,7 +14907,7 @@ case wxStaticBox_Create: { // wxStaticBox::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style);
+ bool Result = This->Create(parent,*id,label,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -14995,7 +15032,7 @@ case wxListBox_new_3: { // wxListBox::wxListBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxListBox * Result = new EwxListBox(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ wxListBox * Result = new EwxListBox(parent,*id,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListBox");
  break;
@@ -15037,7 +15074,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ bool Result = This->Create(parent,*id,pos,size,choices,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -15045,7 +15082,7 @@ case wxListBox_Deselect: { // wxListBox::Deselect
  wxListBox *This = (wxListBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Deselect((int) *n);
+ This->Deselect(*n);
  break;
 }
 case wxListBox_GetSelections: { // wxListBox::GetSelections
@@ -15072,14 +15109,14 @@ case wxListBox_InsertItems: { // wxListBox::InsertItems
  bp += (8-((0+ itemsASz) & 7 )) & 7;
  unsigned int * pos = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->InsertItems(items,(int) *pos);
+ This->InsertItems(items,*pos);
  break;
 }
 case wxListBox_IsSelected: { // wxListBox::IsSelected
  wxListBox *This = (wxListBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsSelected((int) *n);
+ bool Result = This->IsSelected(*n);
  rt.addBool(Result);
  break;
 }
@@ -15096,7 +15133,7 @@ case wxListBox_Set: { // wxListBox::Set
  }
  bp += (8-((0+ itemsASz) & 7 )) & 7;
  if(!This) throw wxe_badarg(0);
- This->Set(items,NULL);
+ This->Set(items,(void **) NULL);
  break;
 }
 case wxListBox_HitTest: { // wxListBox::HitTest
@@ -15113,7 +15150,7 @@ case wxListBox_SetFirstItem_1_0: { // wxListBox::SetFirstItem
  wxListBox *This = (wxListBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFirstItem((int) *n);
+ This->SetFirstItem(*n);
  break;
 }
 case wxListBox_SetFirstItem_1_1: { // wxListBox::SetFirstItem
@@ -15203,7 +15240,7 @@ case wxListCtrl_AssignImageList: { // wxListCtrl::AssignImageList
  wxImageList *imageList = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * which = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AssignImageList(imageList,(int) *which);
+ This->AssignImageList(imageList,*which);
  break;
 }
 case wxListCtrl_ClearAll: { // wxListCtrl::ClearAll
@@ -15277,7 +15314,7 @@ case wxListCtrl_DeleteColumn: { // wxListCtrl::DeleteColumn
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteColumn((int) *col);
+ bool Result = This->DeleteColumn(*col);
  rt.addBool(Result);
  break;
 }
@@ -15285,7 +15322,7 @@ case wxListCtrl_DeleteItem: { // wxListCtrl::DeleteItem
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteItem((long) *item);
+ bool Result = This->DeleteItem(*item);
  rt.addBool(Result);
  break;
 }
@@ -15293,7 +15330,7 @@ case wxListCtrl_EditLabel: { // wxListCtrl::EditLabel
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxTextCtrl * Result = (wxTextCtrl*)This->EditLabel((long) *item);
+ wxTextCtrl * Result = (wxTextCtrl*)This->EditLabel(*item);
  rt.addRef(getRef((void *)Result,memenv), "wxTextCtrl");
  break;
 }
@@ -15301,7 +15338,7 @@ case wxListCtrl_EnsureVisible: { // wxListCtrl::EnsureVisible
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->EnsureVisible((long) *item);
+ bool Result = This->EnsureVisible(*item);
  rt.addBool(Result);
  break;
 }
@@ -15318,7 +15355,7 @@ case wxListCtrl_FindItem_3_0: { // wxListCtrl::FindItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->FindItem((long) *start,str,partial);
+ long Result = This->FindItem(*start,str,partial);
  rt.addInt(Result);
  break;
 }
@@ -15330,7 +15367,7 @@ case wxListCtrl_FindItem_3_1: { // wxListCtrl::FindItem
  wxPoint pt = wxPoint(*ptX,*ptY);
  int * direction = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->FindItem((long) *start,pt,(int) *direction);
+ long Result = This->FindItem(*start,pt,*direction);
  rt.addInt(Result);
  break;
 }
@@ -15339,7 +15376,7 @@ case wxListCtrl_GetColumn: { // wxListCtrl::GetColumn
  int * col = (int *) bp; bp += 4;
  wxListItem *item = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetColumn((int) *col,*item);
+ bool Result = This->GetColumn(*col,*item);
  rt.addBool(Result);
  break;
 }
@@ -15354,7 +15391,7 @@ case wxListCtrl_GetColumnWidth: { // wxListCtrl::GetColumnWidth
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetColumnWidth((int) *col);
+ int Result = This->GetColumnWidth(*col);
  rt.addInt(Result);
  break;
 }
@@ -15376,7 +15413,7 @@ case wxListCtrl_GetImageList: { // wxListCtrl::GetImageList
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * which = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImageList * Result = (wxImageList*)This->GetImageList((int) *which);
+ wxImageList * Result = (wxImageList*)This->GetImageList(*which);
  rt.addRef(getRef((void *)Result,memenv), "wxImageList");
  break;
 }
@@ -15392,7 +15429,7 @@ case wxListCtrl_GetItemBackgroundColour: { // wxListCtrl::GetItemBackgroundColou
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetItemBackgroundColour((long) *item);
+ wxColour Result = This->GetItemBackgroundColour(*item);
  rt.add(Result);
  break;
 }
@@ -15407,7 +15444,7 @@ case wxListCtrl_GetItemData: { // wxListCtrl::GetItemData
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxUIntPtr Result = This->GetItemData((long) *item);
+ wxUIntPtr Result = This->GetItemData(*item);
  rt.addInt(Result);
  break;
 }
@@ -15415,7 +15452,7 @@ case wxListCtrl_GetItemFont: { // wxListCtrl::GetItemFont
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetItemFont((long) *item)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new wxFont(This->GetItemFont(*item)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -15424,7 +15461,7 @@ case wxListCtrl_GetItemPosition: { // wxListCtrl::GetItemPosition
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetItemPosition((long) *item,pos);
+ bool Result = This->GetItemPosition(*item,pos);
  rt.addBool(Result);
  rt.add(pos);
  rt.addTupleCount(2);
@@ -15441,7 +15478,7 @@ case wxListCtrl_GetItemRect: { // wxListCtrl::GetItemRect
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetItemRect((long) *item,rect,code);
+ bool Result = This->GetItemRect(*item,rect,code);
  rt.addBool(Result);
  rt.add(rect);
  rt.addTupleCount(2);
@@ -15459,7 +15496,7 @@ case wxListCtrl_GetItemState: { // wxListCtrl::GetItemState
  int * item = (int *) bp; bp += 4;
  int * stateMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetItemState((long) *item,(long) *stateMask);
+ int Result = This->GetItemState(*item,*stateMask);
  rt.addInt(Result);
  break;
 }
@@ -15467,7 +15504,7 @@ case wxListCtrl_GetItemText: { // wxListCtrl::GetItemText
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetItemText((long) *item);
+ wxString Result = This->GetItemText(*item);
  rt.add(Result);
  break;
 }
@@ -15475,7 +15512,7 @@ case wxListCtrl_GetItemTextColour: { // wxListCtrl::GetItemTextColour
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetItemTextColour((long) *item);
+ wxColour Result = This->GetItemTextColour(*item);
  rt.add(Result);
  break;
 }
@@ -15493,7 +15530,7 @@ case wxListCtrl_GetNextItem: { // wxListCtrl::GetNextItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->GetNextItem((long) *item,geometry,state);
+ long Result = This->GetNextItem(*item,geometry,state);
  rt.addInt(Result);
  break;
 }
@@ -15541,7 +15578,7 @@ case wxListCtrl_InsertColumn_2: { // wxListCtrl::InsertColumn
  int * col = (int *) bp; bp += 4;
  wxListItem *info = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertColumn((long) *col,*info);
+ long Result = This->InsertColumn(*col,*info);
  rt.addInt(Result);
  break;
 }
@@ -15562,7 +15599,7 @@ case wxListCtrl_InsertColumn_3: { // wxListCtrl::InsertColumn
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertColumn((long) *col,heading,format,width);
+ long Result = This->InsertColumn(*col,heading,format,width);
  rt.addInt(Result);
  break;
 }
@@ -15581,7 +15618,7 @@ case wxListCtrl_InsertItem_2_1: { // wxListCtrl::InsertItem
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertItem((long) *index,label);
+ long Result = This->InsertItem(*index,label);
  rt.addInt(Result);
  break;
 }
@@ -15590,7 +15627,7 @@ case wxListCtrl_InsertItem_2_0: { // wxListCtrl::InsertItem
  int * index = (int *) bp; bp += 4;
  int * imageIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertItem((long) *index,(int) *imageIndex);
+ long Result = This->InsertItem(*index,*imageIndex);
  rt.addInt(Result);
  break;
 }
@@ -15602,7 +15639,7 @@ case wxListCtrl_InsertItem_3: { // wxListCtrl::InsertItem
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  int * imageIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertItem((long) *index,label,(int) *imageIndex);
+ long Result = This->InsertItem(*index,label,*imageIndex);
  rt.addInt(Result);
  break;
 }
@@ -15610,7 +15647,7 @@ case wxListCtrl_RefreshItem: { // wxListCtrl::RefreshItem
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RefreshItem((long) *item);
+ This->RefreshItem(*item);
  break;
 }
 case wxListCtrl_RefreshItems: { // wxListCtrl::RefreshItems
@@ -15618,7 +15655,7 @@ case wxListCtrl_RefreshItems: { // wxListCtrl::RefreshItems
  int * itemFrom = (int *) bp; bp += 4;
  int * itemTo = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RefreshItems((long) *itemFrom,(long) *itemTo);
+ This->RefreshItems(*itemFrom,*itemTo);
  break;
 }
 case wxListCtrl_ScrollList: { // wxListCtrl::ScrollList
@@ -15626,7 +15663,7 @@ case wxListCtrl_ScrollList: { // wxListCtrl::ScrollList
  int * dx = (int *) bp; bp += 4;
  int * dy = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ScrollList((int) *dx,(int) *dy);
+ bool Result = This->ScrollList(*dx,*dy);
  rt.addBool(Result);
  break;
 }
@@ -15647,7 +15684,7 @@ case wxListCtrl_SetColumn: { // wxListCtrl::SetColumn
  int * col = (int *) bp; bp += 4;
  wxListItem *item = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetColumn((int) *col,*item);
+ bool Result = This->SetColumn(*col,*item);
  rt.addBool(Result);
  break;
 }
@@ -15656,7 +15693,7 @@ case wxListCtrl_SetColumnWidth: { // wxListCtrl::SetColumnWidth
  int * col = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetColumnWidth((int) *col,(int) *width);
+ bool Result = This->SetColumnWidth(*col,*width);
  rt.addBool(Result);
  break;
 }
@@ -15665,7 +15702,7 @@ case wxListCtrl_SetImageList: { // wxListCtrl::SetImageList
  wxImageList *imageList = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * which = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetImageList(imageList,(int) *which);
+ This->SetImageList(imageList,*which);
  break;
 }
 case wxListCtrl_SetItem_1: { // wxListCtrl::SetItem
@@ -15690,7 +15727,7 @@ case wxListCtrl_SetItem_4: { // wxListCtrl::SetItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->SetItem((long) *index,(int) *col,label,imageId);
+ long Result = This->SetItem(*index,*col,label,imageId);
  rt.addInt(Result);
  break;
 }
@@ -15703,14 +15740,14 @@ case wxListCtrl_SetItemBackgroundColour: { // wxListCtrl::SetItemBackgroundColou
  int * colA = (int *) bp; bp += 4;
  wxColour col = wxColour(*colR,*colG,*colB,*colA);
  if(!This) throw wxe_badarg(0);
- This->SetItemBackgroundColour((long) *item,col);
+ This->SetItemBackgroundColour(*item,col);
  break;
 }
 case wxListCtrl_SetItemCount: { // wxListCtrl::SetItemCount
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * count = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetItemCount((long) *count);
+ This->SetItemCount(*count);
  break;
 }
 case wxListCtrl_SetItemData: { // wxListCtrl::SetItemData
@@ -15718,7 +15755,7 @@ case wxListCtrl_SetItemData: { // wxListCtrl::SetItemData
  int * item = (int *) bp; bp += 4;
  int * data = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemData((long) *item,(long) *data);
+ bool Result = This->SetItemData(*item,*data);
  rt.addBool(Result);
  break;
 }
@@ -15727,7 +15764,7 @@ case wxListCtrl_SetItemFont: { // wxListCtrl::SetItemFont
  int * item = (int *) bp; bp += 4;
  wxFont *f = (wxFont *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetItemFont((long) *item,*f);
+ This->SetItemFont(*item,*f);
  break;
 }
 case wxListCtrl_SetItemImage: { // wxListCtrl::SetItemImage
@@ -15742,7 +15779,7 @@ case wxListCtrl_SetItemImage: { // wxListCtrl::SetItemImage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemImage((long) *item,(int) *image,selImage);
+ bool Result = This->SetItemImage(*item,*image,selImage);
  rt.addBool(Result);
  break;
 }
@@ -15752,7 +15789,7 @@ case wxListCtrl_SetItemColumnImage: { // wxListCtrl::SetItemColumnImage
  int * column = (int *) bp; bp += 4;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemColumnImage((long) *item,(long) *column,(int) *image);
+ bool Result = This->SetItemColumnImage(*item,*column,*image);
  rt.addBool(Result);
  break;
 }
@@ -15763,7 +15800,7 @@ case wxListCtrl_SetItemPosition: { // wxListCtrl::SetItemPosition
  int * posY = (int *) bp; bp += 4;
  wxPoint pos = wxPoint(*posX,*posY);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemPosition((long) *item,pos);
+ bool Result = This->SetItemPosition(*item,pos);
  rt.addBool(Result);
  break;
 }
@@ -15773,7 +15810,7 @@ case wxListCtrl_SetItemState: { // wxListCtrl::SetItemState
  int * state = (int *) bp; bp += 4;
  int * stateMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemState((long) *item,(long) *state,(long) *stateMask);
+ bool Result = This->SetItemState(*item,*state,*stateMask);
  rt.addBool(Result);
  break;
 }
@@ -15784,7 +15821,7 @@ case wxListCtrl_SetItemText: { // wxListCtrl::SetItemText
  wxString str = wxString(bp, wxConvUTF8);
  bp += *strLen+((8-((4+ *strLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetItemText((long) *item,str);
+ This->SetItemText(*item,str);
  break;
 }
 case wxListCtrl_SetItemTextColour: { // wxListCtrl::SetItemTextColour
@@ -15796,7 +15833,7 @@ case wxListCtrl_SetItemTextColour: { // wxListCtrl::SetItemTextColour
  int * colA = (int *) bp; bp += 4;
  wxColour col = wxColour(*colR,*colG,*colB,*colA);
  if(!This) throw wxe_badarg(0);
- This->SetItemTextColour((long) *item,col);
+ This->SetItemTextColour(*item,col);
  break;
 }
 case wxListCtrl_SetSingleStyle: { // wxListCtrl::SetSingleStyle
@@ -15809,7 +15846,7 @@ case wxListCtrl_SetSingleStyle: { // wxListCtrl::SetSingleStyle
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSingleStyle((long) *style,add);
+ This->SetSingleStyle(*style,add);
  break;
 }
 case wxListCtrl_SetTextColour: { // wxListCtrl::SetTextColour
@@ -15827,7 +15864,7 @@ case wxListCtrl_SetWindowStyleFlag: { // wxListCtrl::SetWindowStyleFlag
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyleFlag((long) *style);
+ This->SetWindowStyleFlag(*style);
  break;
 }
 
@@ -15857,14 +15894,14 @@ case wxListView_ClearColumnImage: { // wxListView::ClearColumnImage
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ClearColumnImage((int) *col);
+ This->ClearColumnImage(*col);
  break;
 }
 case wxListView_Focus: { // wxListView::Focus
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Focus((long) *index);
+ This->Focus(*index);
  break;
 }
 case wxListView_GetFirstSelected: { // wxListView::GetFirstSelected
@@ -15885,7 +15922,7 @@ case wxListView_GetNextSelected: { // wxListView::GetNextSelected
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->GetNextSelected((long) *item);
+ long Result = This->GetNextSelected(*item);
  rt.addInt(Result);
  break;
 }
@@ -15893,7 +15930,7 @@ case wxListView_IsSelected: { // wxListView::IsSelected
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsSelected((long) *index);
+ bool Result = This->IsSelected(*index);
  rt.addBool(Result);
  break;
 }
@@ -15907,7 +15944,7 @@ case wxListView_Select: { // wxListView::Select
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Select((long) *n,on);
+ This->Select(*n,on);
  break;
 }
 case wxListView_SetColumnImage: { // wxListView::SetColumnImage
@@ -15915,7 +15952,7 @@ case wxListView_SetColumnImage: { // wxListView::SetColumnImage
  int * col = (int *) bp; bp += 4;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColumnImage((int) *col,(int) *image);
+ This->SetColumnImage(*col,*image);
  break;
 }
 case wxListItem_new_0: { // wxListItem::wxListItem
@@ -16018,7 +16055,7 @@ case wxListItem_SetAlign: { // wxListItem::SetAlign
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  wxListColumnFormat align = *(wxListColumnFormat *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetAlign((wxListColumnFormat) align);
+ This->SetAlign(align);
  break;
 }
 case wxListItem_SetBackgroundColour: { // wxListItem::SetBackgroundColour
@@ -16036,7 +16073,7 @@ case wxListItem_SetColumn: { // wxListItem::SetColumn
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColumn((int) *col);
+ This->SetColumn(*col);
  break;
 }
 case wxListItem_SetFont: { // wxListItem::SetFont
@@ -16050,35 +16087,35 @@ case wxListItem_SetId: { // wxListItem::SetId
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetId((long) *id);
+ This->SetId(*id);
  break;
 }
 case wxListItem_SetImage: { // wxListItem::SetImage
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetImage((int) *image);
+ This->SetImage(*image);
  break;
 }
 case wxListItem_SetMask: { // wxListItem::SetMask
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMask((long) *mask);
+ This->SetMask(*mask);
  break;
 }
 case wxListItem_SetState: { // wxListItem::SetState
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * state = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetState((long) *state);
+ This->SetState(*state);
  break;
 }
 case wxListItem_SetStateMask: { // wxListItem::SetStateMask
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * stateMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStateMask((long) *stateMask);
+ This->SetStateMask(*stateMask);
  break;
 }
 case wxListItem_SetText: { // wxListItem::SetText
@@ -16105,7 +16142,7 @@ case wxListItem_SetWidth: { // wxListItem::SetWidth
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxListItemAttr_new_0: { // wxListItemAttr::wxListItemAttr
@@ -16227,7 +16264,7 @@ case wxImageList_new_3: { // wxImageList::wxImageList
  initialCount = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxImageList * Result = new EwxImageList((int) *width,(int) *height,mask,initialCount);
+ wxImageList * Result = new EwxImageList(*width,*height,mask,initialCount);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImageList");
  break;
@@ -16278,7 +16315,7 @@ case wxImageList_Create: { // wxImageList::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,mask,initialCount);
+ bool Result = This->Create(*width,*height,mask,initialCount);
  rt.addBool(Result);
  break;
 }
@@ -16300,7 +16337,7 @@ case wxImageList_Draw: { // wxImageList::Draw
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Draw((int) *index,*dc,(int) *x,(int) *y,flags,solidBackground);
+ bool Result = This->Draw(*index,*dc,*x,*y,flags,solidBackground);
  rt.addBool(Result);
  break;
 }
@@ -16308,7 +16345,7 @@ case wxImageList_GetBitmap: { // wxImageList::GetBitmap
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetBitmap((int) *index)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new wxBitmap(This->GetBitmap(*index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -16316,7 +16353,7 @@ case wxImageList_GetIcon: { // wxImageList::GetIcon
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxIcon * Result = new wxIcon(This->GetIcon((int) *index)); newPtr((void *) Result,3, memenv);;
+ wxIcon * Result = new wxIcon(This->GetIcon(*index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -16333,7 +16370,7 @@ case wxImageList_GetSize: { // wxImageList::GetSize
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetSize((int) *index,width,height);
+ bool Result = This->GetSize(*index,width,height);
  rt.addBool(Result);
  rt.addInt(width);
  rt.addInt(height);
@@ -16344,7 +16381,7 @@ case wxImageList_Remove: { // wxImageList::Remove
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Remove((int) *index);
+ bool Result = This->Remove(*index);
  rt.addBool(Result);
  break;
 }
@@ -16360,7 +16397,7 @@ case wxImageList_Replace_2: { // wxImageList::Replace
  int * index = (int *) bp; bp += 4;
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Replace((int) *index,*bitmap);
+ bool Result = This->Replace(*index,*bitmap);
  rt.addBool(Result);
  break;
 }
@@ -16370,7 +16407,7 @@ case wxImageList_Replace_3: { // wxImageList::Replace
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  wxBitmap *mask = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Replace((int) *index,*bitmap,*mask);
+ bool Result = This->Replace(*index,*bitmap,*mask);
  rt.addBool(Result);
  break;
 }
@@ -16405,7 +16442,7 @@ font = (wxFont *) getPtr(bp,memenv); bp += 4;
 alignment = *(wxTextAttrAlignment *) bp; bp += 4;;
   } break;
  }};
- wxTextAttr * Result = new wxTextAttr(colText,colBack,*font,(wxTextAttrAlignment) alignment);
+ wxTextAttr * Result = new wxTextAttr(colText,colBack,*font,alignment);
  newPtr((void *) Result, 103, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextAttr");
  break;
@@ -16427,7 +16464,7 @@ case wxTextAttr_GetBackgroundColour: { // wxTextAttr::GetBackgroundColour
 case wxTextAttr_GetFont: { // wxTextAttr::GetFont
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxFont * Result = &This->GetFont();
+ const wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -16505,7 +16542,7 @@ case wxTextAttr_SetAlignment: { // wxTextAttr::SetAlignment
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  wxTextAttrAlignment alignment = *(wxTextAttrAlignment *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetAlignment((wxTextAttrAlignment) alignment);
+ This->SetAlignment(alignment);
  break;
 }
 case wxTextAttr_SetBackgroundColour: { // wxTextAttr::SetBackgroundColour
@@ -16523,7 +16560,7 @@ case wxTextAttr_SetFlags: { // wxTextAttr::SetFlags
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((long) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxTextAttr_SetFont: { // wxTextAttr::SetFont
@@ -16549,14 +16586,14 @@ case wxTextAttr_SetLeftIndent: { // wxTextAttr::SetLeftIndent
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetLeftIndent((int) *indent,subIndent);
+ This->SetLeftIndent(*indent,subIndent);
  break;
 }
 case wxTextAttr_SetRightIndent: { // wxTextAttr::SetRightIndent
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  int * indent = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRightIndent((int) *indent);
+ This->SetRightIndent(*indent);
  break;
 }
 case wxTextAttr_SetTabs: { // wxTextAttr::SetTabs
@@ -16619,7 +16656,7 @@ case wxTextCtrl_new_3: { // wxTextCtrl::wxTextCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxTextCtrl * Result = new EwxTextCtrl(parent,(wxWindowID) *id,value,pos,size,style,*validator);
+ wxTextCtrl * Result = new EwxTextCtrl(parent,*id,value,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextCtrl");
  break;
@@ -16722,7 +16759,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,value,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,value,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -16771,7 +16808,7 @@ case wxTextCtrl_GetLineLength: { // wxTextCtrl::GetLineLength
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lineNo = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineLength((long) *lineNo);
+ int Result = This->GetLineLength(*lineNo);
  rt.addInt(Result);
  break;
 }
@@ -16779,7 +16816,7 @@ case wxTextCtrl_GetLineText: { // wxTextCtrl::GetLineText
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lineNo = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLineText((long) *lineNo);
+ wxString Result = This->GetLineText(*lineNo);
  rt.add(Result);
  break;
 }
@@ -16795,7 +16832,7 @@ case wxTextCtrl_GetRange: { // wxTextCtrl::GetRange
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetRange((long) *from,(long) *to);
+ wxString Result = This->GetRange(*from,*to);
  rt.add(Result);
  break;
 }
@@ -16822,7 +16859,7 @@ case wxTextCtrl_GetStyle: { // wxTextCtrl::GetStyle
  int * position = (int *) bp; bp += 4;
  wxTextAttr *style = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetStyle((long) *position,*style);
+ bool Result = This->GetStyle(*position,*style);
  rt.addBool(Result);
  break;
 }
@@ -16895,7 +16932,7 @@ case wxTextCtrl_PositionToXY: { // wxTextCtrl::PositionToXY
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->PositionToXY((long) *pos,&x,&y);
+ bool Result = This->PositionToXY(*pos,&x,&y);
  rt.addBool(Result);
  rt.addInt(x);
  rt.addInt(y);
@@ -16913,7 +16950,7 @@ case wxTextCtrl_Remove: { // wxTextCtrl::Remove
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Remove((long) *from,(long) *to);
+ This->Remove(*from,*to);
  break;
 }
 case wxTextCtrl_Replace: { // wxTextCtrl::Replace
@@ -16924,7 +16961,7 @@ case wxTextCtrl_Replace: { // wxTextCtrl::Replace
  wxString value = wxString(bp, wxConvUTF8);
  bp += *valueLen+((8-((0+ *valueLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->Replace((long) *from,(long) *to,value);
+ This->Replace(*from,*to,value);
  break;
 }
 case wxTextCtrl_SaveFile: { // wxTextCtrl::SaveFile
@@ -16959,14 +16996,14 @@ case wxTextCtrl_SetEditable: { // wxTextCtrl::SetEditable
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * editable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEditable((bool) *editable);
+ This->SetEditable(*editable);
  break;
 }
 case wxTextCtrl_SetInsertionPoint: { // wxTextCtrl::SetInsertionPoint
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInsertionPoint((long) *pos);
+ This->SetInsertionPoint(*pos);
  break;
 }
 case wxTextCtrl_SetInsertionPointEnd: { // wxTextCtrl::SetInsertionPointEnd
@@ -16979,7 +17016,7 @@ case wxTextCtrl_SetMaxLength: { // wxTextCtrl::SetMaxLength
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  unsigned int * len = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaxLength((long) *len);
+ This->SetMaxLength(*len);
  break;
 }
 case wxTextCtrl_SetSelection: { // wxTextCtrl::SetSelection
@@ -16987,7 +17024,7 @@ case wxTextCtrl_SetSelection: { // wxTextCtrl::SetSelection
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((long) *from,(long) *to);
+ This->SetSelection(*from,*to);
  break;
 }
 case wxTextCtrl_SetStyle: { // wxTextCtrl::SetStyle
@@ -16996,7 +17033,7 @@ case wxTextCtrl_SetStyle: { // wxTextCtrl::SetStyle
  int * end = (int *) bp; bp += 4;
  wxTextAttr *style = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetStyle((long) *start,(long) *end,*style);
+ bool Result = This->SetStyle(*start,*end,*style);
  rt.addBool(Result);
  break;
 }
@@ -17013,7 +17050,7 @@ case wxTextCtrl_ShowPosition: { // wxTextCtrl::ShowPosition
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ShowPosition((long) *pos);
+ This->ShowPosition(*pos);
  break;
 }
 case wxTextCtrl_Undo: { // wxTextCtrl::Undo
@@ -17036,7 +17073,7 @@ case wxTextCtrl_XYToPosition: { // wxTextCtrl::XYToPosition
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->XYToPosition((long) *x,(long) *y);
+ long Result = This->XYToPosition(*x,*y);
  rt.addInt(Result);
  break;
 }
@@ -17069,7 +17106,7 @@ case wxNotebook_new_3: { // wxNotebook::wxNotebook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxNotebook * Result = new EwxNotebook(parent,(wxWindowID) *winid,pos,size,style);
+ wxNotebook * Result = new EwxNotebook(parent,*winid,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxNotebook");
  break;
@@ -17141,7 +17178,7 @@ case wxNotebook_Create: { // wxNotebook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17156,7 +17193,7 @@ case wxNotebook_DeletePage: { // wxNotebook::DeletePage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *nPage);
+ bool Result = This->DeletePage(*nPage);
  rt.addBool(Result);
  break;
 }
@@ -17164,7 +17201,7 @@ case wxNotebook_RemovePage: { // wxNotebook::RemovePage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *nPage);
+ bool Result = This->RemovePage(*nPage);
  rt.addBool(Result);
  break;
 }
@@ -17186,7 +17223,7 @@ case wxNotebook_GetPage: { // wxNotebook::GetPage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -17201,7 +17238,7 @@ case wxNotebook_GetPageImage: { // wxNotebook::GetPageImage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *nPage);
+ int Result = This->GetPageImage(*nPage);
  rt.addInt(Result);
  break;
 }
@@ -17209,7 +17246,7 @@ case wxNotebook_GetPageText: { // wxNotebook::GetPageText
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *nPage);
+ wxString Result = This->GetPageText(*nPage);
  rt.add(Result);
  break;
 }
@@ -17265,7 +17302,7 @@ case wxNotebook_InsertPage: { // wxNotebook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *position,win,strText,bSelect,imageId);
+ bool Result = This->InsertPage(*position,win,strText,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -17299,7 +17336,7 @@ case wxNotebook_SetPageImage: { // wxNotebook::SetPageImage
  int * nPage = (int *) bp; bp += 4;
  int * nImage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *nPage,(int) *nImage);
+ bool Result = This->SetPageImage(*nPage,*nImage);
  rt.addBool(Result);
  break;
 }
@@ -17310,7 +17347,7 @@ case wxNotebook_SetPageText: { // wxNotebook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *nPage,strText);
+ bool Result = This->SetPageText(*nPage,strText);
  rt.addBool(Result);
  break;
 }
@@ -17318,7 +17355,7 @@ case wxNotebook_SetSelection: { // wxNotebook::SetSelection
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *nPage);
+ int Result = This->SetSelection(*nPage);
  rt.addInt(Result);
  break;
 }
@@ -17326,7 +17363,7 @@ case wxNotebook_ChangeSelection: { // wxNotebook::ChangeSelection
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *nPage);
+ int Result = This->ChangeSelection(*nPage);
  rt.addInt(Result);
  break;
 }
@@ -17359,7 +17396,7 @@ case wxChoicebook_new_3: { // wxChoicebook::wxChoicebook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxChoicebook * Result = new EwxChoicebook(parent,(wxWindowID) *id,pos,size,style);
+ wxChoicebook * Result = new EwxChoicebook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxChoicebook");
  break;
@@ -17431,7 +17468,7 @@ case wxChoicebook_Create: { // wxChoicebook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17446,7 +17483,7 @@ case wxChoicebook_DeletePage: { // wxChoicebook::DeletePage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *n);
+ bool Result = This->DeletePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17454,7 +17491,7 @@ case wxChoicebook_RemovePage: { // wxChoicebook::RemovePage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17476,7 +17513,7 @@ case wxChoicebook_GetPage: { // wxChoicebook::GetPage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -17491,7 +17528,7 @@ case wxChoicebook_GetPageImage: { // wxChoicebook::GetPageImage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -17499,7 +17536,7 @@ case wxChoicebook_GetPageText: { // wxChoicebook::GetPageText
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -17541,7 +17578,7 @@ case wxChoicebook_InsertPage: { // wxChoicebook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *n,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*n,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -17566,7 +17603,7 @@ case wxChoicebook_SetPageImage: { // wxChoicebook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -17577,7 +17614,7 @@ case wxChoicebook_SetPageText: { // wxChoicebook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -17585,7 +17622,7 @@ case wxChoicebook_SetSelection: { // wxChoicebook::SetSelection
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17593,7 +17630,7 @@ case wxChoicebook_ChangeSelection: { // wxChoicebook::ChangeSelection
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17626,7 +17663,7 @@ case wxToolbook_new_3: { // wxToolbook::wxToolbook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxToolbook * Result = new EwxToolbook(parent,(wxWindowID) *id,pos,size,style);
+ wxToolbook * Result = new EwxToolbook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxToolbook");
  break;
@@ -17698,7 +17735,7 @@ case wxToolbook_Create: { // wxToolbook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17713,7 +17750,7 @@ case wxToolbook_DeletePage: { // wxToolbook::DeletePage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *n);
+ bool Result = This->DeletePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17721,7 +17758,7 @@ case wxToolbook_RemovePage: { // wxToolbook::RemovePage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17743,7 +17780,7 @@ case wxToolbook_GetPage: { // wxToolbook::GetPage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -17758,7 +17795,7 @@ case wxToolbook_GetPageImage: { // wxToolbook::GetPageImage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -17766,7 +17803,7 @@ case wxToolbook_GetPageText: { // wxToolbook::GetPageText
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -17808,7 +17845,7 @@ case wxToolbook_InsertPage: { // wxToolbook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *n,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*n,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -17833,7 +17870,7 @@ case wxToolbook_SetPageImage: { // wxToolbook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -17844,7 +17881,7 @@ case wxToolbook_SetPageText: { // wxToolbook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -17852,7 +17889,7 @@ case wxToolbook_SetSelection: { // wxToolbook::SetSelection
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17860,7 +17897,7 @@ case wxToolbook_ChangeSelection: { // wxToolbook::ChangeSelection
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17893,7 +17930,7 @@ case wxListbook_new_3: { // wxListbook::wxListbook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxListbook * Result = new EwxListbook(parent,(wxWindowID) *id,pos,size,style);
+ wxListbook * Result = new EwxListbook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListbook");
  break;
@@ -17965,7 +18002,7 @@ case wxListbook_Create: { // wxListbook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17980,7 +18017,7 @@ case wxListbook_DeletePage: { // wxListbook::DeletePage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *n);
+ bool Result = This->DeletePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17988,7 +18025,7 @@ case wxListbook_RemovePage: { // wxListbook::RemovePage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -18010,7 +18047,7 @@ case wxListbook_GetPage: { // wxListbook::GetPage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -18025,7 +18062,7 @@ case wxListbook_GetPageImage: { // wxListbook::GetPageImage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -18033,7 +18070,7 @@ case wxListbook_GetPageText: { // wxListbook::GetPageText
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -18075,7 +18112,7 @@ case wxListbook_InsertPage: { // wxListbook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *n,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*n,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -18100,7 +18137,7 @@ case wxListbook_SetPageImage: { // wxListbook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -18111,7 +18148,7 @@ case wxListbook_SetPageText: { // wxListbook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -18119,7 +18156,7 @@ case wxListbook_SetSelection: { // wxListbook::SetSelection
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18127,7 +18164,7 @@ case wxListbook_ChangeSelection: { // wxListbook::ChangeSelection
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18160,7 +18197,7 @@ case wxTreebook_new_3: { // wxTreebook::wxTreebook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxTreebook * Result = new EwxTreebook(parent,(wxWindowID) *id,pos,size,style);
+ wxTreebook * Result = new EwxTreebook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTreebook");
  break;
@@ -18232,7 +18269,7 @@ case wxTreebook_Create: { // wxTreebook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -18247,7 +18284,7 @@ case wxTreebook_DeletePage: { // wxTreebook::DeletePage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *pos);
+ bool Result = This->DeletePage(*pos);
  rt.addBool(Result);
  break;
 }
@@ -18255,7 +18292,7 @@ case wxTreebook_RemovePage: { // wxTreebook::RemovePage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -18277,7 +18314,7 @@ case wxTreebook_GetPage: { // wxTreebook::GetPage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -18292,7 +18329,7 @@ case wxTreebook_GetPageImage: { // wxTreebook::GetPageImage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -18300,7 +18337,7 @@ case wxTreebook_GetPageText: { // wxTreebook::GetPageText
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -18321,7 +18358,7 @@ case wxTreebook_ExpandNode: { // wxTreebook::ExpandNode
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->ExpandNode((size_t) *pos,expand);
+ bool Result = This->ExpandNode(*pos,expand);
  rt.addBool(Result);
  break;
 }
@@ -18329,7 +18366,7 @@ case wxTreebook_IsNodeExpanded: { // wxTreebook::IsNodeExpanded
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsNodeExpanded((size_t) *pos);
+ bool Result = This->IsNodeExpanded(*pos);
  rt.addBool(Result);
  break;
 }
@@ -18364,7 +18401,7 @@ case wxTreebook_InsertPage: { // wxTreebook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *pos,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*pos,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -18386,7 +18423,7 @@ case wxTreebook_InsertSubPage: { // wxTreebook::InsertSubPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertSubPage((size_t) *pos,page,text,bSelect,imageId);
+ bool Result = This->InsertSubPage(*pos,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -18411,7 +18448,7 @@ case wxTreebook_SetPageImage: { // wxTreebook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -18422,7 +18459,7 @@ case wxTreebook_SetPageText: { // wxTreebook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -18430,7 +18467,7 @@ case wxTreebook_SetSelection: { // wxTreebook::SetSelection
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18438,7 +18475,7 @@ case wxTreebook_ChangeSelection: { // wxTreebook::ChangeSelection
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18790,7 +18827,7 @@ which = *(wxTreeItemIcon *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- int Result = This->GetItemImage(item,(wxTreeItemIcon) which);
+ int Result = This->GetItemImage(item,which);
  rt.addInt(Result);
  break;
 }
@@ -18933,7 +18970,7 @@ case wxTreeCtrl_InsertItem: { // wxTreeCtrl::InsertItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxTreeItemId Result = This->InsertItem(parent,(size_t) *pos,text,image,selImage,data);
+ wxTreeItemId Result = This->InsertItem(parent,*pos,text,image,selImage,data);
  rt.add((wxUIntPtr *) Result.m_pItem);
  break;
 }
@@ -19043,7 +19080,7 @@ case wxTreeCtrl_SetIndent: { // wxTreeCtrl::SetIndent
  wxTreeCtrl *This = (wxTreeCtrl *) getPtr(bp,memenv); bp += 4;
  unsigned int * indent = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetIndent((int) *indent);
+ This->SetIndent(*indent);
  break;
 }
 case wxTreeCtrl_SetImageList: { // wxTreeCtrl::SetImageList
@@ -19132,7 +19169,7 @@ case wxTreeCtrl_SetItemImage_2: { // wxTreeCtrl::SetItemImage
  wxTreeItemId item = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetItemImage(item,(int) *image);
+ This->SetItemImage(item,*image);
  break;
 }
 case wxTreeCtrl_SetItemImage_3: { // wxTreeCtrl::SetItemImage
@@ -19148,7 +19185,7 @@ which = *(wxTreeItemIcon *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetItemImage(item,(int) *image,(wxTreeItemIcon) which);
+ This->SetItemImage(item,*image,which);
  break;
 }
 case wxTreeCtrl_SetItemText: { // wxTreeCtrl::SetItemText
@@ -19186,7 +19223,7 @@ case wxTreeCtrl_SetWindowStyle: { // wxTreeCtrl::SetWindowStyle
  wxTreeCtrl *This = (wxTreeCtrl *) getPtr(bp,memenv); bp += 4;
  const int * styles = (const int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyle((long) *styles);
+ This->SetWindowStyle(*styles);
  break;
 }
 case wxTreeCtrl_SortChildren: { // wxTreeCtrl::SortChildren
@@ -19266,7 +19303,7 @@ case wxScrollBar_new_3: { // wxScrollBar::wxScrollBar
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxScrollBar * Result = new EwxScrollBar(parent,(wxWindowID) *id,pos,size,style,*validator);
+ wxScrollBar * Result = new EwxScrollBar(parent,*id,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxScrollBar");
  break;
@@ -19301,7 +19338,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -19337,7 +19374,7 @@ case wxScrollBar_SetThumbPosition: { // wxScrollBar::SetThumbPosition
  wxScrollBar *This = (wxScrollBar *) getPtr(bp,memenv); bp += 4;
  int * viewStart = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetThumbPosition((int) *viewStart);
+ This->SetThumbPosition(*viewStart);
  break;
 }
 case wxScrollBar_SetScrollbar: { // wxScrollBar::SetScrollbar
@@ -19354,7 +19391,7 @@ case wxScrollBar_SetScrollbar: { // wxScrollBar::SetScrollbar
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollbar((int) *position,(int) *thumbSize,(int) *range,(int) *pageSize,refresh);
+ This->SetScrollbar(*position,*thumbSize,*range,*pageSize,refresh);
  break;
 }
 case wxSpinButton_new_2: { // wxSpinButton::wxSpinButton
@@ -19453,14 +19490,14 @@ case wxSpinButton_SetRange: { // wxSpinButton::SetRange
  int * minVal = (int *) bp; bp += 4;
  int * maxVal = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minVal,(int) *maxVal);
+ This->SetRange(*minVal,*maxVal);
  break;
 }
 case wxSpinButton_SetValue: { // wxSpinButton::SetValue
  wxSpinButton *This = (wxSpinButton *) getPtr(bp,memenv); bp += 4;
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *value);
+ This->SetValue(*value);
  break;
 }
 case wxSpinCtrl_new_0: { // wxSpinCtrl::wxSpinCtrl
@@ -19582,7 +19619,7 @@ case wxSpinCtrl_SetValue_1_0: { // wxSpinCtrl::SetValue
  wxSpinCtrl *This = (wxSpinCtrl *) getPtr(bp,memenv); bp += 4;
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *value);
+ This->SetValue(*value);
  break;
 }
 case wxSpinCtrl_GetValue: { // wxSpinCtrl::GetValue
@@ -19597,7 +19634,7 @@ case wxSpinCtrl_SetRange: { // wxSpinCtrl::SetRange
  int * minVal = (int *) bp; bp += 4;
  int * maxVal = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minVal,(int) *maxVal);
+ This->SetRange(*minVal,*maxVal);
  break;
 }
 case wxSpinCtrl_SetSelection: { // wxSpinCtrl::SetSelection
@@ -19605,7 +19642,7 @@ case wxSpinCtrl_SetSelection: { // wxSpinCtrl::SetSelection
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((long) *from,(long) *to);
+ This->SetSelection(*from,*to);
  break;
 }
 case wxSpinCtrl_GetMin: { // wxSpinCtrl::GetMin
@@ -19654,7 +19691,7 @@ case wxStaticText_new_4: { // wxStaticText::wxStaticText
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStaticText * Result = new EwxStaticText(parent,(wxWindowID) *id,label,pos,size,style);
+ wxStaticText * Result = new EwxStaticText(parent,*id,label,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticText");
  break;
@@ -19687,7 +19724,7 @@ case wxStaticText_Create: { // wxStaticText::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style);
+ bool Result = This->Create(parent,*id,label,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -19711,7 +19748,7 @@ case wxStaticText_Wrap: { // wxStaticText::Wrap
  wxStaticText *This = (wxStaticText *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Wrap((int) *width);
+ This->Wrap(*width);
  break;
 }
 case wxStaticBitmap_new_0: { // wxStaticBitmap::wxStaticBitmap
@@ -19745,7 +19782,7 @@ case wxStaticBitmap_new_4: { // wxStaticBitmap::wxStaticBitmap
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStaticBitmap * Result = new EwxStaticBitmap(parent,(wxWindowID) *id,*label,pos,size,style);
+ wxStaticBitmap * Result = new EwxStaticBitmap(parent,*id,*label,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBitmap");
  break;
@@ -19776,7 +19813,7 @@ case wxStaticBitmap_Create: { // wxStaticBitmap::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,*label,pos,size,style);
+ bool Result = This->Create(parent,*id,*label,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -19830,7 +19867,7 @@ case wxRadioBox_new: { // wxRadioBox::wxRadioBox
 val = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxRadioBox * Result = new EwxRadioBox(parent,(wxWindowID) *id,title,pos,size,choices,majorDim,style,*val);
+ wxRadioBox * Result = new EwxRadioBox(parent,*id,title,pos,size,choices,majorDim,style,*val);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxRadioBox");
  break;
@@ -19873,7 +19910,7 @@ val = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,choices,majorDim,style,*val);
+ bool Result = This->Create(parent,*id,title,pos,size,choices,majorDim,style,*val);
  rt.addBool(Result);
  break;
 }
@@ -19887,7 +19924,7 @@ case wxRadioBox_Enable_2: { // wxRadioBox::Enable
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Enable((int) *n,enable);
+ bool Result = This->Enable(*n,enable);
  rt.addBool(Result);
  break;
 }
@@ -19916,7 +19953,7 @@ case wxRadioBox_GetString: { // wxRadioBox::GetString
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetString((int) *n);
+ wxString Result = This->GetString(*n);
  rt.add(Result);
  break;
 }
@@ -19924,7 +19961,7 @@ case wxRadioBox_SetSelection: { // wxRadioBox::SetSelection
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *n);
+ This->SetSelection(*n);
  break;
 }
 case wxRadioBox_Show_2: { // wxRadioBox::Show
@@ -19937,7 +19974,7 @@ case wxRadioBox_Show_2: { // wxRadioBox::Show
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Show((int) *n,show);
+ bool Result = This->Show(*n,show);
  rt.addBool(Result);
  break;
 }
@@ -19966,7 +20003,7 @@ case wxRadioBox_GetItemHelpText: { // wxRadioBox::GetItemHelpText
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetItemHelpText((int) *n);
+ wxString Result = This->GetItemHelpText(*n);
  rt.add(Result);
  break;
 }
@@ -19974,7 +20011,7 @@ case wxRadioBox_GetItemToolTip: { // wxRadioBox::GetItemToolTip
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * item = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolTip * Result = (wxToolTip*)This->GetItemToolTip((int) *item);
+ wxToolTip * Result = (wxToolTip*)This->GetItemToolTip(*item);
  rt.addRef(getRef((void *)Result,memenv), "wxToolTip");
  break;
 }
@@ -19999,7 +20036,7 @@ case wxRadioBox_IsItemEnabled: { // wxRadioBox::IsItemEnabled
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsItemEnabled((int) *n);
+ bool Result = This->IsItemEnabled(*n);
  rt.addBool(Result);
  break;
 }
@@ -20007,7 +20044,7 @@ case wxRadioBox_IsItemShown: { // wxRadioBox::IsItemShown
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsItemShown((int) *n);
+ bool Result = This->IsItemShown(*n);
  rt.addBool(Result);
  break;
 }
@@ -20018,7 +20055,7 @@ case wxRadioBox_SetItemHelpText: { // wxRadioBox::SetItemHelpText
  wxString helpText = wxString(bp, wxConvUTF8);
  bp += *helpTextLen+((8-((4+ *helpTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetItemHelpText((int) *n,helpText);
+ This->SetItemHelpText(*n,helpText);
  break;
 }
 case wxRadioBox_SetItemToolTip: { // wxRadioBox::SetItemToolTip
@@ -20028,7 +20065,7 @@ case wxRadioBox_SetItemToolTip: { // wxRadioBox::SetItemToolTip
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetItemToolTip((int) *item,text);
+ This->SetItemToolTip(*item,text);
  break;
 }
 case wxRadioButton_new_0: { // wxRadioButton::wxRadioButton
@@ -20067,7 +20104,7 @@ case wxRadioButton_new_4: { // wxRadioButton::wxRadioButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxRadioButton * Result = new EwxRadioButton(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxRadioButton * Result = new EwxRadioButton(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxRadioButton");
  break;
@@ -20104,7 +20141,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -20119,7 +20156,7 @@ case wxRadioButton_SetValue: { // wxRadioButton::SetValue
  wxRadioButton *This = (wxRadioButton *) getPtr(bp,memenv); bp += 4;
  bool * val = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((bool) *val);
+ This->SetValue(*val);
  break;
 }
 case wxSlider_new_6: { // wxSlider::wxSlider
@@ -20153,7 +20190,7 @@ case wxSlider_new_6: { // wxSlider::wxSlider
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxSlider * Result = new EwxSlider(parent,(wxWindowID) *id,(int) *value,(int) *minValue,(int) *maxValue,pos,size,style,*validator);
+ wxSlider * Result = new EwxSlider(parent,*id,*value,*minValue,*maxValue,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSlider");
  break;
@@ -20196,7 +20233,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,(int) *value,(int) *minValue,(int) *maxValue,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*value,*minValue,*maxValue,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -20246,14 +20283,14 @@ case wxSlider_SetLineSize: { // wxSlider::SetLineSize
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * lineSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLineSize((int) *lineSize);
+ This->SetLineSize(*lineSize);
  break;
 }
 case wxSlider_SetPageSize: { // wxSlider::SetPageSize
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * pageSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPageSize((int) *pageSize);
+ This->SetPageSize(*pageSize);
  break;
 }
 case wxSlider_SetRange: { // wxSlider::SetRange
@@ -20261,21 +20298,21 @@ case wxSlider_SetRange: { // wxSlider::SetRange
  int * minValue = (int *) bp; bp += 4;
  int * maxValue = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minValue,(int) *maxValue);
+ This->SetRange(*minValue,*maxValue);
  break;
 }
 case wxSlider_SetThumbLength: { // wxSlider::SetThumbLength
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * lenPixels = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetThumbLength((int) *lenPixels);
+ This->SetThumbLength(*lenPixels);
  break;
 }
 case wxSlider_SetValue: { // wxSlider::SetValue
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *value);
+ This->SetValue(*value);
  break;
 }
 case wxDialog_new_4: { // wxDialog::wxDialog
@@ -20304,7 +20341,7 @@ case wxDialog_new_4: { // wxDialog::wxDialog
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxDialog * Result = new EwxDialog(parent,(wxWindowID) *id,title,pos,size,style);
+ wxDialog * Result = new EwxDialog(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 2, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxDialog");
  break;
@@ -20343,7 +20380,7 @@ case wxDialog_Create: { // wxDialog::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -20351,7 +20388,7 @@ case wxDialog_CreateButtonSizer: { // wxDialog::CreateButtonSizer
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizer * Result = (wxSizer*)This->CreateButtonSizer((long) *flags);
+ wxSizer * Result = (wxSizer*)This->CreateButtonSizer(*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxSizer");
  break;
 }
@@ -20359,7 +20396,7 @@ case wxDialog_CreateStdDialogButtonSizer: { // wxDialog::CreateStdDialogButtonSi
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxStdDialogButtonSizer * Result = (wxStdDialogButtonSizer*)This->CreateStdDialogButtonSizer((long) *flags);
+ wxStdDialogButtonSizer * Result = (wxStdDialogButtonSizer*)This->CreateStdDialogButtonSizer(*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxStdDialogButtonSizer");
  break;
 }
@@ -20367,7 +20404,7 @@ case wxDialog_EndModal: { // wxDialog::EndModal
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * retCode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EndModal((int) *retCode);
+ This->EndModal(*retCode);
  break;
 }
 case wxDialog_GetAffirmativeId: { // wxDialog::GetAffirmativeId
@@ -20395,14 +20432,14 @@ case wxDialog_SetAffirmativeId: { // wxDialog::SetAffirmativeId
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * affirmativeId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAffirmativeId((int) *affirmativeId);
+ This->SetAffirmativeId(*affirmativeId);
  break;
 }
 case wxDialog_SetReturnCode: { // wxDialog::SetReturnCode
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * returnCode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetReturnCode((int) *returnCode);
+ This->SetReturnCode(*returnCode);
  break;
 }
 case wxDialog_Show: { // wxDialog::Show
@@ -20498,7 +20535,7 @@ case wxColourData_GetCustomColour: { // wxColourData::GetCustomColour
  wxColourData *This = (wxColourData *) getPtr(bp,memenv); bp += 4;
  int * i = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetCustomColour((int) *i);
+ wxColour Result = This->GetCustomColour(*i);
  rt.add(Result);
  break;
 }
@@ -20506,7 +20543,7 @@ case wxColourData_SetChooseFull: { // wxColourData::SetChooseFull
  wxColourData *This = (wxColourData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetChooseFull((bool) *flag);
+ This->SetChooseFull(*flag);
  break;
 }
 case wxColourData_SetColour: { // wxColourData::SetColour
@@ -20529,7 +20566,7 @@ case wxColourData_SetCustomColour: { // wxColourData::SetCustomColour
  int * colourA = (int *) bp; bp += 4;
  wxColour colour = wxColour(*colourR,*colourG,*colourB,*colourA);
  if(!This) throw wxe_badarg(0);
- This->SetCustomColour((int) *i,colour);
+ This->SetCustomColour(*i,colour);
  break;
 }
 case wxPalette_new_0: { // wxPalette::wxPalette
@@ -20570,7 +20607,7 @@ case wxPalette_GetPixel: { // wxPalette::GetPixel
  unsigned int * green = (unsigned int *) bp; bp += 4;
  unsigned int * blue = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPixel((char) *red,(char) *green,(char) *blue);
+ int Result = This->GetPixel(*red,*green,*blue);
  rt.addInt(Result);
  break;
 }
@@ -20581,7 +20618,7 @@ case wxPalette_GetRGB: { // wxPalette::GetRGB
  wxPalette *This = (wxPalette *) getPtr(bp,memenv); bp += 4;
  int * pixel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetRGB((int) *pixel,&red,&green,&blue);
+ bool Result = This->GetRGB(*pixel,&red,&green,&blue);
  rt.addBool(Result);
  rt.addUint(red);
  rt.addUint(green);
@@ -20800,7 +20837,7 @@ case wxFileDialog_SetFilterIndex: { // wxFileDialog::SetFilterIndex
  wxFileDialog *This = (wxFileDialog *) getPtr(bp,memenv); bp += 4;
  int * filterIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFilterIndex((int) *filterIndex);
+ This->SetFilterIndex(*filterIndex);
  break;
 }
 case wxFileDialog_SetMessage: { // wxFileDialog::SetMessage
@@ -20834,7 +20871,7 @@ case wxPickerBase_SetInternalMargin: { // wxPickerBase::SetInternalMargin
  wxPickerBase *This = (wxPickerBase *) getPtr(bp,memenv); bp += 4;
  int * newmargin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInternalMargin((int) *newmargin);
+ This->SetInternalMargin(*newmargin);
  break;
 }
 case wxPickerBase_GetInternalMargin: { // wxPickerBase::GetInternalMargin
@@ -20848,14 +20885,14 @@ case wxPickerBase_SetTextCtrlProportion: { // wxPickerBase::SetTextCtrlProportio
  wxPickerBase *This = (wxPickerBase *) getPtr(bp,memenv); bp += 4;
  int * prop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTextCtrlProportion((int) *prop);
+ This->SetTextCtrlProportion(*prop);
  break;
 }
 case wxPickerBase_SetPickerCtrlProportion: { // wxPickerBase::SetPickerCtrlProportion
  wxPickerBase *This = (wxPickerBase *) getPtr(bp,memenv); bp += 4;
  int * prop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPickerCtrlProportion((int) *prop);
+ This->SetPickerCtrlProportion(*prop);
  break;
 }
 case wxPickerBase_GetTextCtrlProportion: { // wxPickerBase::GetTextCtrlProportion
@@ -20977,7 +21014,7 @@ case wxFilePickerCtrl_new_3: { // wxFilePickerCtrl::wxFilePickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxFilePickerCtrl * Result = new EwxFilePickerCtrl(parent,(wxWindowID) *id,path,message,wildcard,pos,size,style,*validator);
+ wxFilePickerCtrl * Result = new EwxFilePickerCtrl(parent,*id,path,message,wildcard,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFilePickerCtrl");
  break;
@@ -21030,7 +21067,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,path,message,wildcard,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,path,message,wildcard,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21095,7 +21132,7 @@ case wxDirPickerCtrl_new_3: { // wxDirPickerCtrl::wxDirPickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxDirPickerCtrl * Result = new EwxDirPickerCtrl(parent,(wxWindowID) *id,path,message,pos,size,style,*validator);
+ wxDirPickerCtrl * Result = new EwxDirPickerCtrl(parent,*id,path,message,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxDirPickerCtrl");
  break;
@@ -21142,7 +21179,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,path,message,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,path,message,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21204,7 +21241,7 @@ case wxColourPickerCtrl_new_3: { // wxColourPickerCtrl::wxColourPickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxColourPickerCtrl * Result = new EwxColourPickerCtrl(parent,(wxWindowID) *id,col,pos,size,style,*validator);
+ wxColourPickerCtrl * Result = new EwxColourPickerCtrl(parent,*id,col,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxColourPickerCtrl");
  break;
@@ -21248,7 +21285,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,col,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,col,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21324,7 +21361,7 @@ case wxDatePickerCtrl_new_3: { // wxDatePickerCtrl::wxDatePickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxDatePickerCtrl * Result = new EwxDatePickerCtrl(parent,(wxWindowID) *id,date,pos,size,style,*validator);
+ wxDatePickerCtrl * Result = new EwxDatePickerCtrl(parent,*id,date,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxDatePickerCtrl");
  break;
@@ -21427,7 +21464,7 @@ initial = (wxFont *) getPtr(bp,memenv); bp += 4;
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxFontPickerCtrl * Result = new EwxFontPickerCtrl(parent,(wxWindowID) *id,*initial,pos,size,style,*validator);
+ wxFontPickerCtrl * Result = new EwxFontPickerCtrl(parent,*id,*initial,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFontPickerCtrl");
  break;
@@ -21466,7 +21503,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,*initial,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*initial,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21495,7 +21532,7 @@ case wxFontPickerCtrl_SetMaxPointSize: { // wxFontPickerCtrl::SetMaxPointSize
  wxFontPickerCtrl *This = (wxFontPickerCtrl *) getPtr(bp,memenv); bp += 4;
  unsigned int * max = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaxPointSize((int) *max);
+ This->SetMaxPointSize(*max);
  break;
 }
 case wxFindReplaceDialog_new_0: { // wxFindReplaceDialog::wxFindReplaceDialog
@@ -21554,7 +21591,7 @@ case wxFindReplaceData_new_0: { // wxFindReplaceData::wxFindReplaceData
 }
 case wxFindReplaceData_new_1: { // wxFindReplaceData::wxFindReplaceData
  unsigned int * flags = (unsigned int *) bp; bp += 4;
- wxFindReplaceData * Result = new EwxFindReplaceData((int) *flags);
+ wxFindReplaceData * Result = new EwxFindReplaceData(*flags);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFindReplaceData");
  break;
@@ -21584,7 +21621,7 @@ case wxFindReplaceData_SetFlags: { // wxFindReplaceData::SetFlags
  wxFindReplaceData *This = (wxFindReplaceData *) getPtr(bp,memenv); bp += 4;
  unsigned int * flags = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((int) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxFindReplaceData_SetFindString: { // wxFindReplaceData::SetFindString
@@ -21725,7 +21762,7 @@ case wxSingleChoiceDialog_SetSelection: { // wxSingleChoiceDialog::SetSelection
  wxSingleChoiceDialog *This = (wxSingleChoiceDialog *) getPtr(bp,memenv); bp += 4;
  int * sel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *sel);
+ This->SetSelection(*sel);
  break;
 }
 case wxTextEntryDialog_new: { // wxTextEntryDialog::wxTextEntryDialog
@@ -21831,7 +21868,7 @@ case wxFontData_EnableEffects: { // wxFontData::EnableEffects
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableEffects((bool) *flag);
+ This->EnableEffects(*flag);
  break;
 }
 case wxFontData_GetAllowSymbols: { // wxFontData::GetAllowSymbols
@@ -21880,7 +21917,7 @@ case wxFontData_SetAllowSymbols: { // wxFontData::SetAllowSymbols
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAllowSymbols((bool) *flag);
+ This->SetAllowSymbols(*flag);
  break;
 }
 case wxFontData_SetChosenFont: { // wxFontData::SetChosenFont
@@ -21913,14 +21950,14 @@ case wxFontData_SetRange: { // wxFontData::SetRange
  int * minRange = (int *) bp; bp += 4;
  int * maxRange = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minRange,(int) *maxRange);
+ This->SetRange(*minRange,*maxRange);
  break;
 }
 case wxFontData_SetShowHelp: { // wxFontData::SetShowHelp
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetShowHelp((bool) *flag);
+ This->SetShowHelp(*flag);
  break;
 }
 case wxFontDialog_new_0: { // wxFontDialog::wxFontDialog
@@ -21997,7 +22034,7 @@ case wxProgressDialog_Update_2: { // wxProgressDialog::Update
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Update((int) *value,newmsg);
+ bool Result = This->Update(*value,newmsg);
  rt.addBool(Result);
  break;
 }
@@ -22088,35 +22125,35 @@ case wxPageSetupDialogData_EnableHelp: { // wxPageSetupDialogData::EnableHelp
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableHelp((bool) *flag);
+ This->EnableHelp(*flag);
  break;
 }
 case wxPageSetupDialogData_EnableMargins: { // wxPageSetupDialogData::EnableMargins
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableMargins((bool) *flag);
+ This->EnableMargins(*flag);
  break;
 }
 case wxPageSetupDialogData_EnableOrientation: { // wxPageSetupDialogData::EnableOrientation
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableOrientation((bool) *flag);
+ This->EnableOrientation(*flag);
  break;
 }
 case wxPageSetupDialogData_EnablePaper: { // wxPageSetupDialogData::EnablePaper
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePaper((bool) *flag);
+ This->EnablePaper(*flag);
  break;
 }
 case wxPageSetupDialogData_EnablePrinter: { // wxPageSetupDialogData::EnablePrinter
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePrinter((bool) *flag);
+ This->EnablePrinter(*flag);
  break;
 }
 case wxPageSetupDialogData_GetDefaultMinMargins: { // wxPageSetupDialogData::GetDefaultMinMargins
@@ -22199,7 +22236,7 @@ case wxPageSetupDialogData_GetMinMarginBottomRight: { // wxPageSetupDialogData::
 case wxPageSetupDialogData_GetPaperId: { // wxPageSetupDialogData::GetPaperId
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxPaperSize Result = This->GetPaperId();
+ int Result = This->GetPaperId();
  rt.addInt(Result);
  break;
 }
@@ -22228,14 +22265,14 @@ case wxPageSetupDialogData_SetDefaultInfo: { // wxPageSetupDialogData::SetDefaul
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDefaultInfo((bool) *flag);
+ This->SetDefaultInfo(*flag);
  break;
 }
 case wxPageSetupDialogData_SetDefaultMinMargins: { // wxPageSetupDialogData::SetDefaultMinMargins
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDefaultMinMargins((bool) *flag);
+ This->SetDefaultMinMargins(*flag);
  break;
 }
 case wxPageSetupDialogData_SetMarginTopLeft: { // wxPageSetupDialogData::SetMarginTopLeft
@@ -22276,9 +22313,9 @@ case wxPageSetupDialogData_SetMinMarginBottomRight: { // wxPageSetupDialogData::
 }
 case wxPageSetupDialogData_SetPaperId: { // wxPageSetupDialogData::SetPaperId
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
- int * id = (int *) bp; bp += 4;
+ wxPaperSize id = *(wxPaperSize *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetPaperId((wxPaperSize) *id);
+ This->SetPaperId(id);
  break;
 }
 case wxPageSetupDialogData_SetPaperSize_1_1: { // wxPageSetupDialogData::SetPaperSize
@@ -22292,9 +22329,9 @@ case wxPageSetupDialogData_SetPaperSize_1_1: { // wxPageSetupDialogData::SetPape
 }
 case wxPageSetupDialogData_SetPaperSize_1_0: { // wxPageSetupDialogData::SetPaperSize
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
- int * id = (int *) bp; bp += 4;
+ wxPaperSize id = *(wxPaperSize *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetPaperSize((wxPaperSize) *id);
+ This->SetPaperSize(id);
  break;
 }
 case wxPageSetupDialogData_SetPrintData: { // wxPageSetupDialogData::SetPrintData
@@ -22364,28 +22401,28 @@ case wxPrintDialogData_EnableHelp: { // wxPrintDialogData::EnableHelp
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableHelp((bool) *flag);
+ This->EnableHelp(*flag);
  break;
 }
 case wxPrintDialogData_EnablePageNumbers: { // wxPrintDialogData::EnablePageNumbers
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePageNumbers((bool) *flag);
+ This->EnablePageNumbers(*flag);
  break;
 }
 case wxPrintDialogData_EnablePrintToFile: { // wxPrintDialogData::EnablePrintToFile
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePrintToFile((bool) *flag);
+ This->EnablePrintToFile(*flag);
  break;
 }
 case wxPrintDialogData_EnableSelection: { // wxPrintDialogData::EnableSelection
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableSelection((bool) *flag);
+ This->EnableSelection(*flag);
  break;
 }
 case wxPrintDialogData_GetAllPages: { // wxPrintDialogData::GetAllPages
@@ -22469,35 +22506,35 @@ case wxPrintDialogData_SetCollate: { // wxPrintDialogData::SetCollate
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCollate((bool) *flag);
+ This->SetCollate(*flag);
  break;
 }
 case wxPrintDialogData_SetFromPage: { // wxPrintDialogData::SetFromPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFromPage((int) *v);
+ This->SetFromPage(*v);
  break;
 }
 case wxPrintDialogData_SetMaxPage: { // wxPrintDialogData::SetMaxPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaxPage((int) *v);
+ This->SetMaxPage(*v);
  break;
 }
 case wxPrintDialogData_SetMinPage: { // wxPrintDialogData::SetMinPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinPage((int) *v);
+ This->SetMinPage(*v);
  break;
 }
 case wxPrintDialogData_SetNoCopies: { // wxPrintDialogData::SetNoCopies
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetNoCopies((int) *v);
+ This->SetNoCopies(*v);
  break;
 }
 case wxPrintDialogData_SetPrintData: { // wxPrintDialogData::SetPrintData
@@ -22511,21 +22548,21 @@ case wxPrintDialogData_SetPrintToFile: { // wxPrintDialogData::SetPrintToFile
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrintToFile((bool) *flag);
+ This->SetPrintToFile(*flag);
  break;
 }
 case wxPrintDialogData_SetSelection: { // wxPrintDialogData::SetSelection
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((bool) *flag);
+ This->SetSelection(*flag);
  break;
 }
 case wxPrintDialogData_SetToPage: { // wxPrintDialogData::SetToPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetToPage((int) *v);
+ This->SetToPage(*v);
  break;
 }
 case wxPrintData_new_0: { // wxPrintData::wxPrintData
@@ -22586,7 +22623,7 @@ case wxPrintData_GetOrientation: { // wxPrintData::GetOrientation
 case wxPrintData_GetPaperId: { // wxPrintData::GetPaperId
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxPaperSize Result = This->GetPaperId();
+ int Result = This->GetPaperId();
  rt.addInt(Result);
  break;
 }
@@ -22615,49 +22652,49 @@ case wxPrintData_SetBin: { // wxPrintData::SetBin
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  wxPrintBin bin = *(wxPrintBin *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetBin((wxPrintBin) bin);
+ This->SetBin(bin);
  break;
 }
 case wxPrintData_SetCollate: { // wxPrintData::SetCollate
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCollate((bool) *flag);
+ This->SetCollate(*flag);
  break;
 }
 case wxPrintData_SetColour: { // wxPrintData::SetColour
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  bool * colour = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColour((bool) *colour);
+ This->SetColour(*colour);
  break;
 }
 case wxPrintData_SetDuplex: { // wxPrintData::SetDuplex
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  wxDuplexMode duplex = *(wxDuplexMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetDuplex((wxDuplexMode) duplex);
+ This->SetDuplex(duplex);
  break;
 }
 case wxPrintData_SetNoCopies: { // wxPrintData::SetNoCopies
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetNoCopies((int) *v);
+ This->SetNoCopies(*v);
  break;
 }
 case wxPrintData_SetOrientation: { // wxPrintData::SetOrientation
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOrientation((int) *orient);
+ This->SetOrientation(*orient);
  break;
 }
 case wxPrintData_SetPaperId: { // wxPrintData::SetPaperId
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
- int * sizeId = (int *) bp; bp += 4;
+ wxPaperSize sizeId = *(wxPaperSize *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetPaperId((wxPaperSize) *sizeId);
+ This->SetPaperId(sizeId);
  break;
 }
 case wxPrintData_SetPrinterName: { // wxPrintData::SetPrinterName
@@ -22673,7 +22710,7 @@ case wxPrintData_SetQuality: { // wxPrintData::SetQuality
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  int * quality = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetQuality((wxPrintQuality) *quality);
+ This->SetQuality(*quality);
  break;
 }
 case wxPrintPreview_new_2: { // wxPrintPreview::wxPrintPreview
@@ -22772,7 +22809,7 @@ case wxPrintPreview_Print: { // wxPrintPreview::Print
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  bool * interactive = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Print((bool) *interactive);
+ bool Result = This->Print(*interactive);
  rt.addBool(Result);
  break;
 }
@@ -22780,7 +22817,7 @@ case wxPrintPreview_RenderPage: { // wxPrintPreview::RenderPage
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  int * pageNum = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RenderPage((int) *pageNum);
+ bool Result = This->RenderPage(*pageNum);
  rt.addBool(Result);
  break;
 }
@@ -22795,7 +22832,7 @@ case wxPrintPreview_SetCurrentPage: { // wxPrintPreview::SetCurrentPage
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  int * pageNum = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetCurrentPage((int) *pageNum);
+ bool Result = This->SetCurrentPage(*pageNum);
  rt.addBool(Result);
  break;
 }
@@ -22817,7 +22854,7 @@ case wxPrintPreview_SetZoom: { // wxPrintPreview::SetZoom
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  int * percent = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetZoom((int) *percent);
+ This->SetZoom(*percent);
  break;
 }
 case wxPreviewFrame_new: { // wxPreviewFrame::wxPreviewFrame
@@ -22904,7 +22941,7 @@ case wxPreviewControlBar_new: { // wxPreviewControlBar::wxPreviewControlBar
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxPreviewControlBar * Result = new EwxPreviewControlBar(preview,(long) *buttons,parent,pos,size,style);
+ wxPreviewControlBar * Result = new EwxPreviewControlBar(preview,*buttons,parent,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxPreviewControlBar");
  break;
@@ -22933,7 +22970,7 @@ case wxPreviewControlBar_SetZoomControl: { // wxPreviewControlBar::SetZoomContro
  wxPreviewControlBar *This = (wxPreviewControlBar *) getPtr(bp,memenv); bp += 4;
  int * zoom = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetZoomControl((int) *zoom);
+ This->SetZoomControl(*zoom);
  break;
 }
 case wxPrinter_new: { // wxPrinter::wxPrinter
@@ -23089,7 +23126,7 @@ case wxXmlResource_CompareVersion: { // wxXmlResource::CompareVersion
  int * release = (int *) bp; bp += 4;
  int * revision = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->CompareVersion((int) *major,(int) *minor,(int) *release,(int) *revision);
+ int Result = This->CompareVersion(*major,*minor,*release,*revision);
  rt.addInt(Result);
  break;
 }
@@ -23283,7 +23320,7 @@ case wxXmlResource_SetFlags: { // wxXmlResource::SetFlags
  wxXmlResource *This = (wxXmlResource *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((int) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxXmlResource_Unload: { // wxXmlResource::Unload
@@ -23811,14 +23848,14 @@ case wxAuiManager_SetDockSizeConstraint: { // wxAuiManager::SetDockSizeConstrain
  double * width_pct = (double *) bp; bp += 8;
  double * height_pct = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->SetDockSizeConstraint((double) *width_pct,(double) *height_pct);
+ This->SetDockSizeConstraint(*width_pct,*height_pct);
  break;
 }
 case wxAuiManager_SetFlags: { // wxAuiManager::SetFlags
  wxAuiManager *This = (wxAuiManager *) getPtr(bp,memenv); bp += 4;
  unsigned int * flags = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((int) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxAuiManager_SetManagedWindow: { // wxAuiManager::SetManagedWindow
@@ -23887,7 +23924,7 @@ case wxAuiPaneInfo_BestSize_2: { // wxAuiPaneInfo::BestSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->BestSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->BestSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -23989,7 +24026,7 @@ case wxAuiPaneInfo_Direction: { // wxAuiPaneInfo::Direction
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * direction = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Direction((int) *direction);
+ wxAuiPaneInfo * Result = &This->Direction(*direction);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24057,7 +24094,7 @@ case wxAuiPaneInfo_FloatingPosition_2: { // wxAuiPaneInfo::FloatingPosition
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->FloatingPosition((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->FloatingPosition(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24076,7 +24113,7 @@ case wxAuiPaneInfo_FloatingSize_2: { // wxAuiPaneInfo::FloatingSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->FloatingSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->FloatingSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24133,7 +24170,7 @@ case wxAuiPaneInfo_HasFlag: { // wxAuiPaneInfo::HasFlag
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  unsigned int * flag = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->HasFlag((int) *flag);
+ bool Result = This->HasFlag(*flag);
  rt.addBool(Result);
  break;
 }
@@ -24274,7 +24311,7 @@ case wxAuiPaneInfo_Layer: { // wxAuiPaneInfo::Layer
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * layer = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Layer((int) *layer);
+ wxAuiPaneInfo * Result = &This->Layer(*layer);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24314,7 +24351,7 @@ case wxAuiPaneInfo_MaxSize_2: { // wxAuiPaneInfo::MaxSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->MaxSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->MaxSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24347,7 +24384,7 @@ case wxAuiPaneInfo_MinSize_2: { // wxAuiPaneInfo::MinSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->MinSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->MinSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24421,7 +24458,7 @@ case wxAuiPaneInfo_Position: { // wxAuiPaneInfo::Position
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Position((int) *pos);
+ wxAuiPaneInfo * Result = &This->Position(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24464,7 +24501,7 @@ case wxAuiPaneInfo_Row: { // wxAuiPaneInfo::Row
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Row((int) *row);
+ wxAuiPaneInfo * Result = &This->Row(*row);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24480,7 +24517,7 @@ case wxAuiPaneInfo_SetFlag: { // wxAuiPaneInfo::SetFlag
  unsigned int * flag = (unsigned int *) bp; bp += 4;
  bool * option_state = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->SetFlag((int) *flag,(bool) *option_state);
+ wxAuiPaneInfo * Result = &This->SetFlag(*flag,*option_state);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24631,7 +24668,7 @@ case wxAuiNotebook_DeletePage: { // wxAuiNotebook::DeletePage
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *page);
+ bool Result = This->DeletePage(*page);
  rt.addBool(Result);
  break;
 }
@@ -24646,7 +24683,7 @@ case wxAuiNotebook_GetPage: { // wxAuiNotebook::GetPage
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *page_idx);
+ wxWindow * Result = (wxWindow*)This->GetPage(*page_idx);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -24654,7 +24691,7 @@ case wxAuiNotebook_GetPageBitmap: { // wxAuiNotebook::GetPageBitmap
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetPageBitmap((size_t) *page_idx)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new wxBitmap(This->GetPageBitmap(*page_idx)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -24677,7 +24714,7 @@ case wxAuiNotebook_GetPageText: { // wxAuiNotebook::GetPageText
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *page_idx);
+ wxString Result = This->GetPageText(*page_idx);
  rt.add(Result);
  break;
 }
@@ -24706,7 +24743,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *page_idx,page,caption,select,*bitmap);
+ bool Result = This->InsertPage(*page_idx,page,caption,select,*bitmap);
  rt.addBool(Result);
  break;
 }
@@ -24714,7 +24751,7 @@ case wxAuiNotebook_RemovePage: { // wxAuiNotebook::RemovePage
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *page);
+ bool Result = This->RemovePage(*page);
  rt.addBool(Result);
  break;
 }
@@ -24738,7 +24775,7 @@ case wxAuiNotebook_SetPageBitmap: { // wxAuiNotebook::SetPageBitmap
  int * page = (int *) bp; bp += 4;
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageBitmap((size_t) *page,*bitmap);
+ bool Result = This->SetPageBitmap(*page,*bitmap);
  rt.addBool(Result);
  break;
 }
@@ -24749,7 +24786,7 @@ case wxAuiNotebook_SetPageText: { // wxAuiNotebook::SetPageText
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *page,text);
+ bool Result = This->SetPageText(*page,text);
  rt.addBool(Result);
  break;
 }
@@ -24757,7 +24794,7 @@ case wxAuiNotebook_SetSelection: { // wxAuiNotebook::SetSelection
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * new_page = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- size_t Result = This->SetSelection((size_t) *new_page);
+ size_t Result = This->SetSelection(*new_page);
  rt.addInt(Result);
  break;
 }
@@ -24765,7 +24802,7 @@ case wxAuiNotebook_SetTabCtrlHeight: { // wxAuiNotebook::SetTabCtrlHeight
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTabCtrlHeight((int) *height);
+ This->SetTabCtrlHeight(*height);
  break;
 }
 case wxAuiNotebook_SetUniformBitmapSize: { // wxAuiNotebook::SetUniformBitmapSize
@@ -24814,7 +24851,7 @@ case wxMDIParentFrame_new_4: { // wxMDIParentFrame::wxMDIParentFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxMDIParentFrame * Result = new EwxMDIParentFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxMDIParentFrame * Result = new EwxMDIParentFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMDIParentFrame");
  break;
@@ -24871,7 +24908,7 @@ case wxMDIParentFrame_Create: { // wxMDIParentFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -24899,7 +24936,7 @@ orient = *(wxOrientation *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Tile((wxOrientation) orient);
+ This->Tile(orient);
  break;
 }
 case wxMDIChildFrame_new_0: { // wxMDIChildFrame::wxMDIChildFrame
@@ -24934,7 +24971,7 @@ case wxMDIChildFrame_new_4: { // wxMDIChildFrame::wxMDIChildFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxMDIChildFrame * Result = new EwxMDIChildFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxMDIChildFrame * Result = new EwxMDIChildFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMDIChildFrame");
  break;
@@ -24973,7 +25010,7 @@ case wxMDIChildFrame_Create: { // wxMDIChildFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -25002,6 +25039,7 @@ case wxMDIClientWindow_new_0: { // wxMDIClientWindow::wxMDIClientWindow
  rt.addRef(getRef((void *)Result,memenv), "wxMDIClientWindow");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxMDIClientWindow_new_2: { // wxMDIClientWindow::wxMDIClientWindow
  long style=0;
  wxMDIParentFrame *parent = (wxMDIParentFrame *) getPtr(bp,memenv); bp += 4;
@@ -25016,6 +25054,7 @@ case wxMDIClientWindow_new_2: { // wxMDIClientWindow::wxMDIClientWindow
  rt.addRef(getRef((void *)Result,memenv), "wxMDIClientWindow");
  break;
 }
+#endif
 case wxMDIClientWindow_CreateClient: { // wxMDIClientWindow::CreateClient
  long style=wxVSCROLL|wxHSCROLL;
  wxMDIClientWindow *This = (wxMDIClientWindow *) getPtr(bp,memenv); bp += 4;
@@ -25115,7 +25154,7 @@ case wxEvent_ResumePropagation: { // wxEvent::ResumePropagation
  wxEvent *This = (wxEvent *) getPtr(bp,memenv); bp += 4;
  int * propagationLevel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ResumePropagation((int) *propagationLevel);
+ This->ResumePropagation(*propagationLevel);
  break;
 }
 case wxEvent_ShouldPropagate: { // wxEvent::ShouldPropagate
@@ -25198,7 +25237,7 @@ case wxCommandEvent_SetInt: { // wxCommandEvent::SetInt
  wxCommandEvent *This = (wxCommandEvent *) getPtr(bp,memenv); bp += 4;
  int * i = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInt((int) *i);
+ This->SetInt(*i);
  break;
 }
 case wxCommandEvent_SetString: { // wxCommandEvent::SetString
@@ -25249,7 +25288,7 @@ case wxMouseEvent_Button: { // wxMouseEvent::Button
  wxMouseEvent *This = (wxMouseEvent *) getPtr(bp,memenv); bp += 4;
  int * but = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Button((int) *but);
+ bool Result = This->Button(*but);
  rt.addBool(Result);
  break;
 }
@@ -25713,14 +25752,14 @@ case wxCloseEvent_SetCanVeto: { // wxCloseEvent::SetCanVeto
  wxCloseEvent *This = (wxCloseEvent *) getPtr(bp,memenv); bp += 4;
  bool * canVeto = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCanVeto((bool) *canVeto);
+ This->SetCanVeto(*canVeto);
  break;
 }
 case wxCloseEvent_SetLoggingOff: { // wxCloseEvent::SetLoggingOff
  wxCloseEvent *This = (wxCloseEvent *) getPtr(bp,memenv); bp += 4;
  bool * logOff = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLoggingOff((bool) *logOff);
+ This->SetLoggingOff(*logOff);
  break;
 }
 case wxCloseEvent_Veto: { // wxCloseEvent::Veto
@@ -25740,7 +25779,7 @@ case wxShowEvent_SetShow: { // wxShowEvent::SetShow
  wxShowEvent *This = (wxShowEvent *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetShow((bool) *show);
+ This->SetShow(*show);
  break;
 }
 case wxShowEvent_GetShow: { // wxShowEvent::GetShow
@@ -25865,21 +25904,21 @@ case wxUpdateUIEvent_Check: { // wxUpdateUIEvent::Check
  wxUpdateUIEvent *This = (wxUpdateUIEvent *) getPtr(bp,memenv); bp += 4;
  bool * check = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Check((bool) *check);
+ This->Check(*check);
  break;
 }
 case wxUpdateUIEvent_Enable: { // wxUpdateUIEvent::Enable
  wxUpdateUIEvent *This = (wxUpdateUIEvent *) getPtr(bp,memenv); bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Enable((bool) *enable);
+ This->Enable(*enable);
  break;
 }
 case wxUpdateUIEvent_Show: { // wxUpdateUIEvent::Show
  wxUpdateUIEvent *This = (wxUpdateUIEvent *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show);
+ This->Show(*show);
  break;
 }
 case wxUpdateUIEvent_GetChecked: { // wxUpdateUIEvent::GetChecked
@@ -25954,7 +25993,7 @@ case wxUpdateUIEvent_ResetUpdateTime: { // wxUpdateUIEvent::ResetUpdateTime
 }
 case wxUpdateUIEvent_SetMode: { // wxUpdateUIEvent::SetMode
  wxUpdateUIMode mode = *(wxUpdateUIMode *) bp; bp += 4;;
- wxUpdateUIEvent::SetMode((wxUpdateUIMode) mode);
+ wxUpdateUIEvent::SetMode(mode);
  break;
 }
 case wxUpdateUIEvent_SetText: { // wxUpdateUIEvent::SetText
@@ -25968,7 +26007,7 @@ case wxUpdateUIEvent_SetText: { // wxUpdateUIEvent::SetText
 }
 case wxUpdateUIEvent_SetUpdateInterval: { // wxUpdateUIEvent::SetUpdateInterval
  int * updateInterval = (int *) bp; bp += 4;
- wxUpdateUIEvent::SetUpdateInterval((long) *updateInterval);
+ wxUpdateUIEvent::SetUpdateInterval(*updateInterval);
  break;
 }
 case wxMouseCaptureChangedEvent_GetCapturedWindow: { // wxMouseCaptureChangedEvent::GetCapturedWindow
@@ -25996,7 +26035,7 @@ case wxQueryNewPaletteEvent_SetPaletteRealized: { // wxQueryNewPaletteEvent::Set
  wxQueryNewPaletteEvent *This = (wxQueryNewPaletteEvent *) getPtr(bp,memenv); bp += 4;
  bool * realized = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPaletteRealized((bool) *realized);
+ This->SetPaletteRealized(*realized);
  break;
 }
 case wxQueryNewPaletteEvent_GetPaletteRealized: { // wxQueryNewPaletteEvent::GetPaletteRealized
@@ -26017,7 +26056,7 @@ case wxNavigationKeyEvent_SetDirection: { // wxNavigationKeyEvent::SetDirection
  wxNavigationKeyEvent *This = (wxNavigationKeyEvent *) getPtr(bp,memenv); bp += 4;
  bool * bForward = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDirection((bool) *bForward);
+ This->SetDirection(*bForward);
  break;
 }
 case wxNavigationKeyEvent_IsWindowChange: { // wxNavigationKeyEvent::IsWindowChange
@@ -26031,7 +26070,7 @@ case wxNavigationKeyEvent_SetWindowChange: { // wxNavigationKeyEvent::SetWindowC
  wxNavigationKeyEvent *This = (wxNavigationKeyEvent *) getPtr(bp,memenv); bp += 4;
  bool * bIs = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowChange((bool) *bIs);
+ This->SetWindowChange(*bIs);
  break;
 }
 case wxNavigationKeyEvent_IsFromTab: { // wxNavigationKeyEvent::IsFromTab
@@ -26045,7 +26084,7 @@ case wxNavigationKeyEvent_SetFromTab: { // wxNavigationKeyEvent::SetFromTab
  wxNavigationKeyEvent *This = (wxNavigationKeyEvent *) getPtr(bp,memenv); bp += 4;
  bool * bIs = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFromTab((bool) *bIs);
+ This->SetFromTab(*bIs);
  break;
 }
 case wxNavigationKeyEvent_GetCurrentFocus: { // wxNavigationKeyEvent::GetCurrentFocus
@@ -26080,7 +26119,7 @@ case wxHelpEvent_SetOrigin: { // wxHelpEvent::SetOrigin
  wxHelpEvent *This = (wxHelpEvent *) getPtr(bp,memenv); bp += 4;
  wxHelpEvent::Origin origin = *(wxHelpEvent::Origin *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetOrigin((wxHelpEvent::Origin) origin);
+ This->SetOrigin(origin);
  break;
 }
 case wxHelpEvent_SetPosition: { // wxHelpEvent::SetPosition
@@ -26108,12 +26147,14 @@ case wxContextMenuEvent_SetPosition: { // wxContextMenuEvent::SetPosition
  This->SetPosition(pos);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxIdleEvent_CanSend: { // wxIdleEvent::CanSend
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  bool Result = wxIdleEvent::CanSend(win);
  rt.addBool(Result);
  break;
 }
+#endif
 case wxIdleEvent_GetMode: { // wxIdleEvent::GetMode
  int Result = wxIdleEvent::GetMode();
  rt.addInt(Result);
@@ -26141,7 +26182,7 @@ case wxIdleEvent_MoreRequested: { // wxIdleEvent::MoreRequested
 }
 case wxIdleEvent_SetMode: { // wxIdleEvent::SetMode
  wxIdleMode mode = *(wxIdleMode *) bp; bp += 4;;
- wxIdleEvent::SetMode((wxIdleMode) mode);
+ wxIdleEvent::SetMode(mode);
  break;
 }
 case wxGridEvent_AltDown: { // wxGridEvent::AltDown
@@ -26529,7 +26570,7 @@ case wxStyledTextEvent_GetAlt: { // wxStyledTextEvent::GetAlt
 }
 case utils_wxGetKeyState: { // utils::wxGetKeyState
  wxKeyCode key = *(wxKeyCode *) bp; bp += 4;;
- bool Result = ::wxGetKeyState((wxKeyCode) key);
+ bool Result = ::wxGetKeyState(key);
  rt.addBool(Result);
  break;
 }
@@ -26549,7 +26590,7 @@ case utils_wxGetMouseState: { // utils::wxGetMouseState
 }
 case utils_wxSetDetectableAutoRepeat: { // utils::wxSetDetectableAutoRepeat
  bool * flag = (bool *) bp; bp += 4;
- bool Result = ::wxSetDetectableAutoRepeat((bool) *flag);
+ bool Result = ::wxSetDetectableAutoRepeat(*flag);
  rt.addBool(Result);
  break;
 }
@@ -26606,7 +26647,7 @@ case utils_wxIsBusy: { // utils::wxIsBusy
 }
 case utils_wxShutdown: { // utils::wxShutdown
  wxShutdownFlags wFlags = *(wxShutdownFlags *) bp; bp += 4;;
- bool Result = ::wxShutdown((wxShutdownFlags) wFlags);
+ bool Result = ::wxShutdown(wFlags);
  rt.addBool(Result);
  break;
 }
@@ -26659,7 +26700,7 @@ case utils_wxNewId: { // utils::wxNewId
 }
 case utils_wxRegisterId: { // utils::wxRegisterId
  int * id = (int *) bp; bp += 4;
- ::wxRegisterId((long) *id);
+ ::wxRegisterId(*id);
  break;
 }
 case utils_wxGetCurrentId: { // utils::wxGetCurrentId
@@ -26862,7 +26903,7 @@ case wxPrintout_SetLogicalOrigin: { // wxPrintout::SetLogicalOrigin
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLogicalOrigin((wxCoord) *x,(wxCoord) *y);
+ This->SetLogicalOrigin(*x,*y);
  break;
 }
 case wxPrintout_OffsetLogicalOrigin: { // wxPrintout::OffsetLogicalOrigin
@@ -26870,7 +26911,7 @@ case wxPrintout_OffsetLogicalOrigin: { // wxPrintout::OffsetLogicalOrigin
  int * xoff = (int *) bp; bp += 4;
  int * yoff = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->OffsetLogicalOrigin((wxCoord) *xoff,(wxCoord) *yoff);
+ This->OffsetLogicalOrigin(*xoff,*yoff);
  break;
 }
 case wxStyledTextCtrl_new_2: { // wxStyledTextCtrl::wxStyledTextCtrl
@@ -26966,7 +27007,7 @@ case wxStyledTextCtrl_InsertText: { // wxStyledTextCtrl::InsertText
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->InsertText((int) *pos,text);
+ This->InsertText(*pos,text);
  break;
 }
 case wxStyledTextCtrl_ClearAll: { // wxStyledTextCtrl::ClearAll
@@ -26992,7 +27033,7 @@ case wxStyledTextCtrl_GetCharAt: { // wxStyledTextCtrl::GetCharAt
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetCharAt((int) *pos);
+ int Result = This->GetCharAt(*pos);
  rt.addInt(Result);
  break;
 }
@@ -27014,7 +27055,7 @@ case wxStyledTextCtrl_GetStyleAt: { // wxStyledTextCtrl::GetStyleAt
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetStyleAt((int) *pos);
+ int Result = This->GetStyleAt(*pos);
  rt.addInt(Result);
  break;
 }
@@ -27028,7 +27069,7 @@ case wxStyledTextCtrl_SetUndoCollection: { // wxStyledTextCtrl::SetUndoCollectio
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * collectUndo = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUndoCollection((bool) *collectUndo);
+ This->SetUndoCollection(*collectUndo);
  break;
 }
 case wxStyledTextCtrl_SelectAll: { // wxStyledTextCtrl::SelectAll
@@ -27048,7 +27089,7 @@ case wxStyledTextCtrl_GetStyledText: { // wxStyledTextCtrl::GetStyledText
  int * startPos = (int *) bp; bp += 4;
  int * endPos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMemoryBuffer * Result = new wxMemoryBuffer(This->GetStyledText((int) *startPos,(int) *endPos)); newPtr((void *) Result,3, memenv);;
+ wxMemoryBuffer * Result = new wxMemoryBuffer(This->GetStyledText(*startPos,*endPos)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxMemoryBuffer");
  break;
 }
@@ -27063,7 +27104,7 @@ case wxStyledTextCtrl_MarkerLineFromHandle: { // wxStyledTextCtrl::MarkerLineFro
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * handle = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerLineFromHandle((int) *handle);
+ int Result = This->MarkerLineFromHandle(*handle);
  rt.addInt(Result);
  break;
 }
@@ -27071,7 +27112,7 @@ case wxStyledTextCtrl_MarkerDeleteHandle: { // wxStyledTextCtrl::MarkerDeleteHan
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * handle = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDeleteHandle((int) *handle);
+ This->MarkerDeleteHandle(*handle);
  break;
 }
 case wxStyledTextCtrl_GetUndoCollection: { // wxStyledTextCtrl::GetUndoCollection
@@ -27092,7 +27133,7 @@ case wxStyledTextCtrl_SetViewWhiteSpace: { // wxStyledTextCtrl::SetViewWhiteSpac
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * viewWS = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetViewWhiteSpace((int) *viewWS);
+ This->SetViewWhiteSpace(*viewWS);
  break;
 }
 case wxStyledTextCtrl_PositionFromPoint: { // wxStyledTextCtrl::PositionFromPoint
@@ -27110,7 +27151,7 @@ case wxStyledTextCtrl_PositionFromPointClose: { // wxStyledTextCtrl::PositionFro
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionFromPointClose((int) *x,(int) *y);
+ int Result = This->PositionFromPointClose(*x,*y);
  rt.addInt(Result);
  break;
 }
@@ -27118,21 +27159,21 @@ case wxStyledTextCtrl_GotoLine: { // wxStyledTextCtrl::GotoLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->GotoLine((int) *line);
+ This->GotoLine(*line);
  break;
 }
 case wxStyledTextCtrl_GotoPos: { // wxStyledTextCtrl::GotoPos
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->GotoPos((int) *pos);
+ This->GotoPos(*pos);
  break;
 }
 case wxStyledTextCtrl_SetAnchor: { // wxStyledTextCtrl::SetAnchor
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * posAnchor = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAnchor((int) *posAnchor);
+ This->SetAnchor(*posAnchor);
  break;
 }
 case wxStyledTextCtrl_GetCurLine: { // wxStyledTextCtrl::GetCurLine
@@ -27156,7 +27197,7 @@ case wxStyledTextCtrl_ConvertEOLs: { // wxStyledTextCtrl::ConvertEOLs
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * eolMode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ConvertEOLs((int) *eolMode);
+ This->ConvertEOLs(*eolMode);
  break;
 }
 case wxStyledTextCtrl_GetEOLMode: { // wxStyledTextCtrl::GetEOLMode
@@ -27170,7 +27211,7 @@ case wxStyledTextCtrl_SetEOLMode: { // wxStyledTextCtrl::SetEOLMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * eolMode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEOLMode((int) *eolMode);
+ This->SetEOLMode(*eolMode);
  break;
 }
 case wxStyledTextCtrl_StartStyling: { // wxStyledTextCtrl::StartStyling
@@ -27178,7 +27219,7 @@ case wxStyledTextCtrl_StartStyling: { // wxStyledTextCtrl::StartStyling
  int * pos = (int *) bp; bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StartStyling((int) *pos,(int) *mask);
+ This->StartStyling(*pos,*mask);
  break;
 }
 case wxStyledTextCtrl_SetStyling: { // wxStyledTextCtrl::SetStyling
@@ -27186,7 +27227,7 @@ case wxStyledTextCtrl_SetStyling: { // wxStyledTextCtrl::SetStyling
  int * length = (int *) bp; bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyling((int) *length,(int) *style);
+ This->SetStyling(*length,*style);
  break;
 }
 case wxStyledTextCtrl_GetBufferedDraw: { // wxStyledTextCtrl::GetBufferedDraw
@@ -27200,14 +27241,14 @@ case wxStyledTextCtrl_SetBufferedDraw: { // wxStyledTextCtrl::SetBufferedDraw
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * buffered = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBufferedDraw((bool) *buffered);
+ This->SetBufferedDraw(*buffered);
  break;
 }
 case wxStyledTextCtrl_SetTabWidth: { // wxStyledTextCtrl::SetTabWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * tabWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTabWidth((int) *tabWidth);
+ This->SetTabWidth(*tabWidth);
  break;
 }
 case wxStyledTextCtrl_GetTabWidth: { // wxStyledTextCtrl::GetTabWidth
@@ -27221,7 +27262,7 @@ case wxStyledTextCtrl_SetCodePage: { // wxStyledTextCtrl::SetCodePage
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * codePage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCodePage((int) *codePage);
+ This->SetCodePage(*codePage);
  break;
 }
 case wxStyledTextCtrl_MarkerDefine: { // wxStyledTextCtrl::MarkerDefine
@@ -27250,7 +27291,7 @@ case wxStyledTextCtrl_MarkerDefine: { // wxStyledTextCtrl::MarkerDefine
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->MarkerDefine((int) *markerNumber,(int) *markerSymbol,foreground,background);
+ This->MarkerDefine(*markerNumber,*markerSymbol,foreground,background);
  break;
 }
 case wxStyledTextCtrl_MarkerSetForeground: { // wxStyledTextCtrl::MarkerSetForeground
@@ -27262,7 +27303,7 @@ case wxStyledTextCtrl_MarkerSetForeground: { // wxStyledTextCtrl::MarkerSetForeg
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->MarkerSetForeground((int) *markerNumber,fore);
+ This->MarkerSetForeground(*markerNumber,fore);
  break;
 }
 case wxStyledTextCtrl_MarkerSetBackground: { // wxStyledTextCtrl::MarkerSetBackground
@@ -27274,7 +27315,7 @@ case wxStyledTextCtrl_MarkerSetBackground: { // wxStyledTextCtrl::MarkerSetBackg
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->MarkerSetBackground((int) *markerNumber,back);
+ This->MarkerSetBackground(*markerNumber,back);
  break;
 }
 case wxStyledTextCtrl_MarkerAdd: { // wxStyledTextCtrl::MarkerAdd
@@ -27282,7 +27323,7 @@ case wxStyledTextCtrl_MarkerAdd: { // wxStyledTextCtrl::MarkerAdd
  int * line = (int *) bp; bp += 4;
  int * markerNumber = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerAdd((int) *line,(int) *markerNumber);
+ int Result = This->MarkerAdd(*line,*markerNumber);
  rt.addInt(Result);
  break;
 }
@@ -27291,21 +27332,21 @@ case wxStyledTextCtrl_MarkerDelete: { // wxStyledTextCtrl::MarkerDelete
  int * line = (int *) bp; bp += 4;
  int * markerNumber = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDelete((int) *line,(int) *markerNumber);
+ This->MarkerDelete(*line,*markerNumber);
  break;
 }
 case wxStyledTextCtrl_MarkerDeleteAll: { // wxStyledTextCtrl::MarkerDeleteAll
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * markerNumber = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDeleteAll((int) *markerNumber);
+ This->MarkerDeleteAll(*markerNumber);
  break;
 }
 case wxStyledTextCtrl_MarkerGet: { // wxStyledTextCtrl::MarkerGet
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerGet((int) *line);
+ int Result = This->MarkerGet(*line);
  rt.addInt(Result);
  break;
 }
@@ -27314,7 +27355,7 @@ case wxStyledTextCtrl_MarkerNext: { // wxStyledTextCtrl::MarkerNext
  int * lineStart = (int *) bp; bp += 4;
  int * markerMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerNext((int) *lineStart,(int) *markerMask);
+ int Result = This->MarkerNext(*lineStart,*markerMask);
  rt.addInt(Result);
  break;
 }
@@ -27323,7 +27364,7 @@ case wxStyledTextCtrl_MarkerPrevious: { // wxStyledTextCtrl::MarkerPrevious
  int * lineStart = (int *) bp; bp += 4;
  int * markerMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerPrevious((int) *lineStart,(int) *markerMask);
+ int Result = This->MarkerPrevious(*lineStart,*markerMask);
  rt.addInt(Result);
  break;
 }
@@ -27332,7 +27373,7 @@ case wxStyledTextCtrl_MarkerDefineBitmap: { // wxStyledTextCtrl::MarkerDefineBit
  int * markerNumber = (int *) bp; bp += 4;
  wxBitmap *bmp = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDefineBitmap((int) *markerNumber,*bmp);
+ This->MarkerDefineBitmap(*markerNumber,*bmp);
  break;
 }
 case wxStyledTextCtrl_MarkerAddSet: { // wxStyledTextCtrl::MarkerAddSet
@@ -27340,7 +27381,7 @@ case wxStyledTextCtrl_MarkerAddSet: { // wxStyledTextCtrl::MarkerAddSet
  int * line = (int *) bp; bp += 4;
  int * set = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerAddSet((int) *line,(int) *set);
+ This->MarkerAddSet(*line,*set);
  break;
 }
 case wxStyledTextCtrl_MarkerSetAlpha: { // wxStyledTextCtrl::MarkerSetAlpha
@@ -27348,7 +27389,7 @@ case wxStyledTextCtrl_MarkerSetAlpha: { // wxStyledTextCtrl::MarkerSetAlpha
  int * markerNumber = (int *) bp; bp += 4;
  int * alpha = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerSetAlpha((int) *markerNumber,(int) *alpha);
+ This->MarkerSetAlpha(*markerNumber,*alpha);
  break;
 }
 case wxStyledTextCtrl_SetMarginType: { // wxStyledTextCtrl::SetMarginType
@@ -27356,14 +27397,14 @@ case wxStyledTextCtrl_SetMarginType: { // wxStyledTextCtrl::SetMarginType
  int * margin = (int *) bp; bp += 4;
  int * marginType = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginType((int) *margin,(int) *marginType);
+ This->SetMarginType(*margin,*marginType);
  break;
 }
 case wxStyledTextCtrl_GetMarginType: { // wxStyledTextCtrl::GetMarginType
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetMarginType((int) *margin);
+ int Result = This->GetMarginType(*margin);
  rt.addInt(Result);
  break;
 }
@@ -27372,14 +27413,14 @@ case wxStyledTextCtrl_SetMarginWidth: { // wxStyledTextCtrl::SetMarginWidth
  int * margin = (int *) bp; bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginWidth((int) *margin,(int) *pixelWidth);
+ This->SetMarginWidth(*margin,*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetMarginWidth: { // wxStyledTextCtrl::GetMarginWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetMarginWidth((int) *margin);
+ int Result = This->GetMarginWidth(*margin);
  rt.addInt(Result);
  break;
 }
@@ -27388,14 +27429,14 @@ case wxStyledTextCtrl_SetMarginMask: { // wxStyledTextCtrl::SetMarginMask
  int * margin = (int *) bp; bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginMask((int) *margin,(int) *mask);
+ This->SetMarginMask(*margin,*mask);
  break;
 }
 case wxStyledTextCtrl_GetMarginMask: { // wxStyledTextCtrl::GetMarginMask
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetMarginMask((int) *margin);
+ int Result = This->GetMarginMask(*margin);
  rt.addInt(Result);
  break;
 }
@@ -27404,14 +27445,14 @@ case wxStyledTextCtrl_SetMarginSensitive: { // wxStyledTextCtrl::SetMarginSensit
  int * margin = (int *) bp; bp += 4;
  bool * sensitive = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginSensitive((int) *margin,(bool) *sensitive);
+ This->SetMarginSensitive(*margin,*sensitive);
  break;
 }
 case wxStyledTextCtrl_GetMarginSensitive: { // wxStyledTextCtrl::GetMarginSensitive
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetMarginSensitive((int) *margin);
+ bool Result = This->GetMarginSensitive(*margin);
  rt.addBool(Result);
  break;
 }
@@ -27430,7 +27471,7 @@ case wxStyledTextCtrl_StyleSetForeground: { // wxStyledTextCtrl::StyleSetForegro
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->StyleSetForeground((int) *style,fore);
+ This->StyleSetForeground(*style,fore);
  break;
 }
 case wxStyledTextCtrl_StyleSetBackground: { // wxStyledTextCtrl::StyleSetBackground
@@ -27442,7 +27483,7 @@ case wxStyledTextCtrl_StyleSetBackground: { // wxStyledTextCtrl::StyleSetBackgro
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->StyleSetBackground((int) *style,back);
+ This->StyleSetBackground(*style,back);
  break;
 }
 case wxStyledTextCtrl_StyleSetBold: { // wxStyledTextCtrl::StyleSetBold
@@ -27450,7 +27491,7 @@ case wxStyledTextCtrl_StyleSetBold: { // wxStyledTextCtrl::StyleSetBold
  int * style = (int *) bp; bp += 4;
  bool * bold = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetBold((int) *style,(bool) *bold);
+ This->StyleSetBold(*style,*bold);
  break;
 }
 case wxStyledTextCtrl_StyleSetItalic: { // wxStyledTextCtrl::StyleSetItalic
@@ -27458,7 +27499,7 @@ case wxStyledTextCtrl_StyleSetItalic: { // wxStyledTextCtrl::StyleSetItalic
  int * style = (int *) bp; bp += 4;
  bool * italic = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetItalic((int) *style,(bool) *italic);
+ This->StyleSetItalic(*style,*italic);
  break;
 }
 case wxStyledTextCtrl_StyleSetSize: { // wxStyledTextCtrl::StyleSetSize
@@ -27466,7 +27507,7 @@ case wxStyledTextCtrl_StyleSetSize: { // wxStyledTextCtrl::StyleSetSize
  int * style = (int *) bp; bp += 4;
  int * sizePoints = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetSize((int) *style,(int) *sizePoints);
+ This->StyleSetSize(*style,*sizePoints);
  break;
 }
 case wxStyledTextCtrl_StyleSetFaceName: { // wxStyledTextCtrl::StyleSetFaceName
@@ -27476,7 +27517,7 @@ case wxStyledTextCtrl_StyleSetFaceName: { // wxStyledTextCtrl::StyleSetFaceName
  wxString fontName = wxString(bp, wxConvUTF8);
  bp += *fontNameLen+((8-((4+ *fontNameLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->StyleSetFaceName((int) *style,fontName);
+ This->StyleSetFaceName(*style,fontName);
  break;
 }
 case wxStyledTextCtrl_StyleSetEOLFilled: { // wxStyledTextCtrl::StyleSetEOLFilled
@@ -27484,7 +27525,7 @@ case wxStyledTextCtrl_StyleSetEOLFilled: { // wxStyledTextCtrl::StyleSetEOLFille
  int * style = (int *) bp; bp += 4;
  bool * filled = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetEOLFilled((int) *style,(bool) *filled);
+ This->StyleSetEOLFilled(*style,*filled);
  break;
 }
 case wxStyledTextCtrl_StyleResetDefault: { // wxStyledTextCtrl::StyleResetDefault
@@ -27498,7 +27539,7 @@ case wxStyledTextCtrl_StyleSetUnderline: { // wxStyledTextCtrl::StyleSetUnderlin
  int * style = (int *) bp; bp += 4;
  bool * underline = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetUnderline((int) *style,(bool) *underline);
+ This->StyleSetUnderline(*style,*underline);
  break;
 }
 case wxStyledTextCtrl_StyleSetCase: { // wxStyledTextCtrl::StyleSetCase
@@ -27506,7 +27547,7 @@ case wxStyledTextCtrl_StyleSetCase: { // wxStyledTextCtrl::StyleSetCase
  int * style = (int *) bp; bp += 4;
  int * caseForce = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetCase((int) *style,(int) *caseForce);
+ This->StyleSetCase(*style,*caseForce);
  break;
 }
 case wxStyledTextCtrl_StyleSetHotSpot: { // wxStyledTextCtrl::StyleSetHotSpot
@@ -27514,7 +27555,7 @@ case wxStyledTextCtrl_StyleSetHotSpot: { // wxStyledTextCtrl::StyleSetHotSpot
  int * style = (int *) bp; bp += 4;
  bool * hotspot = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetHotSpot((int) *style,(bool) *hotspot);
+ This->StyleSetHotSpot(*style,*hotspot);
  break;
 }
 case wxStyledTextCtrl_SetSelForeground: { // wxStyledTextCtrl::SetSelForeground
@@ -27526,7 +27567,7 @@ case wxStyledTextCtrl_SetSelForeground: { // wxStyledTextCtrl::SetSelForeground
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetSelForeground((bool) *useSetting,fore);
+ This->SetSelForeground(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_SetSelBackground: { // wxStyledTextCtrl::SetSelBackground
@@ -27538,7 +27579,7 @@ case wxStyledTextCtrl_SetSelBackground: { // wxStyledTextCtrl::SetSelBackground
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetSelBackground((bool) *useSetting,back);
+ This->SetSelBackground(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_GetSelAlpha: { // wxStyledTextCtrl::GetSelAlpha
@@ -27552,7 +27593,7 @@ case wxStyledTextCtrl_SetSelAlpha: { // wxStyledTextCtrl::SetSelAlpha
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * alpha = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelAlpha((int) *alpha);
+ This->SetSelAlpha(*alpha);
  break;
 }
 case wxStyledTextCtrl_SetCaretForeground: { // wxStyledTextCtrl::SetCaretForeground
@@ -27572,7 +27613,7 @@ case wxStyledTextCtrl_CmdKeyAssign: { // wxStyledTextCtrl::CmdKeyAssign
  int * modifiers = (int *) bp; bp += 4;
  int * cmd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CmdKeyAssign((int) *key,(int) *modifiers,(int) *cmd);
+ This->CmdKeyAssign(*key,*modifiers,*cmd);
  break;
 }
 case wxStyledTextCtrl_CmdKeyClear: { // wxStyledTextCtrl::CmdKeyClear
@@ -27580,7 +27621,7 @@ case wxStyledTextCtrl_CmdKeyClear: { // wxStyledTextCtrl::CmdKeyClear
  int * key = (int *) bp; bp += 4;
  int * modifiers = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CmdKeyClear((int) *key,(int) *modifiers);
+ This->CmdKeyClear(*key,*modifiers);
  break;
 }
 case wxStyledTextCtrl_CmdKeyClearAll: { // wxStyledTextCtrl::CmdKeyClearAll
@@ -27594,7 +27635,7 @@ case wxStyledTextCtrl_SetStyleBytes: { // wxStyledTextCtrl::SetStyleBytes
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * length = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyleBytes((int) *length,&styleBytes);
+ This->SetStyleBytes(*length,&styleBytes);
  rt.addInt(styleBytes);
  break;
 }
@@ -27603,7 +27644,7 @@ case wxStyledTextCtrl_StyleSetVisible: { // wxStyledTextCtrl::StyleSetVisible
  int * style = (int *) bp; bp += 4;
  bool * visible = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetVisible((int) *style,(bool) *visible);
+ This->StyleSetVisible(*style,*visible);
  break;
 }
 case wxStyledTextCtrl_GetCaretPeriod: { // wxStyledTextCtrl::GetCaretPeriod
@@ -27617,7 +27658,7 @@ case wxStyledTextCtrl_SetCaretPeriod: { // wxStyledTextCtrl::SetCaretPeriod
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * periodMilliseconds = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretPeriod((int) *periodMilliseconds);
+ This->SetCaretPeriod(*periodMilliseconds);
  break;
 }
 case wxStyledTextCtrl_SetWordChars: { // wxStyledTextCtrl::SetWordChars
@@ -27646,14 +27687,14 @@ case wxStyledTextCtrl_IndicatorSetStyle: { // wxStyledTextCtrl::IndicatorSetStyl
  int * indic = (int *) bp; bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->IndicatorSetStyle((int) *indic,(int) *style);
+ This->IndicatorSetStyle(*indic,*style);
  break;
 }
 case wxStyledTextCtrl_IndicatorGetStyle: { // wxStyledTextCtrl::IndicatorGetStyle
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indic = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->IndicatorGetStyle((int) *indic);
+ int Result = This->IndicatorGetStyle(*indic);
  rt.addInt(Result);
  break;
 }
@@ -27666,14 +27707,14 @@ case wxStyledTextCtrl_IndicatorSetForeground: { // wxStyledTextCtrl::IndicatorSe
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->IndicatorSetForeground((int) *indic,fore);
+ This->IndicatorSetForeground(*indic,fore);
  break;
 }
 case wxStyledTextCtrl_IndicatorGetForeground: { // wxStyledTextCtrl::IndicatorGetForeground
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indic = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->IndicatorGetForeground((int) *indic);
+ wxColour Result = This->IndicatorGetForeground(*indic);
  rt.add(Result);
  break;
 }
@@ -27686,7 +27727,7 @@ case wxStyledTextCtrl_SetWhitespaceForeground: { // wxStyledTextCtrl::SetWhitesp
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetWhitespaceForeground((bool) *useSetting,fore);
+ This->SetWhitespaceForeground(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_SetWhitespaceBackground: { // wxStyledTextCtrl::SetWhitespaceBackground
@@ -27698,7 +27739,7 @@ case wxStyledTextCtrl_SetWhitespaceBackground: { // wxStyledTextCtrl::SetWhitesp
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetWhitespaceBackground((bool) *useSetting,back);
+ This->SetWhitespaceBackground(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_GetStyleBits: { // wxStyledTextCtrl::GetStyleBits
@@ -27713,14 +27754,14 @@ case wxStyledTextCtrl_SetLineState: { // wxStyledTextCtrl::SetLineState
  int * line = (int *) bp; bp += 4;
  int * state = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLineState((int) *line,(int) *state);
+ This->SetLineState(*line,*state);
  break;
 }
 case wxStyledTextCtrl_GetLineState: { // wxStyledTextCtrl::GetLineState
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineState((int) *line);
+ int Result = This->GetLineState(*line);
  rt.addInt(Result);
  break;
 }
@@ -27742,7 +27783,7 @@ case wxStyledTextCtrl_SetCaretLineVisible: { // wxStyledTextCtrl::SetCaretLineVi
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretLineVisible((bool) *show);
+ This->SetCaretLineVisible(*show);
  break;
 }
 case wxStyledTextCtrl_GetCaretLineBackground: { // wxStyledTextCtrl::GetCaretLineBackground
@@ -27770,7 +27811,7 @@ case wxStyledTextCtrl_AutoCompShow: { // wxStyledTextCtrl::AutoCompShow
  wxString itemList = wxString(bp, wxConvUTF8);
  bp += *itemListLen+((8-((4+ *itemListLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->AutoCompShow((int) *lenEntered,itemList);
+ This->AutoCompShow(*lenEntered,itemList);
  break;
 }
 case wxStyledTextCtrl_AutoCompCancel: { // wxStyledTextCtrl::AutoCompCancel
@@ -27812,7 +27853,7 @@ case wxStyledTextCtrl_AutoCompSetSeparator: { // wxStyledTextCtrl::AutoCompSetSe
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * separatorCharacter = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetSeparator((int) *separatorCharacter);
+ This->AutoCompSetSeparator(*separatorCharacter);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetSeparator: { // wxStyledTextCtrl::AutoCompGetSeparator
@@ -27835,7 +27876,7 @@ case wxStyledTextCtrl_AutoCompSetCancelAtStart: { // wxStyledTextCtrl::AutoCompS
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * cancel = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetCancelAtStart((bool) *cancel);
+ This->AutoCompSetCancelAtStart(*cancel);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetCancelAtStart: { // wxStyledTextCtrl::AutoCompGetCancelAtStart
@@ -27858,7 +27899,7 @@ case wxStyledTextCtrl_AutoCompSetChooseSingle: { // wxStyledTextCtrl::AutoCompSe
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * chooseSingle = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetChooseSingle((bool) *chooseSingle);
+ This->AutoCompSetChooseSingle(*chooseSingle);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetChooseSingle: { // wxStyledTextCtrl::AutoCompGetChooseSingle
@@ -27872,7 +27913,7 @@ case wxStyledTextCtrl_AutoCompSetIgnoreCase: { // wxStyledTextCtrl::AutoCompSetI
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * ignoreCase = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetIgnoreCase((bool) *ignoreCase);
+ This->AutoCompSetIgnoreCase(*ignoreCase);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetIgnoreCase: { // wxStyledTextCtrl::AutoCompGetIgnoreCase
@@ -27889,14 +27930,14 @@ case wxStyledTextCtrl_UserListShow: { // wxStyledTextCtrl::UserListShow
  wxString itemList = wxString(bp, wxConvUTF8);
  bp += *itemListLen+((8-((4+ *itemListLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->UserListShow((int) *listType,itemList);
+ This->UserListShow(*listType,itemList);
  break;
 }
 case wxStyledTextCtrl_AutoCompSetAutoHide: { // wxStyledTextCtrl::AutoCompSetAutoHide
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * autoHide = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetAutoHide((bool) *autoHide);
+ This->AutoCompSetAutoHide(*autoHide);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetAutoHide: { // wxStyledTextCtrl::AutoCompGetAutoHide
@@ -27910,7 +27951,7 @@ case wxStyledTextCtrl_AutoCompSetDropRestOfWord: { // wxStyledTextCtrl::AutoComp
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * dropRestOfWord = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetDropRestOfWord((bool) *dropRestOfWord);
+ This->AutoCompSetDropRestOfWord(*dropRestOfWord);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetDropRestOfWord: { // wxStyledTextCtrl::AutoCompGetDropRestOfWord
@@ -27925,7 +27966,7 @@ case wxStyledTextCtrl_RegisterImage: { // wxStyledTextCtrl::RegisterImage
  int * type = (int *) bp; bp += 4;
  wxBitmap *bmp = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RegisterImage((int) *type,*bmp);
+ This->RegisterImage(*type,*bmp);
  break;
 }
 case wxStyledTextCtrl_ClearRegisteredImages: { // wxStyledTextCtrl::ClearRegisteredImages
@@ -27945,14 +27986,14 @@ case wxStyledTextCtrl_AutoCompSetTypeSeparator: { // wxStyledTextCtrl::AutoCompS
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * separatorCharacter = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetTypeSeparator((int) *separatorCharacter);
+ This->AutoCompSetTypeSeparator(*separatorCharacter);
  break;
 }
 case wxStyledTextCtrl_AutoCompSetMaxWidth: { // wxStyledTextCtrl::AutoCompSetMaxWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * characterCount = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetMaxWidth((int) *characterCount);
+ This->AutoCompSetMaxWidth(*characterCount);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetMaxWidth: { // wxStyledTextCtrl::AutoCompGetMaxWidth
@@ -27966,7 +28007,7 @@ case wxStyledTextCtrl_AutoCompSetMaxHeight: { // wxStyledTextCtrl::AutoCompSetMa
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * rowCount = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetMaxHeight((int) *rowCount);
+ This->AutoCompSetMaxHeight(*rowCount);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetMaxHeight: { // wxStyledTextCtrl::AutoCompGetMaxHeight
@@ -27980,7 +28021,7 @@ case wxStyledTextCtrl_SetIndent: { // wxStyledTextCtrl::SetIndent
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indentSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetIndent((int) *indentSize);
+ This->SetIndent(*indentSize);
  break;
 }
 case wxStyledTextCtrl_GetIndent: { // wxStyledTextCtrl::GetIndent
@@ -27994,7 +28035,7 @@ case wxStyledTextCtrl_SetUseTabs: { // wxStyledTextCtrl::SetUseTabs
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * useTabs = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUseTabs((bool) *useTabs);
+ This->SetUseTabs(*useTabs);
  break;
 }
 case wxStyledTextCtrl_GetUseTabs: { // wxStyledTextCtrl::GetUseTabs
@@ -28009,14 +28050,14 @@ case wxStyledTextCtrl_SetLineIndentation: { // wxStyledTextCtrl::SetLineIndentat
  int * line = (int *) bp; bp += 4;
  int * indentSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLineIndentation((int) *line,(int) *indentSize);
+ This->SetLineIndentation(*line,*indentSize);
  break;
 }
 case wxStyledTextCtrl_GetLineIndentation: { // wxStyledTextCtrl::GetLineIndentation
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineIndentation((int) *line);
+ int Result = This->GetLineIndentation(*line);
  rt.addInt(Result);
  break;
 }
@@ -28024,7 +28065,7 @@ case wxStyledTextCtrl_GetLineIndentPosition: { // wxStyledTextCtrl::GetLineInden
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineIndentPosition((int) *line);
+ int Result = This->GetLineIndentPosition(*line);
  rt.addInt(Result);
  break;
 }
@@ -28032,7 +28073,7 @@ case wxStyledTextCtrl_GetColumn: { // wxStyledTextCtrl::GetColumn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetColumn((int) *pos);
+ int Result = This->GetColumn(*pos);
  rt.addInt(Result);
  break;
 }
@@ -28040,7 +28081,7 @@ case wxStyledTextCtrl_SetUseHorizontalScrollBar: { // wxStyledTextCtrl::SetUseHo
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUseHorizontalScrollBar((bool) *show);
+ This->SetUseHorizontalScrollBar(*show);
  break;
 }
 case wxStyledTextCtrl_GetUseHorizontalScrollBar: { // wxStyledTextCtrl::GetUseHorizontalScrollBar
@@ -28054,7 +28095,7 @@ case wxStyledTextCtrl_SetIndentationGuides: { // wxStyledTextCtrl::SetIndentatio
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetIndentationGuides((bool) *show);
+ This->SetIndentationGuides(*show);
  break;
 }
 case wxStyledTextCtrl_GetIndentationGuides: { // wxStyledTextCtrl::GetIndentationGuides
@@ -28068,7 +28109,7 @@ case wxStyledTextCtrl_SetHighlightGuide: { // wxStyledTextCtrl::SetHighlightGuid
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHighlightGuide((int) *column);
+ This->SetHighlightGuide(*column);
  break;
 }
 case wxStyledTextCtrl_GetHighlightGuide: { // wxStyledTextCtrl::GetHighlightGuide
@@ -28082,7 +28123,7 @@ case wxStyledTextCtrl_GetLineEndPosition: { // wxStyledTextCtrl::GetLineEndPosit
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineEndPosition((int) *line);
+ int Result = This->GetLineEndPosition(*line);
  rt.addInt(Result);
  break;
 }
@@ -28111,14 +28152,14 @@ case wxStyledTextCtrl_SetCurrentPos: { // wxStyledTextCtrl::SetCurrentPos
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCurrentPos((int) *pos);
+ This->SetCurrentPos(*pos);
  break;
 }
 case wxStyledTextCtrl_SetSelectionStart: { // wxStyledTextCtrl::SetSelectionStart
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionStart((int) *pos);
+ This->SetSelectionStart(*pos);
  break;
 }
 case wxStyledTextCtrl_GetSelectionStart: { // wxStyledTextCtrl::GetSelectionStart
@@ -28132,7 +28173,7 @@ case wxStyledTextCtrl_SetSelectionEnd: { // wxStyledTextCtrl::SetSelectionEnd
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionEnd((int) *pos);
+ This->SetSelectionEnd(*pos);
  break;
 }
 case wxStyledTextCtrl_GetSelectionEnd: { // wxStyledTextCtrl::GetSelectionEnd
@@ -28146,7 +28187,7 @@ case wxStyledTextCtrl_SetPrintMagnification: { // wxStyledTextCtrl::SetPrintMagn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * magnification = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrintMagnification((int) *magnification);
+ This->SetPrintMagnification(*magnification);
  break;
 }
 case wxStyledTextCtrl_GetPrintMagnification: { // wxStyledTextCtrl::GetPrintMagnification
@@ -28160,7 +28201,7 @@ case wxStyledTextCtrl_SetPrintColourMode: { // wxStyledTextCtrl::SetPrintColourM
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrintColourMode((int) *mode);
+ This->SetPrintColourMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetPrintColourMode: { // wxStyledTextCtrl::GetPrintColourMode
@@ -28184,7 +28225,7 @@ case wxStyledTextCtrl_FindText: { // wxStyledTextCtrl::FindText
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- int Result = This->FindText((int) *minPos,(int) *maxPos,text,flags);
+ int Result = This->FindText(*minPos,*maxPos,text,flags);
  rt.addInt(Result);
  break;
 }
@@ -28206,7 +28247,7 @@ case wxStyledTextCtrl_FormatRange: { // wxStyledTextCtrl::FormatRange
  int * pageRectH = (int *) bp; bp += 4;
  wxRect pageRect = wxRect(*pageRectX,*pageRectY,*pageRectW,*pageRectH);
  if(!This) throw wxe_badarg(0);
- int Result = This->FormatRange((bool) *doDraw,(int) *startPos,(int) *endPos,draw,target,renderRect,pageRect);
+ int Result = This->FormatRange(*doDraw,*startPos,*endPos,draw,target,renderRect,pageRect);
  rt.addInt(Result);
  break;
 }
@@ -28221,7 +28262,7 @@ case wxStyledTextCtrl_GetLine: { // wxStyledTextCtrl::GetLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLine((int) *line);
+ wxString Result = This->GetLine(*line);
  rt.add(Result);
  break;
 }
@@ -28236,7 +28277,7 @@ case wxStyledTextCtrl_SetMarginLeft: { // wxStyledTextCtrl::SetMarginLeft
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginLeft((int) *pixelWidth);
+ This->SetMarginLeft(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetMarginLeft: { // wxStyledTextCtrl::GetMarginLeft
@@ -28250,7 +28291,7 @@ case wxStyledTextCtrl_SetMarginRight: { // wxStyledTextCtrl::SetMarginRight
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginRight((int) *pixelWidth);
+ This->SetMarginRight(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetMarginRight: { // wxStyledTextCtrl::GetMarginRight
@@ -28272,7 +28313,7 @@ case wxStyledTextCtrl_SetSelection: { // wxStyledTextCtrl::SetSelection
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *start,(int) *end);
+ This->SetSelection(*start,*end);
  break;
 }
 case wxStyledTextCtrl_GetSelectedText: { // wxStyledTextCtrl::GetSelectedText
@@ -28287,7 +28328,7 @@ case wxStyledTextCtrl_GetTextRange: { // wxStyledTextCtrl::GetTextRange
  int * startPos = (int *) bp; bp += 4;
  int * endPos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetTextRange((int) *startPos,(int) *endPos);
+ wxString Result = This->GetTextRange(*startPos,*endPos);
  rt.add(Result);
  break;
 }
@@ -28295,14 +28336,14 @@ case wxStyledTextCtrl_HideSelection: { // wxStyledTextCtrl::HideSelection
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * normal = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->HideSelection((bool) *normal);
+ This->HideSelection(*normal);
  break;
 }
 case wxStyledTextCtrl_LineFromPosition: { // wxStyledTextCtrl::LineFromPosition
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->LineFromPosition((int) *pos);
+ int Result = This->LineFromPosition(*pos);
  rt.addInt(Result);
  break;
 }
@@ -28310,7 +28351,7 @@ case wxStyledTextCtrl_PositionFromLine: { // wxStyledTextCtrl::PositionFromLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionFromLine((int) *line);
+ int Result = This->PositionFromLine(*line);
  rt.addInt(Result);
  break;
 }
@@ -28319,7 +28360,7 @@ case wxStyledTextCtrl_LineScroll: { // wxStyledTextCtrl::LineScroll
  int * columns = (int *) bp; bp += 4;
  int * lines = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->LineScroll((int) *columns,(int) *lines);
+ This->LineScroll(*columns,*lines);
  break;
 }
 case wxStyledTextCtrl_EnsureCaretVisible: { // wxStyledTextCtrl::EnsureCaretVisible
@@ -28341,7 +28382,7 @@ case wxStyledTextCtrl_SetReadOnly: { // wxStyledTextCtrl::SetReadOnly
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * readOnly = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetReadOnly((bool) *readOnly);
+ This->SetReadOnly(*readOnly);
  break;
 }
 case wxStyledTextCtrl_CanPaste: { // wxStyledTextCtrl::CanPaste
@@ -28428,7 +28469,7 @@ case wxStyledTextCtrl_SetCaretWidth: { // wxStyledTextCtrl::SetCaretWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretWidth((int) *pixelWidth);
+ This->SetCaretWidth(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetCaretWidth: { // wxStyledTextCtrl::GetCaretWidth
@@ -28442,7 +28483,7 @@ case wxStyledTextCtrl_SetTargetStart: { // wxStyledTextCtrl::SetTargetStart
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTargetStart((int) *pos);
+ This->SetTargetStart(*pos);
  break;
 }
 case wxStyledTextCtrl_GetTargetStart: { // wxStyledTextCtrl::GetTargetStart
@@ -28456,7 +28497,7 @@ case wxStyledTextCtrl_SetTargetEnd: { // wxStyledTextCtrl::SetTargetEnd
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTargetEnd((int) *pos);
+ This->SetTargetEnd(*pos);
  break;
 }
 case wxStyledTextCtrl_GetTargetEnd: { // wxStyledTextCtrl::GetTargetEnd
@@ -28490,7 +28531,7 @@ case wxStyledTextCtrl_SetSearchFlags: { // wxStyledTextCtrl::SetSearchFlags
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSearchFlags((int) *flags);
+ This->SetSearchFlags(*flags);
  break;
 }
 case wxStyledTextCtrl_GetSearchFlags: { // wxStyledTextCtrl::GetSearchFlags
@@ -28507,7 +28548,7 @@ case wxStyledTextCtrl_CallTipShow: { // wxStyledTextCtrl::CallTipShow
  wxString definition = wxString(bp, wxConvUTF8);
  bp += *definitionLen+((8-((4+ *definitionLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->CallTipShow((int) *pos,definition);
+ This->CallTipShow(*pos,definition);
  break;
 }
 case wxStyledTextCtrl_CallTipCancel: { // wxStyledTextCtrl::CallTipCancel
@@ -28535,7 +28576,7 @@ case wxStyledTextCtrl_CallTipSetHighlight: { // wxStyledTextCtrl::CallTipSetHigh
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CallTipSetHighlight((int) *start,(int) *end);
+ This->CallTipSetHighlight(*start,*end);
  break;
 }
 case wxStyledTextCtrl_CallTipSetBackground: { // wxStyledTextCtrl::CallTipSetBackground
@@ -28575,14 +28616,14 @@ case wxStyledTextCtrl_CallTipUseStyle: { // wxStyledTextCtrl::CallTipUseStyle
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * tabSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CallTipUseStyle((int) *tabSize);
+ This->CallTipUseStyle(*tabSize);
  break;
 }
 case wxStyledTextCtrl_VisibleFromDocLine: { // wxStyledTextCtrl::VisibleFromDocLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->VisibleFromDocLine((int) *line);
+ int Result = This->VisibleFromDocLine(*line);
  rt.addInt(Result);
  break;
 }
@@ -28590,7 +28631,7 @@ case wxStyledTextCtrl_DocLineFromVisible: { // wxStyledTextCtrl::DocLineFromVisi
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lineDisplay = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->DocLineFromVisible((int) *lineDisplay);
+ int Result = This->DocLineFromVisible(*lineDisplay);
  rt.addInt(Result);
  break;
 }
@@ -28598,7 +28639,7 @@ case wxStyledTextCtrl_WrapCount: { // wxStyledTextCtrl::WrapCount
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->WrapCount((int) *line);
+ int Result = This->WrapCount(*line);
  rt.addInt(Result);
  break;
 }
@@ -28607,14 +28648,14 @@ case wxStyledTextCtrl_SetFoldLevel: { // wxStyledTextCtrl::SetFoldLevel
  int * line = (int *) bp; bp += 4;
  int * level = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFoldLevel((int) *line,(int) *level);
+ This->SetFoldLevel(*line,*level);
  break;
 }
 case wxStyledTextCtrl_GetFoldLevel: { // wxStyledTextCtrl::GetFoldLevel
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetFoldLevel((int) *line);
+ int Result = This->GetFoldLevel(*line);
  rt.addInt(Result);
  break;
 }
@@ -28623,7 +28664,7 @@ case wxStyledTextCtrl_GetLastChild: { // wxStyledTextCtrl::GetLastChild
  int * line = (int *) bp; bp += 4;
  int * level = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLastChild((int) *line,(int) *level);
+ int Result = This->GetLastChild(*line,*level);
  rt.addInt(Result);
  break;
 }
@@ -28631,7 +28672,7 @@ case wxStyledTextCtrl_GetFoldParent: { // wxStyledTextCtrl::GetFoldParent
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetFoldParent((int) *line);
+ int Result = This->GetFoldParent(*line);
  rt.addInt(Result);
  break;
 }
@@ -28640,7 +28681,7 @@ case wxStyledTextCtrl_ShowLines: { // wxStyledTextCtrl::ShowLines
  int * lineStart = (int *) bp; bp += 4;
  int * lineEnd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ShowLines((int) *lineStart,(int) *lineEnd);
+ This->ShowLines(*lineStart,*lineEnd);
  break;
 }
 case wxStyledTextCtrl_HideLines: { // wxStyledTextCtrl::HideLines
@@ -28648,14 +28689,14 @@ case wxStyledTextCtrl_HideLines: { // wxStyledTextCtrl::HideLines
  int * lineStart = (int *) bp; bp += 4;
  int * lineEnd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->HideLines((int) *lineStart,(int) *lineEnd);
+ This->HideLines(*lineStart,*lineEnd);
  break;
 }
 case wxStyledTextCtrl_GetLineVisible: { // wxStyledTextCtrl::GetLineVisible
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetLineVisible((int) *line);
+ bool Result = This->GetLineVisible(*line);
  rt.addBool(Result);
  break;
 }
@@ -28664,14 +28705,14 @@ case wxStyledTextCtrl_SetFoldExpanded: { // wxStyledTextCtrl::SetFoldExpanded
  int * line = (int *) bp; bp += 4;
  bool * expanded = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFoldExpanded((int) *line,(bool) *expanded);
+ This->SetFoldExpanded(*line,*expanded);
  break;
 }
 case wxStyledTextCtrl_GetFoldExpanded: { // wxStyledTextCtrl::GetFoldExpanded
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetFoldExpanded((int) *line);
+ bool Result = This->GetFoldExpanded(*line);
  rt.addBool(Result);
  break;
 }
@@ -28679,35 +28720,35 @@ case wxStyledTextCtrl_ToggleFold: { // wxStyledTextCtrl::ToggleFold
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ToggleFold((int) *line);
+ This->ToggleFold(*line);
  break;
 }
 case wxStyledTextCtrl_EnsureVisible: { // wxStyledTextCtrl::EnsureVisible
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnsureVisible((int) *line);
+ This->EnsureVisible(*line);
  break;
 }
 case wxStyledTextCtrl_SetFoldFlags: { // wxStyledTextCtrl::SetFoldFlags
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFoldFlags((int) *flags);
+ This->SetFoldFlags(*flags);
  break;
 }
 case wxStyledTextCtrl_EnsureVisibleEnforcePolicy: { // wxStyledTextCtrl::EnsureVisibleEnforcePolicy
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnsureVisibleEnforcePolicy((int) *line);
+ This->EnsureVisibleEnforcePolicy(*line);
  break;
 }
 case wxStyledTextCtrl_SetTabIndents: { // wxStyledTextCtrl::SetTabIndents
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * tabIndents = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTabIndents((bool) *tabIndents);
+ This->SetTabIndents(*tabIndents);
  break;
 }
 case wxStyledTextCtrl_GetTabIndents: { // wxStyledTextCtrl::GetTabIndents
@@ -28721,7 +28762,7 @@ case wxStyledTextCtrl_SetBackSpaceUnIndents: { // wxStyledTextCtrl::SetBackSpace
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * bsUnIndents = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBackSpaceUnIndents((bool) *bsUnIndents);
+ This->SetBackSpaceUnIndents(*bsUnIndents);
  break;
 }
 case wxStyledTextCtrl_GetBackSpaceUnIndents: { // wxStyledTextCtrl::GetBackSpaceUnIndents
@@ -28735,7 +28776,7 @@ case wxStyledTextCtrl_SetMouseDwellTime: { // wxStyledTextCtrl::SetMouseDwellTim
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * periodMilliseconds = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMouseDwellTime((int) *periodMilliseconds);
+ This->SetMouseDwellTime(*periodMilliseconds);
  break;
 }
 case wxStyledTextCtrl_GetMouseDwellTime: { // wxStyledTextCtrl::GetMouseDwellTime
@@ -28750,7 +28791,7 @@ case wxStyledTextCtrl_WordStartPosition: { // wxStyledTextCtrl::WordStartPositio
  int * pos = (int *) bp; bp += 4;
  bool * onlyWordCharacters = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->WordStartPosition((int) *pos,(bool) *onlyWordCharacters);
+ int Result = This->WordStartPosition(*pos,*onlyWordCharacters);
  rt.addInt(Result);
  break;
 }
@@ -28759,7 +28800,7 @@ case wxStyledTextCtrl_WordEndPosition: { // wxStyledTextCtrl::WordEndPosition
  int * pos = (int *) bp; bp += 4;
  bool * onlyWordCharacters = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->WordEndPosition((int) *pos,(bool) *onlyWordCharacters);
+ int Result = This->WordEndPosition(*pos,*onlyWordCharacters);
  rt.addInt(Result);
  break;
 }
@@ -28767,7 +28808,7 @@ case wxStyledTextCtrl_SetWrapMode: { // wxStyledTextCtrl::SetWrapMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapMode((int) *mode);
+ This->SetWrapMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetWrapMode: { // wxStyledTextCtrl::GetWrapMode
@@ -28781,7 +28822,7 @@ case wxStyledTextCtrl_SetWrapVisualFlags: { // wxStyledTextCtrl::SetWrapVisualFl
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * wrapVisualFlags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapVisualFlags((int) *wrapVisualFlags);
+ This->SetWrapVisualFlags(*wrapVisualFlags);
  break;
 }
 case wxStyledTextCtrl_GetWrapVisualFlags: { // wxStyledTextCtrl::GetWrapVisualFlags
@@ -28795,7 +28836,7 @@ case wxStyledTextCtrl_SetWrapVisualFlagsLocation: { // wxStyledTextCtrl::SetWrap
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * wrapVisualFlagsLocation = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapVisualFlagsLocation((int) *wrapVisualFlagsLocation);
+ This->SetWrapVisualFlagsLocation(*wrapVisualFlagsLocation);
  break;
 }
 case wxStyledTextCtrl_GetWrapVisualFlagsLocation: { // wxStyledTextCtrl::GetWrapVisualFlagsLocation
@@ -28809,7 +28850,7 @@ case wxStyledTextCtrl_SetWrapStartIndent: { // wxStyledTextCtrl::SetWrapStartInd
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indent = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapStartIndent((int) *indent);
+ This->SetWrapStartIndent(*indent);
  break;
 }
 case wxStyledTextCtrl_GetWrapStartIndent: { // wxStyledTextCtrl::GetWrapStartIndent
@@ -28823,7 +28864,7 @@ case wxStyledTextCtrl_SetLayoutCache: { // wxStyledTextCtrl::SetLayoutCache
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLayoutCache((int) *mode);
+ This->SetLayoutCache(*mode);
  break;
 }
 case wxStyledTextCtrl_GetLayoutCache: { // wxStyledTextCtrl::GetLayoutCache
@@ -28837,7 +28878,7 @@ case wxStyledTextCtrl_SetScrollWidth: { // wxStyledTextCtrl::SetScrollWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollWidth((int) *pixelWidth);
+ This->SetScrollWidth(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetScrollWidth: { // wxStyledTextCtrl::GetScrollWidth
@@ -28854,7 +28895,7 @@ case wxStyledTextCtrl_TextWidth: { // wxStyledTextCtrl::TextWidth
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- int Result = This->TextWidth((int) *style,text);
+ int Result = This->TextWidth(*style,text);
  rt.addInt(Result);
  break;
 }
@@ -28869,7 +28910,7 @@ case wxStyledTextCtrl_TextHeight: { // wxStyledTextCtrl::TextHeight
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->TextHeight((int) *line);
+ int Result = This->TextHeight(*line);
  rt.addInt(Result);
  break;
 }
@@ -28877,7 +28918,7 @@ case wxStyledTextCtrl_SetUseVerticalScrollBar: { // wxStyledTextCtrl::SetUseVert
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUseVerticalScrollBar((bool) *show);
+ This->SetUseVerticalScrollBar(*show);
  break;
 }
 case wxStyledTextCtrl_GetUseVerticalScrollBar: { // wxStyledTextCtrl::GetUseVerticalScrollBar
@@ -28907,7 +28948,7 @@ case wxStyledTextCtrl_SetTwoPhaseDraw: { // wxStyledTextCtrl::SetTwoPhaseDraw
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * twoPhase = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTwoPhaseDraw((bool) *twoPhase);
+ This->SetTwoPhaseDraw(*twoPhase);
  break;
 }
 case wxStyledTextCtrl_TargetFromSelection: { // wxStyledTextCtrl::TargetFromSelection
@@ -28926,7 +28967,7 @@ case wxStyledTextCtrl_LinesSplit: { // wxStyledTextCtrl::LinesSplit
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->LinesSplit((int) *pixelWidth);
+ This->LinesSplit(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_SetFoldMarginColour: { // wxStyledTextCtrl::SetFoldMarginColour
@@ -28938,7 +28979,7 @@ case wxStyledTextCtrl_SetFoldMarginColour: { // wxStyledTextCtrl::SetFoldMarginC
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetFoldMarginColour((bool) *useSetting,back);
+ This->SetFoldMarginColour(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_SetFoldMarginHiColour: { // wxStyledTextCtrl::SetFoldMarginHiColour
@@ -28950,7 +28991,7 @@ case wxStyledTextCtrl_SetFoldMarginHiColour: { // wxStyledTextCtrl::SetFoldMargi
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetFoldMarginHiColour((bool) *useSetting,fore);
+ This->SetFoldMarginHiColour(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_LineDown: { // wxStyledTextCtrl::LineDown
@@ -29299,7 +29340,7 @@ case wxStyledTextCtrl_LineLength: { // wxStyledTextCtrl::LineLength
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->LineLength((int) *line);
+ int Result = This->LineLength(*line);
  rt.addInt(Result);
  break;
 }
@@ -29308,21 +29349,21 @@ case wxStyledTextCtrl_BraceHighlight: { // wxStyledTextCtrl::BraceHighlight
  int * pos1 = (int *) bp; bp += 4;
  int * pos2 = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->BraceHighlight((int) *pos1,(int) *pos2);
+ This->BraceHighlight(*pos1,*pos2);
  break;
 }
 case wxStyledTextCtrl_BraceBadLight: { // wxStyledTextCtrl::BraceBadLight
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->BraceBadLight((int) *pos);
+ This->BraceBadLight(*pos);
  break;
 }
 case wxStyledTextCtrl_BraceMatch: { // wxStyledTextCtrl::BraceMatch
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->BraceMatch((int) *pos);
+ int Result = This->BraceMatch(*pos);
  rt.addInt(Result);
  break;
 }
@@ -29337,14 +29378,14 @@ case wxStyledTextCtrl_SetViewEOL: { // wxStyledTextCtrl::SetViewEOL
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * visible = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetViewEOL((bool) *visible);
+ This->SetViewEOL(*visible);
  break;
 }
 case wxStyledTextCtrl_SetModEventMask: { // wxStyledTextCtrl::SetModEventMask
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetModEventMask((int) *mask);
+ This->SetModEventMask(*mask);
  break;
 }
 case wxStyledTextCtrl_GetEdgeColumn: { // wxStyledTextCtrl::GetEdgeColumn
@@ -29358,14 +29399,14 @@ case wxStyledTextCtrl_SetEdgeColumn: { // wxStyledTextCtrl::SetEdgeColumn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEdgeColumn((int) *column);
+ This->SetEdgeColumn(*column);
  break;
 }
 case wxStyledTextCtrl_SetEdgeMode: { // wxStyledTextCtrl::SetEdgeMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEdgeMode((int) *mode);
+ This->SetEdgeMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetEdgeMode: { // wxStyledTextCtrl::GetEdgeMode
@@ -29406,7 +29447,7 @@ case wxStyledTextCtrl_SearchNext: { // wxStyledTextCtrl::SearchNext
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- int Result = This->SearchNext((int) *flags,text);
+ int Result = This->SearchNext(*flags,text);
  rt.addInt(Result);
  break;
 }
@@ -29417,7 +29458,7 @@ case wxStyledTextCtrl_SearchPrev: { // wxStyledTextCtrl::SearchPrev
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- int Result = This->SearchPrev((int) *flags,text);
+ int Result = This->SearchPrev(*flags,text);
  rt.addInt(Result);
  break;
 }
@@ -29432,7 +29473,7 @@ case wxStyledTextCtrl_UsePopUp: { // wxStyledTextCtrl::UsePopUp
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * allowPopUp = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->UsePopUp((bool) *allowPopUp);
+ This->UsePopUp(*allowPopUp);
  break;
 }
 case wxStyledTextCtrl_SelectionIsRectangle: { // wxStyledTextCtrl::SelectionIsRectangle
@@ -29446,7 +29487,7 @@ case wxStyledTextCtrl_SetZoom: { // wxStyledTextCtrl::SetZoom
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * zoom = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetZoom((int) *zoom);
+ This->SetZoom(*zoom);
  break;
 }
 case wxStyledTextCtrl_GetZoom: { // wxStyledTextCtrl::GetZoom
@@ -29467,7 +29508,7 @@ case wxStyledTextCtrl_SetSTCFocus: { // wxStyledTextCtrl::SetSTCFocus
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * focus = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSTCFocus((bool) *focus);
+ This->SetSTCFocus(*focus);
  break;
 }
 case wxStyledTextCtrl_GetSTCFocus: { // wxStyledTextCtrl::GetSTCFocus
@@ -29481,7 +29522,7 @@ case wxStyledTextCtrl_SetStatus: { // wxStyledTextCtrl::SetStatus
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * statusCode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStatus((int) *statusCode);
+ This->SetStatus(*statusCode);
  break;
 }
 case wxStyledTextCtrl_GetStatus: { // wxStyledTextCtrl::GetStatus
@@ -29495,7 +29536,7 @@ case wxStyledTextCtrl_SetMouseDownCaptures: { // wxStyledTextCtrl::SetMouseDownC
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * captures = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMouseDownCaptures((bool) *captures);
+ This->SetMouseDownCaptures(*captures);
  break;
 }
 case wxStyledTextCtrl_GetMouseDownCaptures: { // wxStyledTextCtrl::GetMouseDownCaptures
@@ -29509,7 +29550,7 @@ case wxStyledTextCtrl_SetSTCCursor: { // wxStyledTextCtrl::SetSTCCursor
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * cursorType = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSTCCursor((int) *cursorType);
+ This->SetSTCCursor(*cursorType);
  break;
 }
 case wxStyledTextCtrl_GetSTCCursor: { // wxStyledTextCtrl::GetSTCCursor
@@ -29523,7 +29564,7 @@ case wxStyledTextCtrl_SetControlCharSymbol: { // wxStyledTextCtrl::SetControlCha
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * symbol = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetControlCharSymbol((int) *symbol);
+ This->SetControlCharSymbol(*symbol);
  break;
 }
 case wxStyledTextCtrl_GetControlCharSymbol: { // wxStyledTextCtrl::GetControlCharSymbol
@@ -29562,7 +29603,7 @@ case wxStyledTextCtrl_SetVisiblePolicy: { // wxStyledTextCtrl::SetVisiblePolicy
  int * visiblePolicy = (int *) bp; bp += 4;
  int * visibleSlop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetVisiblePolicy((int) *visiblePolicy,(int) *visibleSlop);
+ This->SetVisiblePolicy(*visiblePolicy,*visibleSlop);
  break;
 }
 case wxStyledTextCtrl_DelLineLeft: { // wxStyledTextCtrl::DelLineLeft
@@ -29595,7 +29636,7 @@ case wxStyledTextCtrl_SetXCaretPolicy: { // wxStyledTextCtrl::SetXCaretPolicy
  int * caretPolicy = (int *) bp; bp += 4;
  int * caretSlop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetXCaretPolicy((int) *caretPolicy,(int) *caretSlop);
+ This->SetXCaretPolicy(*caretPolicy,*caretSlop);
  break;
 }
 case wxStyledTextCtrl_SetYCaretPolicy: { // wxStyledTextCtrl::SetYCaretPolicy
@@ -29603,7 +29644,7 @@ case wxStyledTextCtrl_SetYCaretPolicy: { // wxStyledTextCtrl::SetYCaretPolicy
  int * caretPolicy = (int *) bp; bp += 4;
  int * caretSlop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetYCaretPolicy((int) *caretPolicy,(int) *caretSlop);
+ This->SetYCaretPolicy(*caretPolicy,*caretSlop);
  break;
 }
 case wxStyledTextCtrl_GetPrintWrapMode: { // wxStyledTextCtrl::GetPrintWrapMode
@@ -29622,7 +29663,7 @@ case wxStyledTextCtrl_SetHotspotActiveForeground: { // wxStyledTextCtrl::SetHots
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetHotspotActiveForeground((bool) *useSetting,fore);
+ This->SetHotspotActiveForeground(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_SetHotspotActiveBackground: { // wxStyledTextCtrl::SetHotspotActiveBackground
@@ -29634,21 +29675,21 @@ case wxStyledTextCtrl_SetHotspotActiveBackground: { // wxStyledTextCtrl::SetHots
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetHotspotActiveBackground((bool) *useSetting,back);
+ This->SetHotspotActiveBackground(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_SetHotspotActiveUnderline: { // wxStyledTextCtrl::SetHotspotActiveUnderline
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * underline = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHotspotActiveUnderline((bool) *underline);
+ This->SetHotspotActiveUnderline(*underline);
  break;
 }
 case wxStyledTextCtrl_SetHotspotSingleLine: { // wxStyledTextCtrl::SetHotspotSingleLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * singleLine = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHotspotSingleLine((bool) *singleLine);
+ This->SetHotspotSingleLine(*singleLine);
  break;
 }
 case wxStyledTextCtrl_ParaDownExtend: { // wxStyledTextCtrl::ParaDownExtend
@@ -29673,7 +29714,7 @@ case wxStyledTextCtrl_PositionBefore: { // wxStyledTextCtrl::PositionBefore
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionBefore((int) *pos);
+ int Result = This->PositionBefore(*pos);
  rt.addInt(Result);
  break;
 }
@@ -29681,7 +29722,7 @@ case wxStyledTextCtrl_PositionAfter: { // wxStyledTextCtrl::PositionAfter
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionAfter((int) *pos);
+ int Result = This->PositionAfter(*pos);
  rt.addInt(Result);
  break;
 }
@@ -29690,7 +29731,7 @@ case wxStyledTextCtrl_CopyRange: { // wxStyledTextCtrl::CopyRange
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CopyRange((int) *start,(int) *end);
+ This->CopyRange(*start,*end);
  break;
 }
 case wxStyledTextCtrl_CopyText: { // wxStyledTextCtrl::CopyText
@@ -29700,14 +29741,14 @@ case wxStyledTextCtrl_CopyText: { // wxStyledTextCtrl::CopyText
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->CopyText((int) *length,text);
+ This->CopyText(*length,text);
  break;
 }
 case wxStyledTextCtrl_SetSelectionMode: { // wxStyledTextCtrl::SetSelectionMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionMode((int) *mode);
+ This->SetSelectionMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetSelectionMode: { // wxStyledTextCtrl::GetSelectionMode
@@ -29845,7 +29886,7 @@ case wxStyledTextCtrl_Allocate: { // wxStyledTextCtrl::Allocate
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * bytes = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Allocate((int) *bytes);
+ This->Allocate(*bytes);
  break;
 }
 case wxStyledTextCtrl_FindColumn: { // wxStyledTextCtrl::FindColumn
@@ -29853,7 +29894,7 @@ case wxStyledTextCtrl_FindColumn: { // wxStyledTextCtrl::FindColumn
  int * line = (int *) bp; bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->FindColumn((int) *line,(int) *column);
+ int Result = This->FindColumn(*line,*column);
  rt.addInt(Result);
  break;
 }
@@ -29868,7 +29909,7 @@ case wxStyledTextCtrl_SetCaretSticky: { // wxStyledTextCtrl::SetCaretSticky
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * useCaretStickyBehaviour = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretSticky((bool) *useCaretStickyBehaviour);
+ This->SetCaretSticky(*useCaretStickyBehaviour);
  break;
 }
 case wxStyledTextCtrl_ToggleCaretSticky: { // wxStyledTextCtrl::ToggleCaretSticky
@@ -29881,7 +29922,7 @@ case wxStyledTextCtrl_SetPasteConvertEndings: { // wxStyledTextCtrl::SetPasteCon
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * convert = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPasteConvertEndings((bool) *convert);
+ This->SetPasteConvertEndings(*convert);
  break;
 }
 case wxStyledTextCtrl_GetPasteConvertEndings: { // wxStyledTextCtrl::GetPasteConvertEndings
@@ -29901,7 +29942,7 @@ case wxStyledTextCtrl_SetCaretLineBackAlpha: { // wxStyledTextCtrl::SetCaretLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * alpha = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretLineBackAlpha((int) *alpha);
+ This->SetCaretLineBackAlpha(*alpha);
  break;
 }
 case wxStyledTextCtrl_GetCaretLineBackAlpha: { // wxStyledTextCtrl::GetCaretLineBackAlpha
@@ -29927,7 +29968,7 @@ case wxStyledTextCtrl_SetLexer: { // wxStyledTextCtrl::SetLexer
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lexer = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLexer((int) *lexer);
+ This->SetLexer(*lexer);
  break;
 }
 case wxStyledTextCtrl_GetLexer: { // wxStyledTextCtrl::GetLexer
@@ -29942,7 +29983,7 @@ case wxStyledTextCtrl_Colourise: { // wxStyledTextCtrl::Colourise
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Colourise((int) *start,(int) *end);
+ This->Colourise(*start,*end);
  break;
 }
 case wxStyledTextCtrl_SetProperty: { // wxStyledTextCtrl::SetProperty
@@ -29964,7 +30005,7 @@ case wxStyledTextCtrl_SetKeyWords: { // wxStyledTextCtrl::SetKeyWords
  wxString keyWords = wxString(bp, wxConvUTF8);
  bp += *keyWordsLen+((8-((4+ *keyWordsLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetKeyWords((int) *keywordSet,keyWords);
+ This->SetKeyWords(*keywordSet,keyWords);
  break;
 }
 case wxStyledTextCtrl_SetLexerLanguage: { // wxStyledTextCtrl::SetLexerLanguage
@@ -30007,7 +30048,7 @@ case wxStyledTextCtrl_StyleSetSpec: { // wxStyledTextCtrl::StyleSetSpec
  wxString spec = wxString(bp, wxConvUTF8);
  bp += *specLen+((8-((4+ *specLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->StyleSetSpec((int) *styleNum,spec);
+ This->StyleSetSpec(*styleNum,spec);
  break;
 }
 case wxStyledTextCtrl_StyleSetFont: { // wxStyledTextCtrl::StyleSetFont
@@ -30015,7 +30056,7 @@ case wxStyledTextCtrl_StyleSetFont: { // wxStyledTextCtrl::StyleSetFont
  int * styleNum = (int *) bp; bp += 4;
  wxFont *font = (wxFont *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetFont((int) *styleNum,*font);
+ This->StyleSetFont(*styleNum,*font);
  break;
 }
 case wxStyledTextCtrl_StyleSetFontAttr: { // wxStyledTextCtrl::StyleSetFontAttr
@@ -30036,7 +30077,7 @@ encoding = *(wxFontEncoding *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->StyleSetFontAttr((int) *styleNum,(int) *size,faceName,(bool) *bold,(bool) *italic,(bool) *underline,(wxFontEncoding) encoding);
+ This->StyleSetFontAttr(*styleNum,*size,faceName,*bold,*italic,*underline,encoding);
  break;
 }
 case wxStyledTextCtrl_StyleSetCharacterSet: { // wxStyledTextCtrl::StyleSetCharacterSet
@@ -30044,7 +30085,7 @@ case wxStyledTextCtrl_StyleSetCharacterSet: { // wxStyledTextCtrl::StyleSetChara
  int * style = (int *) bp; bp += 4;
  int * characterSet = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetCharacterSet((int) *style,(int) *characterSet);
+ This->StyleSetCharacterSet(*style,*characterSet);
  break;
 }
 case wxStyledTextCtrl_StyleSetFontEncoding: { // wxStyledTextCtrl::StyleSetFontEncoding
@@ -30052,14 +30093,14 @@ case wxStyledTextCtrl_StyleSetFontEncoding: { // wxStyledTextCtrl::StyleSetFontE
  int * style = (int *) bp; bp += 4;
  wxFontEncoding encoding = *(wxFontEncoding *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->StyleSetFontEncoding((int) *style,(wxFontEncoding) encoding);
+ This->StyleSetFontEncoding(*style,encoding);
  break;
 }
 case wxStyledTextCtrl_CmdKeyExecute: { // wxStyledTextCtrl::CmdKeyExecute
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * cmd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CmdKeyExecute((int) *cmd);
+ This->CmdKeyExecute(*cmd);
  break;
 }
 case wxStyledTextCtrl_SetMargins: { // wxStyledTextCtrl::SetMargins
@@ -30067,7 +30108,7 @@ case wxStyledTextCtrl_SetMargins: { // wxStyledTextCtrl::SetMargins
  int * left = (int *) bp; bp += 4;
  int * right = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMargins((int) *left,(int) *right);
+ This->SetMargins(*left,*right);
  break;
 }
 case wxStyledTextCtrl_GetSelection: { // wxStyledTextCtrl::GetSelection
@@ -30085,7 +30126,7 @@ case wxStyledTextCtrl_PointFromPosition: { // wxStyledTextCtrl::PointFromPositio
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxPoint Result = This->PointFromPosition((int) *pos);
+ wxPoint Result = This->PointFromPosition(*pos);
  rt.add(Result);
  break;
 }
@@ -30093,32 +30134,14 @@ case wxStyledTextCtrl_ScrollToLine: { // wxStyledTextCtrl::ScrollToLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ScrollToLine((int) *line);
+ This->ScrollToLine(*line);
  break;
 }
 case wxStyledTextCtrl_ScrollToColumn: { // wxStyledTextCtrl::ScrollToColumn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ScrollToColumn((int) *column);
- break;
-}
-case wxStyledTextCtrl_SendMsg: { // wxStyledTextCtrl::SendMsg
- long wp=0;
- long lp=0;
- wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
- int * msg = (int *) bp; bp += 4;
- while( * (int*) bp) { switch (* (int*) bp) {
-  case 1: {bp += 4;
- wp = (long)*(int *) bp; bp += 4;
-  } break;
-  case 2: {bp += 4;
- lp = (long)*(int *) bp; bp += 4;
-  } break;
- }};
- if(!This) throw wxe_badarg(0);
- long Result = This->SendMsg((int) *msg,wp,lp);
- rt.addInt(Result);
+ This->ScrollToColumn(*column);
  break;
 }
 case wxStyledTextCtrl_SetVScrollBar: { // wxStyledTextCtrl::SetVScrollBar
@@ -30146,7 +30169,7 @@ case wxStyledTextCtrl_SetLastKeydownProcessed: { // wxStyledTextCtrl::SetLastKey
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * val = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLastKeydownProcessed((bool) *val);
+ This->SetLastKeydownProcessed(*val);
  break;
 }
 case wxStyledTextCtrl_SaveFile: { // wxStyledTextCtrl::SaveFile
@@ -30175,7 +30198,7 @@ case wxStyledTextCtrl_DoDragOver: { // wxStyledTextCtrl::DoDragOver
  int * y = (int *) bp; bp += 4;
  wxDragResult def = *(wxDragResult *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- int Result = This->DoDragOver((wxCoord) *x,(wxCoord) *y,(wxDragResult) def);
+ int Result = This->DoDragOver(*x,*y,def);
  rt.addInt(Result);
  break;
 }
@@ -30187,7 +30210,7 @@ case wxStyledTextCtrl_DoDropText: { // wxStyledTextCtrl::DoDropText
  wxString data = wxString(bp, wxConvUTF8);
  bp += *dataLen+((8-((0+ *dataLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->DoDropText((long) *x,(long) *y,data);
+ bool Result = This->DoDropText(*x,*y,data);
  rt.addBool(Result);
  break;
 }
@@ -30210,7 +30233,7 @@ case wxStyledTextCtrl_InsertTextRaw: { // wxStyledTextCtrl::InsertTextRaw
  int * pos = (int *) bp; bp += 4;
  const char * text = (const char*) Ecmd.bin[0]->base;
  if(!This) throw wxe_badarg(0);
- This->InsertTextRaw((int) *pos,text);
+ This->InsertTextRaw(*pos,text);
  break;
 }
 case wxStyledTextCtrl_GetCurLineRaw: { // wxStyledTextCtrl::GetCurLineRaw
@@ -30229,7 +30252,7 @@ case wxStyledTextCtrl_GetLineRaw: { // wxStyledTextCtrl::GetLineRaw
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char * Result = This->GetLineRaw((int) *line).data();
+ char * Result = This->GetLineRaw(*line).data();
  if(Result) {
     rt.addBinary(Result, strlen(Result));
  } else {rt.addAtom("null");};
@@ -30249,7 +30272,7 @@ case wxStyledTextCtrl_GetTextRangeRaw: { // wxStyledTextCtrl::GetTextRangeRaw
  int * startPos = (int *) bp; bp += 4;
  int * endPos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char * Result = This->GetTextRangeRaw((int) *startPos,(int) *endPos).data();
+ char * Result = This->GetTextRangeRaw(*startPos,*endPos).data();
  if(Result) {
     rt.addBinary(Result, strlen(Result));
  } else {rt.addAtom("null");};
@@ -30400,19 +30423,19 @@ case wxNotebookEvent_SetOldSelection: { // wxNotebookEvent::SetOldSelection
  wxNotebookEvent *This = (wxNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * nOldSel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOldSelection((int) *nOldSel);
+ This->SetOldSelection(*nOldSel);
  break;
 }
 case wxNotebookEvent_SetSelection: { // wxNotebookEvent::SetSelection
  wxNotebookEvent *This = (wxNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * nSel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *nSel);
+ This->SetSelection(*nSel);
  break;
 }
 case wxFileDataObject_new: { // wxFileDataObject::wxFileDataObject
  wxFileDataObject * Result = new wxFileDataObject();
- newPtr((void *) Result, 212, memenv);
+ newPtr((void *) Result, 211, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFileDataObject");
  break;
 }
@@ -30448,7 +30471,7 @@ case wxTextDataObject_new: { // wxTextDataObject::wxTextDataObject
   } break;
  }};
  wxTextDataObject * Result = new wxTextDataObject(text);
- newPtr((void *) Result, 213, memenv);
+ newPtr((void *) Result, 212, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextDataObject");
  break;
 }
@@ -30484,7 +30507,7 @@ case wxTextDataObject_destroy: { // wxTextDataObject::destroy
 case wxBitmapDataObject_new_1_1: { // wxBitmapDataObject::wxBitmapDataObject
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 214, memenv);
+ newPtr((void *) Result, 213, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -30496,7 +30519,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 214, memenv);
+ newPtr((void *) Result, 213, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -30598,9 +30621,9 @@ case wxClipboard_UsePrimarySelection: { // wxClipboard::UsePrimarySelection
 }
 case wxClipboard_IsSupported: { // wxClipboard::IsSupported
  wxClipboard *This = (wxClipboard *) getPtr(bp,memenv); bp += 4;
- const int * format = (const int *) bp; bp += 4;
+ wxDataFormatId format = *(wxDataFormatId *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsSupported((wxDataFormatId) *format);
+ bool Result = This->IsSupported(format);
  rt.addBool(Result);
  break;
 }
@@ -30620,7 +30643,7 @@ case wxSpinEvent_SetPosition: { // wxSpinEvent::SetPosition
  wxSpinEvent *This = (wxSpinEvent *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPosition((int) *pos);
+ This->SetPosition(*pos);
  break;
 }
 case wxSplitterWindow_new_0: { // wxSplitterWindow::wxSplitterWindow
@@ -30763,7 +30786,7 @@ case wxSplitterWindow_SetSashGravity: { // wxSplitterWindow::SetSashGravity
  bp += 4; /* Align */
  double * gravity = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->SetSashGravity((double) *gravity);
+ This->SetSashGravity(*gravity);
  break;
 }
 case wxSplitterWindow_SetSashPosition: { // wxSplitterWindow::SetSashPosition
@@ -30776,28 +30799,28 @@ case wxSplitterWindow_SetSashPosition: { // wxSplitterWindow::SetSashPosition
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSashPosition((int) *position,redraw);
+ This->SetSashPosition(*position,redraw);
  break;
 }
 case wxSplitterWindow_SetSashSize: { // wxSplitterWindow::SetSashSize
  wxSplitterWindow *This = (wxSplitterWindow *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSashSize((int) *width);
+ This->SetSashSize(*width);
  break;
 }
 case wxSplitterWindow_SetMinimumPaneSize: { // wxSplitterWindow::SetMinimumPaneSize
  wxSplitterWindow *This = (wxSplitterWindow *) getPtr(bp,memenv); bp += 4;
  int * min = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinimumPaneSize((int) *min);
+ This->SetMinimumPaneSize(*min);
  break;
 }
 case wxSplitterWindow_SetSplitMode: { // wxSplitterWindow::SetSplitMode
  wxSplitterWindow *This = (wxSplitterWindow *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSplitMode((int) *mode);
+ This->SetSplitMode(*mode);
  break;
 }
 case wxSplitterWindow_SplitHorizontally: { // wxSplitterWindow::SplitHorizontally
@@ -30884,7 +30907,7 @@ case wxSplitterEvent_SetSashPosition: { // wxSplitterEvent::SetSashPosition
  wxSplitterEvent *This = (wxSplitterEvent *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSashPosition((int) *pos);
+ This->SetSashPosition(*pos);
  break;
 }
 case wxHtmlWindow_new_0: { // wxHtmlWindow::wxHtmlWindow
@@ -31053,7 +31076,7 @@ case wxHtmlWindow_SetBorders: { // wxHtmlWindow::SetBorders
  wxHtmlWindow *This = (wxHtmlWindow *) getPtr(bp,memenv); bp += 4;
  int * b = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBorders((int) *b);
+ This->SetBorders(*b);
  break;
 }
 case wxHtmlWindow_SetFonts: { // wxHtmlWindow::SetFonts
@@ -31098,7 +31121,7 @@ case wxHtmlWindow_SetRelatedStatusBar: { // wxHtmlWindow::SetRelatedStatusBar
  wxHtmlWindow *This = (wxHtmlWindow *) getPtr(bp,memenv); bp += 4;
  int * bar = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRelatedStatusBar((int) *bar);
+ This->SetRelatedStatusBar(*bar);
  break;
 }
 case wxHtmlWindow_ToText: { // wxHtmlWindow::ToText
@@ -31117,13 +31140,13 @@ case wxHtmlLinkEvent_GetLinkInfo: { // wxHtmlLinkEvent::GetLinkInfo
 }
 case wxSystemSettings_GetColour: { // wxSystemSettings::GetColour
  wxSystemColour index = *(wxSystemColour *) bp; bp += 4;;
- wxColour Result = wxSystemSettings::GetColour((wxSystemColour) index);
+ wxColour Result = wxSystemSettings::GetColour(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);;
+ wxFont * Result = new wxFont(wxSystemSettings::GetFont(index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -31136,7 +31159,7 @@ case wxSystemSettings_GetMetric: { // wxSystemSettings::GetMetric
 win = (wxWindow *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- int Result = wxSystemSettings::GetMetric((wxSystemMetric) index,win);
+ int Result = wxSystemSettings::GetMetric(index,win);
  rt.addInt(Result);
  break;
 }
@@ -31192,14 +31215,14 @@ case wxSystemOptions_SetOption_2_0: { // wxSystemOptions::SetOption
  wxString name = wxString(bp, wxConvUTF8);
  bp += *nameLen+((8-((4+ *nameLen) & 7)) & 7);
  int * value = (int *) bp; bp += 4;
- wxSystemOptions::SetOption(name,(int) *value);
+ wxSystemOptions::SetOption(name,*value);
  break;
 }
 case wxAuiNotebookEvent_SetSelection: { // wxAuiNotebookEvent::SetSelection
  wxAuiNotebookEvent *This = (wxAuiNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * s = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *s);
+ This->SetSelection(*s);
  break;
 }
 case wxAuiNotebookEvent_GetSelection: { // wxAuiNotebookEvent::GetSelection
@@ -31213,7 +31236,7 @@ case wxAuiNotebookEvent_SetOldSelection: { // wxAuiNotebookEvent::SetOldSelectio
  wxAuiNotebookEvent *This = (wxAuiNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * s = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOldSelection((int) *s);
+ This->SetOldSelection(*s);
  break;
 }
 case wxAuiNotebookEvent_GetOldSelection: { // wxAuiNotebookEvent::GetOldSelection
@@ -31269,7 +31292,7 @@ case wxAuiManagerEvent_SetButton: { // wxAuiManagerEvent::SetButton
  wxAuiManagerEvent *This = (wxAuiManagerEvent *) getPtr(bp,memenv); bp += 4;
  int * b = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetButton((int) *b);
+ This->SetButton(*b);
  break;
 }
 case wxAuiManagerEvent_GetButton: { // wxAuiManagerEvent::GetButton
@@ -31317,7 +31340,7 @@ case wxAuiManagerEvent_SetCanVeto: { // wxAuiManagerEvent::SetCanVeto
  wxAuiManagerEvent *This = (wxAuiManagerEvent *) getPtr(bp,memenv); bp += 4;
  bool * can_veto = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCanVeto((bool) *can_veto);
+ This->SetCanVeto(*can_veto);
  break;
 }
 case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
@@ -31329,7 +31352,7 @@ case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
 }
 case wxLogNull_new: { // wxLogNull::wxLogNull
  wxLogNull * Result = new wxLogNull();
- newPtr((void *) Result, 225, memenv);
+ newPtr((void *) Result, 224, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxLogNull");
  break;
 }
@@ -31416,10 +31439,10 @@ void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
   case 101: delete (wxListItemAttr *) ptr; break;
   case 103: delete (wxTextAttr *) ptr; break;
   case 155: delete (wxAuiPaneInfo *) ptr; break;
-  case 212: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 213: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 214: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 225: delete (wxLogNull *) ptr; break;
+  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 224: delete (wxLogNull *) ptr; break;
   default: delete (wxObject *) ptr;
 }}
 
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index b24becae06..4b87c2340e 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -3201,155 +3201,154 @@
 #define wxStyledTextCtrl_PointFromPosition 3370
 #define wxStyledTextCtrl_ScrollToLine 3371
 #define wxStyledTextCtrl_ScrollToColumn 3372
-#define wxStyledTextCtrl_SendMsg 3373
-#define wxStyledTextCtrl_SetVScrollBar 3374
-#define wxStyledTextCtrl_SetHScrollBar 3375
-#define wxStyledTextCtrl_GetLastKeydownProcessed 3376
-#define wxStyledTextCtrl_SetLastKeydownProcessed 3377
-#define wxStyledTextCtrl_SaveFile 3378
-#define wxStyledTextCtrl_LoadFile 3379
-#define wxStyledTextCtrl_DoDragOver 3380
-#define wxStyledTextCtrl_DoDropText 3381
-#define wxStyledTextCtrl_GetUseAntiAliasing 3382
-#define wxStyledTextCtrl_AddTextRaw 3383
-#define wxStyledTextCtrl_InsertTextRaw 3384
-#define wxStyledTextCtrl_GetCurLineRaw 3385
-#define wxStyledTextCtrl_GetLineRaw 3386
-#define wxStyledTextCtrl_GetSelectedTextRaw 3387
-#define wxStyledTextCtrl_GetTextRangeRaw 3388
-#define wxStyledTextCtrl_SetTextRaw 3389
-#define wxStyledTextCtrl_GetTextRaw 3390
-#define wxStyledTextCtrl_AppendTextRaw 3391
-#define wxArtProvider_GetBitmap 3392
-#define wxArtProvider_GetIcon 3393
-#define wxTreeEvent_GetKeyCode 3394
-#define wxTreeEvent_GetItem 3395
-#define wxTreeEvent_GetKeyEvent 3396
-#define wxTreeEvent_GetLabel 3397
-#define wxTreeEvent_GetOldItem 3398
-#define wxTreeEvent_GetPoint 3399
-#define wxTreeEvent_IsEditCancelled 3400
-#define wxTreeEvent_SetToolTip 3401
-#define wxNotebookEvent_GetOldSelection 3402
-#define wxNotebookEvent_GetSelection 3403
-#define wxNotebookEvent_SetOldSelection 3404
-#define wxNotebookEvent_SetSelection 3405
-#define wxFileDataObject_new 3406
-#define wxFileDataObject_AddFile 3407
-#define wxFileDataObject_GetFilenames 3408
-#define wxFileDataObject_destroy 3409
-#define wxTextDataObject_new 3410
-#define wxTextDataObject_GetTextLength 3411
-#define wxTextDataObject_GetText 3412
-#define wxTextDataObject_SetText 3413
-#define wxTextDataObject_destroy 3414
-#define wxBitmapDataObject_new_1_1 3415
-#define wxBitmapDataObject_new_1_0 3416
-#define wxBitmapDataObject_GetBitmap 3417
-#define wxBitmapDataObject_SetBitmap 3418
-#define wxBitmapDataObject_destroy 3419
-#define wxClipboard_new 3421
-#define wxClipboard_destruct 3422
-#define wxClipboard_AddData 3423
-#define wxClipboard_Clear 3424
-#define wxClipboard_Close 3425
-#define wxClipboard_Flush 3426
-#define wxClipboard_GetData 3427
-#define wxClipboard_IsOpened 3428
-#define wxClipboard_Open 3429
-#define wxClipboard_SetData 3430
-#define wxClipboard_UsePrimarySelection 3432
-#define wxClipboard_IsSupported 3433
-#define wxClipboard_Get 3434
-#define wxSpinEvent_GetPosition 3435
-#define wxSpinEvent_SetPosition 3436
-#define wxSplitterWindow_new_0 3437
-#define wxSplitterWindow_new_2 3438
-#define wxSplitterWindow_destruct 3439
-#define wxSplitterWindow_Create 3440
-#define wxSplitterWindow_GetMinimumPaneSize 3441
-#define wxSplitterWindow_GetSashGravity 3442
-#define wxSplitterWindow_GetSashPosition 3443
-#define wxSplitterWindow_GetSplitMode 3444
-#define wxSplitterWindow_GetWindow1 3445
-#define wxSplitterWindow_GetWindow2 3446
-#define wxSplitterWindow_Initialize 3447
-#define wxSplitterWindow_IsSplit 3448
-#define wxSplitterWindow_ReplaceWindow 3449
-#define wxSplitterWindow_SetSashGravity 3450
-#define wxSplitterWindow_SetSashPosition 3451
-#define wxSplitterWindow_SetSashSize 3452
-#define wxSplitterWindow_SetMinimumPaneSize 3453
-#define wxSplitterWindow_SetSplitMode 3454
-#define wxSplitterWindow_SplitHorizontally 3455
-#define wxSplitterWindow_SplitVertically 3456
-#define wxSplitterWindow_Unsplit 3457
-#define wxSplitterWindow_UpdateSize 3458
-#define wxSplitterEvent_GetSashPosition 3459
-#define wxSplitterEvent_GetX 3460
-#define wxSplitterEvent_GetY 3461
-#define wxSplitterEvent_GetWindowBeingRemoved 3462
-#define wxSplitterEvent_SetSashPosition 3463
-#define wxHtmlWindow_new_0 3464
-#define wxHtmlWindow_new_2 3465
-#define wxHtmlWindow_AppendToPage 3466
-#define wxHtmlWindow_GetOpenedAnchor 3467
-#define wxHtmlWindow_GetOpenedPage 3468
-#define wxHtmlWindow_GetOpenedPageTitle 3469
-#define wxHtmlWindow_GetRelatedFrame 3470
-#define wxHtmlWindow_HistoryBack 3471
-#define wxHtmlWindow_HistoryCanBack 3472
-#define wxHtmlWindow_HistoryCanForward 3473
-#define wxHtmlWindow_HistoryClear 3474
-#define wxHtmlWindow_HistoryForward 3475
-#define wxHtmlWindow_LoadFile 3476
-#define wxHtmlWindow_LoadPage 3477
-#define wxHtmlWindow_SelectAll 3478
-#define wxHtmlWindow_SelectionToText 3479
-#define wxHtmlWindow_SelectLine 3480
-#define wxHtmlWindow_SelectWord 3481
-#define wxHtmlWindow_SetBorders 3482
-#define wxHtmlWindow_SetFonts 3483
-#define wxHtmlWindow_SetPage 3484
-#define wxHtmlWindow_SetRelatedFrame 3485
-#define wxHtmlWindow_SetRelatedStatusBar 3486
-#define wxHtmlWindow_ToText 3487
-#define wxHtmlWindow_destroy 3488
-#define wxHtmlLinkEvent_GetLinkInfo 3489
-#define wxSystemSettings_GetColour 3490
-#define wxSystemSettings_GetFont 3491
-#define wxSystemSettings_GetMetric 3492
-#define wxSystemSettings_GetScreenType 3493
-#define wxSystemOptions_GetOption 3494
-#define wxSystemOptions_GetOptionInt 3495
-#define wxSystemOptions_HasOption 3496
-#define wxSystemOptions_IsFalse 3497
-#define wxSystemOptions_SetOption_2_1 3498
-#define wxSystemOptions_SetOption_2_0 3499
-#define wxAuiNotebookEvent_SetSelection 3500
-#define wxAuiNotebookEvent_GetSelection 3501
-#define wxAuiNotebookEvent_SetOldSelection 3502
-#define wxAuiNotebookEvent_GetOldSelection 3503
-#define wxAuiNotebookEvent_SetDragSource 3504
-#define wxAuiNotebookEvent_GetDragSource 3505
-#define wxAuiManagerEvent_SetManager 3506
-#define wxAuiManagerEvent_GetManager 3507
-#define wxAuiManagerEvent_SetPane 3508
-#define wxAuiManagerEvent_GetPane 3509
-#define wxAuiManagerEvent_SetButton 3510
-#define wxAuiManagerEvent_GetButton 3511
-#define wxAuiManagerEvent_SetDC 3512
-#define wxAuiManagerEvent_GetDC 3513
-#define wxAuiManagerEvent_Veto 3514
-#define wxAuiManagerEvent_GetVeto 3515
-#define wxAuiManagerEvent_SetCanVeto 3516
-#define wxAuiManagerEvent_CanVeto 3517
-#define wxLogNull_new 3518
-#define wxLogNull_destroy 3519
-#define wxTaskBarIcon_new 3520
-#define wxTaskBarIcon_destruct 3521
-#define wxTaskBarIcon_PopupMenu 3522
-#define wxTaskBarIcon_RemoveIcon 3523
-#define wxTaskBarIcon_SetIcon 3524
+#define wxStyledTextCtrl_SetVScrollBar 3373
+#define wxStyledTextCtrl_SetHScrollBar 3374
+#define wxStyledTextCtrl_GetLastKeydownProcessed 3375
+#define wxStyledTextCtrl_SetLastKeydownProcessed 3376
+#define wxStyledTextCtrl_SaveFile 3377
+#define wxStyledTextCtrl_LoadFile 3378
+#define wxStyledTextCtrl_DoDragOver 3379
+#define wxStyledTextCtrl_DoDropText 3380
+#define wxStyledTextCtrl_GetUseAntiAliasing 3381
+#define wxStyledTextCtrl_AddTextRaw 3382
+#define wxStyledTextCtrl_InsertTextRaw 3383
+#define wxStyledTextCtrl_GetCurLineRaw 3384
+#define wxStyledTextCtrl_GetLineRaw 3385
+#define wxStyledTextCtrl_GetSelectedTextRaw 3386
+#define wxStyledTextCtrl_GetTextRangeRaw 3387
+#define wxStyledTextCtrl_SetTextRaw 3388
+#define wxStyledTextCtrl_GetTextRaw 3389
+#define wxStyledTextCtrl_AppendTextRaw 3390
+#define wxArtProvider_GetBitmap 3391
+#define wxArtProvider_GetIcon 3392
+#define wxTreeEvent_GetKeyCode 3393
+#define wxTreeEvent_GetItem 3394
+#define wxTreeEvent_GetKeyEvent 3395
+#define wxTreeEvent_GetLabel 3396
+#define wxTreeEvent_GetOldItem 3397
+#define wxTreeEvent_GetPoint 3398
+#define wxTreeEvent_IsEditCancelled 3399
+#define wxTreeEvent_SetToolTip 3400
+#define wxNotebookEvent_GetOldSelection 3401
+#define wxNotebookEvent_GetSelection 3402
+#define wxNotebookEvent_SetOldSelection 3403
+#define wxNotebookEvent_SetSelection 3404
+#define wxFileDataObject_new 3405
+#define wxFileDataObject_AddFile 3406
+#define wxFileDataObject_GetFilenames 3407
+#define wxFileDataObject_destroy 3408
+#define wxTextDataObject_new 3409
+#define wxTextDataObject_GetTextLength 3410
+#define wxTextDataObject_GetText 3411
+#define wxTextDataObject_SetText 3412
+#define wxTextDataObject_destroy 3413
+#define wxBitmapDataObject_new_1_1 3414
+#define wxBitmapDataObject_new_1_0 3415
+#define wxBitmapDataObject_GetBitmap 3416
+#define wxBitmapDataObject_SetBitmap 3417
+#define wxBitmapDataObject_destroy 3418
+#define wxClipboard_new 3420
+#define wxClipboard_destruct 3421
+#define wxClipboard_AddData 3422
+#define wxClipboard_Clear 3423
+#define wxClipboard_Close 3424
+#define wxClipboard_Flush 3425
+#define wxClipboard_GetData 3426
+#define wxClipboard_IsOpened 3427
+#define wxClipboard_Open 3428
+#define wxClipboard_SetData 3429
+#define wxClipboard_UsePrimarySelection 3431
+#define wxClipboard_IsSupported 3432
+#define wxClipboard_Get 3433
+#define wxSpinEvent_GetPosition 3434
+#define wxSpinEvent_SetPosition 3435
+#define wxSplitterWindow_new_0 3436
+#define wxSplitterWindow_new_2 3437
+#define wxSplitterWindow_destruct 3438
+#define wxSplitterWindow_Create 3439
+#define wxSplitterWindow_GetMinimumPaneSize 3440
+#define wxSplitterWindow_GetSashGravity 3441
+#define wxSplitterWindow_GetSashPosition 3442
+#define wxSplitterWindow_GetSplitMode 3443
+#define wxSplitterWindow_GetWindow1 3444
+#define wxSplitterWindow_GetWindow2 3445
+#define wxSplitterWindow_Initialize 3446
+#define wxSplitterWindow_IsSplit 3447
+#define wxSplitterWindow_ReplaceWindow 3448
+#define wxSplitterWindow_SetSashGravity 3449
+#define wxSplitterWindow_SetSashPosition 3450
+#define wxSplitterWindow_SetSashSize 3451
+#define wxSplitterWindow_SetMinimumPaneSize 3452
+#define wxSplitterWindow_SetSplitMode 3453
+#define wxSplitterWindow_SplitHorizontally 3454
+#define wxSplitterWindow_SplitVertically 3455
+#define wxSplitterWindow_Unsplit 3456
+#define wxSplitterWindow_UpdateSize 3457
+#define wxSplitterEvent_GetSashPosition 3458
+#define wxSplitterEvent_GetX 3459
+#define wxSplitterEvent_GetY 3460
+#define wxSplitterEvent_GetWindowBeingRemoved 3461
+#define wxSplitterEvent_SetSashPosition 3462
+#define wxHtmlWindow_new_0 3463
+#define wxHtmlWindow_new_2 3464
+#define wxHtmlWindow_AppendToPage 3465
+#define wxHtmlWindow_GetOpenedAnchor 3466
+#define wxHtmlWindow_GetOpenedPage 3467
+#define wxHtmlWindow_GetOpenedPageTitle 3468
+#define wxHtmlWindow_GetRelatedFrame 3469
+#define wxHtmlWindow_HistoryBack 3470
+#define wxHtmlWindow_HistoryCanBack 3471
+#define wxHtmlWindow_HistoryCanForward 3472
+#define wxHtmlWindow_HistoryClear 3473
+#define wxHtmlWindow_HistoryForward 3474
+#define wxHtmlWindow_LoadFile 3475
+#define wxHtmlWindow_LoadPage 3476
+#define wxHtmlWindow_SelectAll 3477
+#define wxHtmlWindow_SelectionToText 3478
+#define wxHtmlWindow_SelectLine 3479
+#define wxHtmlWindow_SelectWord 3480
+#define wxHtmlWindow_SetBorders 3481
+#define wxHtmlWindow_SetFonts 3482
+#define wxHtmlWindow_SetPage 3483
+#define wxHtmlWindow_SetRelatedFrame 3484
+#define wxHtmlWindow_SetRelatedStatusBar 3485
+#define wxHtmlWindow_ToText 3486
+#define wxHtmlWindow_destroy 3487
+#define wxHtmlLinkEvent_GetLinkInfo 3488
+#define wxSystemSettings_GetColour 3489
+#define wxSystemSettings_GetFont 3490
+#define wxSystemSettings_GetMetric 3491
+#define wxSystemSettings_GetScreenType 3492
+#define wxSystemOptions_GetOption 3493
+#define wxSystemOptions_GetOptionInt 3494
+#define wxSystemOptions_HasOption 3495
+#define wxSystemOptions_IsFalse 3496
+#define wxSystemOptions_SetOption_2_1 3497
+#define wxSystemOptions_SetOption_2_0 3498
+#define wxAuiNotebookEvent_SetSelection 3499
+#define wxAuiNotebookEvent_GetSelection 3500
+#define wxAuiNotebookEvent_SetOldSelection 3501
+#define wxAuiNotebookEvent_GetOldSelection 3502
+#define wxAuiNotebookEvent_SetDragSource 3503
+#define wxAuiNotebookEvent_GetDragSource 3504
+#define wxAuiManagerEvent_SetManager 3505
+#define wxAuiManagerEvent_GetManager 3506
+#define wxAuiManagerEvent_SetPane 3507
+#define wxAuiManagerEvent_GetPane 3508
+#define wxAuiManagerEvent_SetButton 3509
+#define wxAuiManagerEvent_GetButton 3510
+#define wxAuiManagerEvent_SetDC 3511
+#define wxAuiManagerEvent_GetDC 3512
+#define wxAuiManagerEvent_Veto 3513
+#define wxAuiManagerEvent_GetVeto 3514
+#define wxAuiManagerEvent_SetCanVeto 3515
+#define wxAuiManagerEvent_CanVeto 3516
+#define wxLogNull_new 3517
+#define wxLogNull_destroy 3518
+#define wxTaskBarIcon_new 3519
+#define wxTaskBarIcon_destruct 3520
+#define wxTaskBarIcon_PopupMenu 3521
+#define wxTaskBarIcon_RemoveIcon 3522
+#define wxTaskBarIcon_SetIcon 3523
 
 
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 69fcd4e362..527fabc315 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-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2012. All Rights Reserved.
  *
  * The 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,6 +30,11 @@
 // Ok ugly but needed for wxBufferedDC crash workaround
 #define private public
 #include <wx/dcbuffer.h>
+
+#if defined(__WXMSW__)
+    #include <wx/msw/private.h> // for wxSetInstance
+#endif
+
 #undef private
 
 #include "wxe_impl.h"
@@ -222,6 +227,11 @@ void *wxe_main_loop(void *vpdl)
   // This should be done in emulator but it's not in yet.
 #ifndef _WIN32
   erts_thread_disable_fpe();
+#else 
+  // Setup that wxWidgets should look for cursors and icons in 
+  // this dll and not in werl.exe (which is the default)
+  HMODULE WXEHandle = GetModuleHandle(_T("wxe_driver"));
+  wxSetInstance((HINSTANCE) WXEHandle);
 #endif
 
   result = wxEntry(argc, argv);
@@ -248,20 +258,30 @@ wxFrame * dummy_window;
 
 void create_dummy_window() {
   dummy_window = new wxFrame(NULL,-1, wxT("wx driver"),
-			     wxDefaultPosition, wxSize(5,5),
+			     wxPoint(0,0), wxSize(5,5),
 			     wxFRAME_NO_TASKBAR);
+
+  wxMenuBar * menubar = new wxMenuBar();
+  dummy_window->SetMenuBar(menubar);
+  // wx-2.9 Don't delete the app menubar correctly
   dummy_window->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW,
 			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
+  dummy_window->Connect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED,
+			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
+  dummy_window->Show(true);
+  // dummy_window->Show(false);
 }
 
 // wxMac really wants a top level window which command-q quits if there are no
 // windows open, and this will kill the thread, so restart the dummy_window each
 // time a we receive a close.
 void WxeApp::dummy_close(wxEvent& Ev) {
-  // fprintf(stderr, "Tried to close dummy window\r\n"); fflush(stderr);
-  create_dummy_window();
+  if(Ev.GetEventType() == wxEVT_CLOSE_WINDOW) {
+    create_dummy_window();
+  }
 }
 
+
 // Init wx-widgets thread
 bool WxeApp::OnInit()
 {
@@ -272,7 +292,7 @@ bool WxeApp::OnInit()
   wxe_batch_cb_saved = new wxList;
   cb_buff = NULL;
 
-  wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED);
+  // wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED); Hmm printpreview doesn't work in 2.9 with this
 
   this->Connect(wxID_ANY, wxEVT_IDLE,
 		(wxObjectEventFunction) (wxEventFunction) &WxeApp::idle);
@@ -290,7 +310,11 @@ bool WxeApp::OnInit()
 
   /* Create a dummy window so wxWidgets don't automagicly quits the main loop
      after the last window */
+#ifdef __DARWIN__
   create_dummy_window();
+#else
+  SetExitOnFrameDelete(false);
+#endif
 
   init_nonconsts(global_me, init_caller);
   erl_drv_mutex_lock(wxe_status_m);
@@ -301,7 +325,9 @@ bool WxeApp::OnInit()
 }
 
 void WxeApp::shutdown(wxeMetaCommand& Ecmd) {
+#ifdef __DARWIN__
   delete dummy_window;
+#endif
   ExitMainLoop();
 }
 
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index a85f751024..025ea90f8b 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -25,12 +25,17 @@
 #include <Cocoa/Cocoa.h>
 #include <objc/objc-runtime.h>
 
+extern OSErr  CPSSetProcessName (ProcessSerialNumber *psn, char *processname);
+
 void * wxe_ps_init() 
 {
    ProcessSerialNumber psn;
    NSAutoreleasePool *pool;
    // Enable GUI 
    GetCurrentProcess(&psn);
+   char *app_title = getenv("WX_APP_TITLE");
+   // Undocumented function (but no documented way of doing this exists)
+   CPSSetProcessName(&psn, app_title?app_title:"Erlang");
    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
    SetFrontProcess(&psn);
    // Enable Cocoa calls from Carbon app
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 7b35fed672..c45d2285af 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -80,20 +80,20 @@ fi
 ## Otherwise skip building wxErlang
 AC_CHECK_SIZEOF(void *)
 
-case $ac_cv_sizeof_void_p-$host_os in
-    8-darwin*)
-	if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-		AC_MSG_ERROR([Can not use 64bits wxWidgets on Darwin])
-	else
-		echo "Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable" > ./CONF_INFO
-		WXERL_CAN_BUILD_DRIVER=false
-		AC_MSG_WARN([Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable])
-	fi
-	WXERL_CAN_BUILD_DRIVER=false
-	;;
-    *)
-	;;
-esac
+# case $ac_cv_sizeof_void_p-$host_os in
+#     8-darwin*)
+# 	if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
+# 		AC_MSG_ERROR([Can not use 64bits wxWidgets on Darwin])
+# 	else
+# 		echo "Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable" > ./CONF_INFO
+# 		WXERL_CAN_BUILD_DRIVER=false
+# 		AC_MSG_WARN([Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable])
+# 	fi
+# 	WXERL_CAN_BUILD_DRIVER=false
+# 	;;
+#     *)
+# 	;;
+# esac
 
 PTHR_CFLAGS="-D_THREAD_SAFE -D_REENTRANT"
 
@@ -155,7 +155,7 @@ case $host_os in
 	      OBJC_CFLAGS="-ObjC"
 	   fi
   	fi
-  	CFLAGS=$saved_CFLAGS
+  	CFLAGS="$saved_CFLAGS -Wno-deprecated-declarations"
 	CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS"
 	;;
     mingw32)
@@ -169,6 +169,7 @@ case $host_os in
 	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500"
 	;;
     *)
+	CFLAGS="$CFLAGS -Wno-deprecated-declarations"
 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE $PTHR_CFLAGS"
 	;;
 esac
@@ -252,6 +253,18 @@ else
     AC_CHECK_HEADERS([gl/gl.h],[],[],[#include <windows.h>])
 fi
 
+if test X"$host_os" != X"win32" ; then
+    AC_CHECK_HEADERS([GL/glu.h], [],
+        [AC_CHECK_HEADERS([OpenGL/glu.h])])
+    if test X"$ac_cv_header_GL_glu_h" != Xyes &&
+        test X"$ac_cv_header_OpenGL_glu_h" != Xyes
+    then
+	AC_MSG_WARN([No GLU headers found, wx will NOT be usable])
+    fi
+else
+    AC_CHECK_HEADERS([gl/glu.h],[],[],[#include <windows.h>])
+fi
+
 AC_SUBST(GL_LIBS)
 
 CXXFLAGS="$CFLAGS $CPPFLAGS" 
@@ -308,7 +321,15 @@ if test "$cross_compiling" = "yes"; then
     echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" > ./CONF_INFO
     WXERL_CAN_BUILD_DRIVER=false
 elif test  X"$MIXED_CYGWIN_VC" == X"no" -a X"$MIXED_MSYS_VC" == X"no"; then
-    m4_include(wxwin.m4)
+    WX_VERSION=`wx-config --version`
+    case $WX_VERSION in
+         2.8.*)
+		m4_include(wxwin-2.8.m4)
+		;;
+	 *)
+		m4_include(wxwin-2.9.m4)
+		;;
+    esac
 
     AM_OPTIONS_WXCONFIG
     reqwx=2.8.4
@@ -395,12 +416,12 @@ else
     else
 	CWXWIN_PROG=`cygpath -d "$PROGRAMFILES" | cygpath -f - 2>/dev/null`
     fi
-    CWXWIN3=$CWXWIN_PROG/wxWidgets-2.8
-    CWXWIN4=$CWXWIN_PROG/wxMSW-2.8
-    CWX_DOCUMENTED="/opt/local/pgm/wxMSW-2.8.* /opt/local/pgm/wxWidgets-2.8.*"
+    CWXWIN3=$CWXWIN_PROG/wxWidgets-2.*.*
+    CWXWIN4=$CWXWIN_PROG/wxMSW-2.*.*
+    CWX_DOCUMENTED="/opt/local/pgm/wxMSW-2.*.* /opt/local/pgm/wxWidgets-2.*.*"
     case $ac_cv_sizeof_void_p in
     	 8)
-		CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-2.8.* /opt/local64/pgm/wxWidgets-2.8.* $CWX_DOCUMENTED"
+		CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-2.*.* /opt/local64/pgm/wxWidgets-2.*.* $CWX_DOCUMENTED"
 		;;
          *)
 		true
@@ -442,6 +463,7 @@ else
 	    fi
 	fi
     done
+
     if test -z "$WX_LIBS_STATIC"; then
 	AC_MSG_RESULT([failed])
         if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
@@ -621,6 +643,12 @@ fi dnl - if test "$WXERL_CAN_BUILD_DRIVER" != "false"
 
 AC_SUBST(WXERL_CAN_BUILD_DRIVER)
 
+if test "x$GCC" = xyes; then
+    # Treat certain GCC warnings as errors
+    LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
+    LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CXXFLAGS])
+fi
+
 #############################################################################
 
 dnl 
diff --git a/lib/wx/examples/demo/demo.erl b/lib/wx/examples/demo/demo.erl
index 61e71af021..2f560096f5 100644
--- a/lib/wx/examples/demo/demo.erl
+++ b/lib/wx/examples/demo/demo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The 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,21 @@
 
 -record(state, {win, demo, example, selector, log, code}).
 
+%% For wx-2.9 usage
+-ifndef(wxSTC_ERLANG_COMMENT_FUNCTION).
+-define(wxSTC_ERLANG_COMMENT_FUNCTION, 14).
+-define(wxSTC_ERLANG_COMMENT_MODULE, 15).
+-define(wxSTC_ERLANG_COMMENT_DOC, 16).
+-define(wxSTC_ERLANG_COMMENT_DOC_MACRO, 17).
+-define(wxSTC_ERLANG_ATOM_QUOTED, 18).
+-define(wxSTC_ERLANG_MACRO_QUOTED, 19).
+-define(wxSTC_ERLANG_RECORD_QUOTED, 20).
+-define(wxSTC_ERLANG_NODE_NAME_QUOTED, 21).
+-define(wxSTC_ERLANG_BIFS, 22).
+-define(wxSTC_ERLANG_MODULES, 23).
+-define(wxSTC_ERLANG_MODULES_ATT, 24).
+-endif.
+
 start() ->
     start([]).
 
@@ -78,6 +93,7 @@ init(Options) ->
     wxFrame:setMenuBar(Frame,MB),
 
     wxFrame:connect(Frame, command_menu_selected),
+    wxFrame:connect(Frame, close_window),
 
     _SB = wxFrame:createStatusBar(Frame,[]),
     
@@ -179,6 +195,8 @@ create_subwindow(Parent, BoxLabel, Funs) ->
 %% Handled as in normal gen_server callbacks
 handle_info({'EXIT',_, wx_deleted}, State) ->
     {noreply,State};
+handle_info({'EXIT',_, shutdown}, State) ->
+    {noreply,State};
 handle_info({'EXIT',_, normal}, State) ->
     {noreply,State};
 handle_info(Msg, State) ->
@@ -197,13 +215,13 @@ handle_cast(Msg, State) ->
 handle_event(#wx{event=#wxCommand{type=command_listbox_selected, cmdString=Ex}}, 
 	     State = #state{demo={_,DemoSz}, example=Example, code=Code}) ->
     case Ex of
-	[] -> 
+	[] ->
 	    {noreply, State};
 	_  ->
 	    wxSizer:detach(DemoSz, Example),
-	    wxWindow:destroy(Example),
+	    wx_object:call(Example, shutdown),
 	    unload_code(Code),
-	    NewExample = load_example(Ex, State), 
+	    NewExample = load_example(Ex, State),
 	    wxSizer:add(DemoSz, NewExample, [{proportion,1}, {flag, ?wxEXPAND}]),
 	    wxSizer:layout(DemoSz),
 	    {noreply, State#state{example=NewExample}}
@@ -247,9 +265,9 @@ handle_event(#wx{id = Id,
 							    ?wxICON_INFORMATION bor
 							    ?wxSTAY_ON_TOP},
 							   {caption, "About"}])),
-	    {noreply, State};		    
+	    {noreply, State};
 	?wxID_EXIT ->
-	    wx_object:get_pid(State#state.example) ! stop,
+	    wx_object:call(State#state.example, shutdown),
 	    {stop, normal, State};
 	_ ->
 	    {noreply, State}
@@ -265,9 +283,9 @@ handle_event(Ev,State) ->
 code_change(_, _, State) ->
     {stop, not_yet_implemented, State}.
 
-terminate(_Reason, State) ->
-    wx_object:get_pid(State#state.example) ! stop,
-    timer:sleep(200), %% Give the example process some time to cleanup.
+terminate(_Reason, State = #state{win=Frame}) ->
+    catch wx_object:call(State#state.example, shutdown),
+    wxFrame:destroy(Frame),
     wx:destroy().
 
 %%%%%%%%%%%%%%%%% Internals %%%%%%%%%%
@@ -275,8 +293,6 @@ terminate(_Reason, State) ->
 load_example(Ex, #state{demo={DemoPanel,DemoSz}, log=EvCtrl, code=Code}) ->
     ModStr = "ex_" ++ Ex,
     Mod = list_to_atom(ModStr),
-%%     WxDir = code:lib_dir(wx),
-%%     ModFile = filename:join([WxDir, "examples","demo", ModStr ++ ".erl"]),
     ModFile = ModStr ++ ".erl",
     load_code(Code, file:read_file(ModFile)),
     find(Code),
@@ -312,7 +328,20 @@ code_area(Parent) ->
 	       {?wxSTC_ERLANG_MACRO,    {40,144,170}},
 	       {?wxSTC_ERLANG_RECORD,   {40,100,20}},
 	       {?wxSTC_ERLANG_SEPARATOR,{0,0,0}},
-	       {?wxSTC_ERLANG_NODE_NAME,{0,0,0}}],
+	       {?wxSTC_ERLANG_NODE_NAME,{0,0,0}},
+	       %% Optional 2.9 stuff
+	       {?wxSTC_ERLANG_COMMENT_FUNCTION, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_MODULE, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_DOC, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_DOC_MACRO, {160,53,35}},
+	       {?wxSTC_ERLANG_ATOM_QUOTED, {0,0,0}},
+	       {?wxSTC_ERLANG_MACRO_QUOTED, {40,144,170}},
+	       {?wxSTC_ERLANG_RECORD_QUOTED, {40,100,20}},
+	       {?wxSTC_ERLANG_NODE_NAME_QUOTED, {0,0,0}},
+	       {?wxSTC_ERLANG_BIFS, {130,40,172}},
+	       {?wxSTC_ERLANG_MODULES, {64,102,244}},
+	       {?wxSTC_ERLANG_MODULES_ATT, {64,102,244}}
+	      ],
     SetStyle = fun({Style, Color}) ->
 		       ?stc:styleSetFont(Ed, Style, FixedFont),
 		       ?stc:styleSetForeground(Ed, Style, Color)
diff --git a/lib/wx/examples/demo/demo_html_tagger.erl b/lib/wx/examples/demo/demo_html_tagger.erl
index 243e5d659f..46bfe73676 100644
--- a/lib/wx/examples/demo/demo_html_tagger.erl
+++ b/lib/wx/examples/demo/demo_html_tagger.erl
@@ -485,7 +485,6 @@ is_keyword('not') -> true;
 is_keyword('of' ) -> true;
 is_keyword('or' ) -> true;
 is_keyword('orelse' ) -> true;
-is_keyword('query' ) -> true;
 is_keyword('receive' ) -> true;
 is_keyword('rem' ) -> true;
 is_keyword('spec') -> true;
diff --git a/lib/wx/examples/demo/ex_aui.erl b/lib/wx/examples/demo/ex_aui.erl
index 50f077638d..70372caad8 100644
--- a/lib/wx/examples/demo/ex_aui.erl
+++ b/lib/wx/examples/demo/ex_aui.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The 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,8 @@
 -record(state, 
 	{
 	  parent,
-	  config
+	  config,
+	  aui
 	}).
 
 start(Config) ->
@@ -47,12 +48,10 @@ init(Config) ->
 do_init(Config) ->
     Parent = proplists:get_value(parent, Config),  
     Panel = wxPanel:new(Parent, []),
-
     %% Setup sizers
     MainSizer = wxBoxSizer:new(?wxVERTICAL),
 
-    Manager = wxAuiManager:new([{managed_wnd, Panel}
-				]),
+    Manager = wxAuiManager:new([{managed_wnd, Panel}]),
 
     Pane = ?pi:new(),
     ?pi:closeButton(Pane),
@@ -79,8 +78,8 @@ do_init(Config) ->
     wxAuiManager:connect(Manager, aui_pane_button, [{skip,true}]),
     wxAuiManager:connect(Manager, aui_pane_maximize, [{skip,true}]),
     wxAuiManager:update(Manager),
-
-    {Panel, #state{parent=Panel, config=Config}}.
+    process_flag(trap_exit, true),
+    {Panel, #state{parent=Panel, config=Config, aui=Manager}}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Callbacks handled as normal gen_server callbacks
@@ -88,6 +87,12 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel, aui=Manager}) ->
+    wxAuiManager:unInit(Manager),
+    wxAuiManager:destroy(Manager),
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -134,11 +139,10 @@ handle_event(Ev = #wx{}, State) ->
     io:format("~p\n", [Ev]),
     {noreply, State}.
 
-
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/wx/examples/demo/ex_button.erl b/lib/wx/examples/demo/ex_button.erl
index 0dd0363933..41bf34e572 100644
--- a/lib/wx/examples/demo/ex_button.erl
+++ b/lib/wx/examples/demo/ex_button.erl
@@ -25,7 +25,8 @@
 -include_lib("wx/include/wx.hrl").
 
 -behaviour(wx_object).
--export([start/1, init/1, terminate/2,  code_change/3,
+-export([start/1, init/1,
+	 terminate/2,  code_change/3,
 	 handle_info/2, handle_call/3, handle_cast/2, handle_event/2]).
 
 -record(state, 
@@ -120,6 +121,7 @@ do_init(Config) ->
     wxWindow:connect(Panel, command_button_clicked),
     wxWindow:setSizer(Panel, Sz),
     wxSizer:layout(Sz),
+    wxWindow:refresh(Panel),
     wxScrolledWindow:setScrollRate(Panel, 5, 5),
     {Panel, #state{parent=Panel, config=Config}}.
 
@@ -149,6 +151,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p~n",[Msg]),
     {noreply,State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p~n",[Msg]),
     {reply,ok,State}.
@@ -160,7 +166,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%  a copy from wxwidgets samples.
diff --git a/lib/wx/examples/demo/ex_canvas.erl b/lib/wx/examples/demo/ex_canvas.erl
index 1ec4760f40..1f1d260276 100644
--- a/lib/wx/examples/demo/ex_canvas.erl
+++ b/lib/wx/examples/demo/ex_canvas.erl
@@ -140,6 +140,9 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -151,7 +154,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/wx/examples/demo/ex_canvas_paint.erl b/lib/wx/examples/demo/ex_canvas_paint.erl
index 9bc083766a..6873724655 100644
--- a/lib/wx/examples/demo/ex_canvas_paint.erl
+++ b/lib/wx/examples/demo/ex_canvas_paint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -207,6 +207,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -218,7 +222,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -239,14 +243,17 @@ draw(Canvas, Bitmap, Fun) ->
     wxMemoryDC:destroy(MemoryDC).
 
 redraw(DC, Bitmap) ->
-    MemoryDC = wxMemoryDC:new(Bitmap),
+    try
+	MemoryDC = wxMemoryDC:new(Bitmap),
 
-    wxDC:blit(DC, {0,0},
-	      {wxBitmap:getWidth(Bitmap), wxBitmap:getHeight(Bitmap)},
-	      MemoryDC, {0,0}),
-
-    wxMemoryDC:destroy(MemoryDC).
+	wxDC:blit(DC, {0,0},
+		  {wxBitmap:getWidth(Bitmap), wxBitmap:getHeight(Bitmap)},
+		  MemoryDC, {0,0}),
 
+	wxMemoryDC:destroy(MemoryDC)
+    catch error:{{badarg,_},_} -> %% Bitmap have been deleted
+	    ok
+    end.
 
-getPageInfo(_This) -> 
+getPageInfo(_This) ->
     {1,1,1,1}.
diff --git a/lib/wx/examples/demo/ex_choices.erl b/lib/wx/examples/demo/ex_choices.erl
index 2e456ae249..b4418293c1 100644
--- a/lib/wx/examples/demo/ex_choices.erl
+++ b/lib/wx/examples/demo/ex_choices.erl
@@ -143,6 +143,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error,nyi}, State}.
@@ -154,7 +158,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/wx/examples/demo/ex_cursor.erl b/lib/wx/examples/demo/ex_cursor.erl
index c1a558541b..2f1eaaf7c7 100644
--- a/lib/wx/examples/demo/ex_cursor.erl
+++ b/lib/wx/examples/demo/ex_cursor.erl
@@ -131,6 +131,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_dialogs.erl b/lib/wx/examples/demo/ex_dialogs.erl
index b39344f8b1..5c47b51271 100644
--- a/lib/wx/examples/demo/ex_dialogs.erl
+++ b/lib/wx/examples/demo/ex_dialogs.erl
@@ -149,6 +149,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_frame_utils.erl b/lib/wx/examples/demo/ex_frame_utils.erl
index a90642b355..4a59bb3a68 100644
--- a/lib/wx/examples/demo/ex_frame_utils.erl
+++ b/lib/wx/examples/demo/ex_frame_utils.erl
@@ -98,6 +98,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_gauge.erl b/lib/wx/examples/demo/ex_gauge.erl
index ffc667ff05..c53dfb807b 100644
--- a/lib/wx/examples/demo/ex_gauge.erl
+++ b/lib/wx/examples/demo/ex_gauge.erl
@@ -114,6 +114,10 @@ handle_info(pulse, State=#state{undeterminate_gauge = Gauge=#gauge{obj = Obj}})
     Timer = erlang:send_after(300, self(), pulse),
     {noreply, State#state{undeterminate_gauge = Gauge#gauge{timer = Timer}}}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply,ok, State}.
diff --git a/lib/wx/examples/demo/ex_gl.erl b/lib/wx/examples/demo/ex_gl.erl
index 72dad2cf9d..6bb2d12dff 100644
--- a/lib/wx/examples/demo/ex_gl.erl
+++ b/lib/wx/examples/demo/ex_gl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The 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,8 @@
 
 -behaviour(wx_object).
 
--export([init/1, code_change/3, handle_info/2, handle_event/2,
+-export([init/1, code_change/3, handle_info/2, 
+	 handle_sync_event/3, handle_event/2,
 	 handle_call/3, handle_cast/2, terminate/2,
 	 start/1]).
 
@@ -34,6 +35,7 @@
 	  config,
 	  gl,
 	  canvas,
+	  image, 
 	  timer,
 	  time
 	 }).
@@ -58,7 +60,7 @@ do_init(Config) ->
     %% Setup sizer
     Sizer = wxStaticBoxSizer:new(?wxHORIZONTAL, Panel, [{label, "wxGLCanvas"}]),
 
-    Opts = [{size, {300,300}}, {style, ?wxSUNKEN_BORDER}],
+    Opts = [{style, ?wxFULL_REPAINT_ON_RESIZE}],
     GLAttrib = [{attribList, [?WX_GL_RGBA,
 			      ?WX_GL_DOUBLEBUFFER,
 			      ?WX_GL_MIN_RED,8,
@@ -67,34 +69,48 @@ do_init(Config) ->
 			      ?WX_GL_DEPTH_SIZE,24,0]}],
     Canvas = wxGLCanvas:new(Panel,Opts ++ GLAttrib),
     wxGLCanvas:connect(Canvas, size),
+    wxGLCanvas:connect(Canvas, paint, [callback]),
 
-    wxGLCanvas:setCurrent(Canvas),
     Image   = wxImage:scale(wxImage:new("image.jpg"), 128,128),
-    GL = setup_gl(Canvas,Image),
-    Timer = timer:send_interval(20, self(), update),
 
     %% Add to sizers
     wxSizer:add(Sizer, Canvas, [{flag, ?wxEXPAND},{proportion, 1}]), 
     wxWindow:setSizer(Panel,Sizer),
     wxSizer:layout(Sizer),
+    Timer = timer:send_interval(20, self(), update),
     {Panel, #state{parent = Panel, config = Config,
-		   canvas = Canvas,
-		   gl = GL, timer = Timer}}.
+		   canvas = Canvas, image=Image,
+		   timer = Timer}}.
 
 %% Event handling
-handle_event(#wx{event = #wxSize{size = {W,H}}}, State) ->
-    case W =:= 0 orelse H =:= 0 of
-	true -> skip;
-	_ -> 
+handle_sync_event(_PaintEvent, _, #state{canvas=Canvas}) ->
+    %% Sync events are called from a temporary process,
+    %% we need to setup the gl canvas on cocoa for some reason
+    %% We do not really have to do anything, the timer event will refresh the painting
+    wxGLCanvas:setCurrent(Canvas),
+    DC= wxPaintDC:new(Canvas),
+    wxPaintDC:destroy(DC),
+    ok.
+
+handle_event(#wx{event = #wxSize{size = {W,H}}}, State = #state{gl=GL}) ->
+    if 
+	GL =:= undefined ->
+	    #state{canvas=Canvas, image=Image} = State,
+	    wxGLCanvas:setCurrent(Canvas),
+	    {noreply, State#state{gl=setup_gl(Canvas,Image)}};
+	W =:= 0, H =:= 0 -> {noreply, State};
+	true -> 
 	    gl:viewport(0,0,W,H),
 	    gl:matrixMode(?GL_PROJECTION),
 	    gl:loadIdentity(),
 	    gl:ortho( -2.0, 2.0, -2.0*H/W, 2.0*H/W, -20.0, 20.0),
 	    gl:matrixMode(?GL_MODELVIEW),
-	    gl:loadIdentity()
-    end,
-    {noreply, State}.
+	    gl:loadIdentity(),
+	    {noreply, State}
+    end.
 
+handle_info(update, State=#state{gl=undefined}) -> 
+    {noreply, State};
 handle_info(update, State) ->
     S1 = update_rotation(State),
     GL = S1#state.gl,
@@ -113,7 +129,13 @@ handle_info(stop, State) ->
     timer:cancel(State#state.timer),
     catch wxGLCanvas:destroy(State#state.canvas),
     {stop, normal, State}.
-    
+
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    catch wxGLCanvas:destroy(State#state.canvas),
+    timer:cancel(State#state.timer),
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     io:format("Got Call ~p~n",[Msg]),
     {reply,ok,State}.
@@ -125,11 +147,8 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, not_yet_implemented, State}.
 
-terminate(_Reason, State) ->
-    catch wxGLCanvas:destroy(State#state.canvas),
-    timer:cancel(State#state.timer),
-    timer:sleep(300).
-
+terminate(_Reason, _State) ->
+    ok.
 
 
 -define(VS, {{-0.5, -0.5, -0.5},  %1
diff --git a/lib/wx/examples/demo/ex_graphicsContext.erl b/lib/wx/examples/demo/ex_graphicsContext.erl
index c356500d99..59bfe7ff64 100644
--- a/lib/wx/examples/demo/ex_graphicsContext.erl
+++ b/lib/wx/examples/demo/ex_graphicsContext.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The 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 @@
 
 %% wx_object callbacks
 -export([init/1, terminate/2,  code_change/3,
-	 handle_info/2, handle_call/3,
-handle_cast/2, 	 handle_event/2, handle_sync_event/3]).
+	 handle_info/2, handle_call/3,handle_cast/2, 	 
+	 handle_event/2, handle_sync_event/3]).
 
 -include_lib("wx/include/wx.hrl").
 
@@ -57,11 +57,9 @@ do_init(Config) ->
 				 [{label, "wxGrapicsContext"}]),
 
     Win = wxPanel:new(Panel, []),
-    Pen = wxPen:new(),
-    Brush = wxBrush:new(?wxBLACK),
-    Font = wxFont:new(),
-    wxFont:setWeight(Font, ?wxBOLD),
-
+    Pen = ?wxBLACK_PEN,
+    Brush = wxBrush:new({30, 175, 23, 127}),
+    Font = ?wxITALIC_FONT,
     wxPanel:connect(Win, paint, [callback]),
 
     %% Add to sizers
@@ -94,6 +92,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -112,36 +114,26 @@ terminate(_Reason, _State) ->
 %% Local functions
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-draw(Win, Pen0, _Brush0, Font0) ->
+draw(Win, Pen, Brush, Font) ->
     try
 	Canvas = wxGraphicsContext:create(Win),
-	Pen    = wxGraphicsContext:createPen(Canvas, Pen0),
 	wxGraphicsContext:setPen(Canvas, Pen),
-	Brush = wxGraphicsContext:createLinearGradientBrush(Canvas, 0.0,0.0, 30.0,30.0,
-							    {200,50,50,50},
-							    {200,50,50,200}),
 	wxGraphicsContext:setBrush(Canvas, Brush),
-	Font  = wxGraphicsContext:createFont(Canvas, Font0),
-	wxGraphicsContext:setFont(Canvas, Font),
+	wxGraphicsContext:setFont(Canvas, Font, {0, 0, 50}),
 	
 	wxGraphicsContext:drawRoundedRectangle(Canvas, 35.0,35.0, 100.0, 50.0, 10.0),
-	wxGraphicsContext:drawText(Canvas, "Welcome", 60.0, 55.0),
+	wxGraphicsContext:drawText(Canvas, "This text should be antialised", 60.0, 55.0),
 	Path = wxGraphicsContext:createPath(Canvas),
 	wxGraphicsPath:addCircle(Path, 0.0, 0.0, 40.0),
 	wxGraphicsPath:closeSubpath(Path),
-	wxGraphicsContext:translate(Canvas, 100.0, 100.0),
-
-	Brush2 = wxGraphicsContext:createLinearGradientBrush(Canvas, 0.0,0.0, 30.0,30.0,
-							     {50,200,50,50},
-							     {50,50,200,50}),
-	wxGraphicsContext:setBrush(Canvas, Brush2),
+	wxGraphicsContext:translate(Canvas, 100.0, 250.0),
 	
-	F = fun(_) ->
+	F = fun(N) ->
 		    wxGraphicsContext:scale(Canvas, 1.1, 1.1),
-		    wxGraphicsContext:translate(Canvas, 3.0,3.0),
+		    wxGraphicsContext:translate(Canvas, 15.0,-1.0*N),
 		    wxGraphicsContext:drawPath(Canvas, Path)
 	    end,
-	wx:foreach(F, lists:seq(1,5)),
+	wx:foreach(F, lists:seq(1,10)),
 	ok
     catch _:{not_supported, _} ->
 	    Err = "wxGraphicsContext not available in this build of wxwidgets",
diff --git a/lib/wx/examples/demo/ex_grid.erl b/lib/wx/examples/demo/ex_grid.erl
index d1a9952ab2..e284836d5b 100644
--- a/lib/wx/examples/demo/ex_grid.erl
+++ b/lib/wx/examples/demo/ex_grid.erl
@@ -78,6 +78,10 @@ handle_event(#wx{event = #wxGrid{type = grid_cell_change,
 handle_info(_Msg, State) ->
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(_Msg, _From, State) ->
     {reply,{error, nyi}, State}.
 
diff --git a/lib/wx/examples/demo/ex_htmlWindow.erl b/lib/wx/examples/demo/ex_htmlWindow.erl
index 564c790e48..af3d4c71f5 100644
--- a/lib/wx/examples/demo/ex_htmlWindow.erl
+++ b/lib/wx/examples/demo/ex_htmlWindow.erl
@@ -77,6 +77,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_listCtrl.erl b/lib/wx/examples/demo/ex_listCtrl.erl
index 13096dfa52..2c62ac9d5f 100644
--- a/lib/wx/examples/demo/ex_listCtrl.erl
+++ b/lib/wx/examples/demo/ex_listCtrl.erl
@@ -58,8 +58,8 @@ do_init(Config) ->
     IL = wxImageList:new(16,16),
     wxImageList:add(IL, wxArtProvider:getBitmap("wxART_COPY", [{size, {16,16}}])),
     wxImageList:add(IL, wxArtProvider:getBitmap("wxART_MISSING_IMAGE", [{size, {16,16}}])),
-    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_TICK_MARK", [{size, {16,16}}])),
-    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_CROSS_MARK", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_QUESTION", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_WARNING", [{size, {16,16}}])),
     wxListCtrl:assignImageList(ListCtrl2, IL, ?wxIMAGE_LIST_SMALL),
     Fun =
 	fun(Item) ->
@@ -143,6 +143,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply,State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply,ok,State}.
diff --git a/lib/wx/examples/demo/ex_notebook.erl b/lib/wx/examples/demo/ex_notebook.erl
index fc38fdae08..5edcc65082 100644
--- a/lib/wx/examples/demo/ex_notebook.erl
+++ b/lib/wx/examples/demo/ex_notebook.erl
@@ -129,6 +129,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply,State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply,ok,State}.
diff --git a/lib/wx/examples/demo/ex_pickers.erl b/lib/wx/examples/demo/ex_pickers.erl
index 8013a5ba32..54f8c7a8e5 100644
--- a/lib/wx/examples/demo/ex_pickers.erl
+++ b/lib/wx/examples/demo/ex_pickers.erl
@@ -120,6 +120,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_popupMenu.erl b/lib/wx/examples/demo/ex_popupMenu.erl
index d6778c5dc5..f48b00963d 100644
--- a/lib/wx/examples/demo/ex_popupMenu.erl
+++ b/lib/wx/examples/demo/ex_popupMenu.erl
@@ -86,6 +86,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_radioBox.erl b/lib/wx/examples/demo/ex_radioBox.erl
index ab7685f41f..17a11d1054 100644
--- a/lib/wx/examples/demo/ex_radioBox.erl
+++ b/lib/wx/examples/demo/ex_radioBox.erl
@@ -103,6 +103,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_sashWindow.erl b/lib/wx/examples/demo/ex_sashWindow.erl
index d8a8958f28..9eb3b9b27e 100644
--- a/lib/wx/examples/demo/ex_sashWindow.erl
+++ b/lib/wx/examples/demo/ex_sashWindow.erl
@@ -112,6 +112,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_sizers.erl b/lib/wx/examples/demo/ex_sizers.erl
index 7b9e8eb37f..ecd539cd62 100644
--- a/lib/wx/examples/demo/ex_sizers.erl
+++ b/lib/wx/examples/demo/ex_sizers.erl
@@ -97,6 +97,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_slider.erl b/lib/wx/examples/demo/ex_slider.erl
index 612543ff26..4979e8b4f4 100644
--- a/lib/wx/examples/demo/ex_slider.erl
+++ b/lib/wx/examples/demo/ex_slider.erl
@@ -97,6 +97,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error, nyi},State}.
diff --git a/lib/wx/examples/demo/ex_splitterWindow.erl b/lib/wx/examples/demo/ex_splitterWindow.erl
index 4f25b73293..ac2fbe0113 100644
--- a/lib/wx/examples/demo/ex_splitterWindow.erl
+++ b/lib/wx/examples/demo/ex_splitterWindow.erl
@@ -86,6 +86,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_static.erl b/lib/wx/examples/demo/ex_static.erl
index 013bd5ac35..8cf477b55a 100644
--- a/lib/wx/examples/demo/ex_static.erl
+++ b/lib/wx/examples/demo/ex_static.erl
@@ -101,6 +101,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_textCtrl.erl b/lib/wx/examples/demo/ex_textCtrl.erl
index d82884f30b..57088ad878 100644
--- a/lib/wx/examples/demo/ex_textCtrl.erl
+++ b/lib/wx/examples/demo/ex_textCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -51,27 +51,23 @@ do_init(Config) ->
     Sizer3 = wxStaticBoxSizer:new(?wxVERTICAL, Panel, 
 				  [{label, "wxTextCtrl multiline"}]),
 
-    TextCtrl = wxTextCtrl:new(Panel, 1, [{value, "This is a single line wxTextCtrl"},
+    TextCtrl  = wxTextCtrl:new(Panel, 1, [{value, "This is a single line wxTextCtrl"},
 					 {style, ?wxDEFAULT}]),
     TextCtrl2 = wxTextCtrl:new(Panel, 2, [{value, "password"},
-					 {style, ?wxDEFAULT bor
-					   	  ?wxTE_PASSWORD}]),
-    TextCtrl3 = wxTextCtrl:new(Panel, 3, [{value, "This is a\n"
-					   	  "multiline\n"
-					   	  "wxTextCtrl"},
-					 {style, ?wxDEFAULT bor
-					   	  ?wxTE_MULTILINE}]),
+					  {style, ?wxDEFAULT bor ?wxTE_PASSWORD}]),
+    TextCtrl3 = wxTextCtrl:new(Panel, 3, [{value, "This is a\nmultiline\nwxTextCtrl"},
+					  {style, ?wxDEFAULT bor ?wxTE_MULTILINE}]),
 
     %% Add to sizers
-    wxSizer:add(Sizer, TextCtrl, [{flag, ?wxEXPAND}]),
+    wxSizer:add(Sizer, TextCtrl,  [{flag, ?wxEXPAND}]),
     wxSizer:add(Sizer2, TextCtrl2, []),
-    wxSizer:add(Sizer3, TextCtrl3, [{flag, ?wxEXPAND}]),
+    wxSizer:add(Sizer3, TextCtrl3, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
     wxSizer:add(MainSizer, Sizer,  [{flag, ?wxEXPAND}]),
     wxSizer:addSpacer(MainSizer, 10),
     wxSizer:add(MainSizer, Sizer2, [{flag, ?wxEXPAND}]),
     wxSizer:addSpacer(MainSizer, 10),
-    wxSizer:add(MainSizer, Sizer3, [{flag, ?wxEXPAND}]),
+    wxSizer:add(MainSizer, Sizer3, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
     wxPanel:setSizer(Panel, MainSizer),
     {Panel, #state{parent=Panel, config=Config}}.
@@ -88,6 +84,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error,nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_treeCtrl.erl b/lib/wx/examples/demo/ex_treeCtrl.erl
index 611904500a..7698ab1f00 100644
--- a/lib/wx/examples/demo/ex_treeCtrl.erl
+++ b/lib/wx/examples/demo/ex_treeCtrl.erl
@@ -105,6 +105,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/simple/menu.erl b/lib/wx/examples/simple/menu.erl
index 0025a0b027..9e6b28b46b 100644
--- a/lib/wx/examples/simple/menu.erl
+++ b/lib/wx/examples/simple/menu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -105,7 +105,7 @@ create_frame(Wx) ->
     Frame = wxFrame:new(Wx, -1, "wxErlang menu sample", [{size, {600,400}}]),
 
     Path = filename:dirname(code:which(?MODULE)),    
-    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"))),
+    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"), [{type, ?wxBITMAP_TYPE_XPM}])),
 
     wxFrame:createStatusBar(Frame,[]),
     wxFrame:connect(Frame, close_window),
diff --git a/lib/wx/examples/simple/minimal.erl b/lib/wx/examples/simple/minimal.erl
index bdff66e217..4782745dfc 100644
--- a/lib/wx/examples/simple/minimal.erl
+++ b/lib/wx/examples/simple/minimal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The 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,8 @@ start() ->
 create_window(Wx) ->
     Frame = wxFrame:new(Wx, -1, "Minimal wxErlang App", [{size, {600,400}}]),
 
-    Path = filename:dirname(code:which(?MODULE)),    
-    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"))),
+    Path = filename:dirname(code:which(?MODULE)),
+    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"), [{type, ?wxBITMAP_TYPE_XPM}])),
 
     wxFrame:createStatusBar(Frame,[]),
     wxFrame:connect(Frame, close_window),
diff --git a/lib/wx/examples/sudoku/sudoku_board.erl b/lib/wx/examples/sudoku/sudoku_board.erl
index 4b26ff97da..ed9c62b7c8 100644
--- a/lib/wx/examples/sudoku/sudoku_board.erl
+++ b/lib/wx/examples/sudoku/sudoku_board.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The 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,7 +27,7 @@
 -export([new/1, setup_board/2, clear_board/1, left/1,
 	 get_board_data/1,set_board_data/2, 
 	 set_butt/3, butt_correct/3,
-	 draw/3, 
+	 get_state/1, redraw/3,
 	 %% Callbacks
 	 init/1, handle_sync_event/3, 
 	 handle_event/2, handle_info/2, handle_call/3, handle_cast/2,
@@ -69,9 +69,8 @@ get_board_data(Board) ->
 set_board_data(Board, List) ->
     wx_object:call(Board, {set_board_data, List}).
 
-
-draw(Board, DC, Size) ->
-    wx_object:call(Board, {draw, DC, Size}).
+get_state(Board) ->
+    wx_object:call(Board, get_state).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -85,26 +84,29 @@ init([ParentObj, ParentPid]) ->
     wxWindow:connect(Win, erase_background, []),
     wxWindow:connect(Win, key_up, [{skip, true}]),
     wxWindow:connect(Win, left_down, [{skip, true}]),
-    wxWindow:connect(Win, enter_window, [{skip, true}]), 
+    wxWindow:connect(Win, enter_window, [{skip, true}]),
 
     %% Init pens and fonts
     Pen = wxPen:new({0,0,0}, [{width, 3}]),
     Fs0  = [{Sz,wxFont:new(Sz, ?wxSWISS, ?wxNORMAL, ?wxNORMAL,[])} ||
 	       Sz <- [8,9,10,11,12,13,14,16,18,20,22,24,26,28,30,34,38,42,44,46]],
-    TestDC  = wxClientDC:new(Win),
+    TestDC  = wxMemoryDC:new(),
+    Bitmap = wxBitmap:new(256,256),
+    wxMemoryDC:selectObject(TestDC, Bitmap),
+    true = wxDC:isOk(TestDC),
     CW = fun({Sz,Font},Acc) ->
 		 case wxFont:ok(Font) of
-		     true -> 
+		     true ->
 			 wxDC:setFont(TestDC, Font),
-			 CH = wxDC:getCharHeight(TestDC), 
+			 CH = wxDC:getCharHeight(TestDC),
 			 [{CH,Sz,Font} | Acc];
 		     false ->
 			 Acc
 		 end
 	 end,
     Fs = lists:foldl(CW, [], Fs0),
-    wxClientDC:destroy(TestDC),    
-    {Win, #state{win=Win, board=[], pen=Pen, fonts=Fs, parent=ParentPid}}.
+    wxMemoryDC:destroy(TestDC),
+    {Win, #state{win=Win, board=[], pen=Pen, fonts=Fs,parent=ParentPid}}.
 
 handle_sync_event(#wx{event=#wxPaint{}}, _Obj, State = #state{win=Win}) ->
     %% io:format("EPaint~n",[]),
@@ -119,22 +121,17 @@ handle_sync_event(#wx{event=#wxPaint{}}, _Obj, State = #state{win=Win}) ->
 handle_event(#wx{event=#wxMouse{type=enter_window}}, State = #state{win=Win}) ->
     wxWindow:setFocus(Win), %% Get keyboard focus
     {noreply,State};
-handle_event(#wx{event=#wxKey{keyCode=KeyC, x=X,y=Y}},
+handle_event(#wx{event=#wxKey{keyCode=KeyC}},
 	     S = #state{parent=Pid, win=Win}) ->
     Val = if KeyC > 47, KeyC < 58 -> KeyC - $0;
 	     KeyC > 325, KeyC < 336 -> KeyC - 326; %% NUM LOCK
 	     true -> 0
 	  end,    
-    case get_butt(X,Y,S) of
-	error ->   %% Mac don't get correct coordinates.
-	    Global = wx_misc:getMousePosition(),
-	    {CX,CY} = wxWindow:screenToClient(Win, Global),
-	    case get_butt(CX,CY,S) of 
-		error -> ignore;
-		Id -> Pid ! {set_val,Id,Val}
-	    end;
-	Id -> 
-	    Pid ! {set_val,Id,Val} 
+    Global = wx_misc:getMousePosition(),
+    {CX,CY} = wxWindow:screenToClient(Win, Global),
+    case get_butt(CX,CY,S) of
+	error -> ignore;
+	Id -> Pid ! {set_val,Id,Val}
     end,
     {noreply, S};
 handle_event(#wx{event=#wxMouse{type=left_down,x=X,y=Y}},
@@ -205,9 +202,8 @@ handle_call({set_board_data, B},_From, S0) ->
 handle_call(left,_From, S = #state{board=B}) ->
     Res = 81 - length([ok || #sq{correct=C} <- B, C /= false]),
     {reply, Res, S};
-handle_call({draw, DC, Size},_From, S) ->    
-    redraw(DC,Size,S),
-    {reply, ok, S}.
+handle_call(get_state, _From, S) ->
+    {reply, {ok,S}, S}.
 
 handle_cast(Msg, State) ->
     io:format("Got cast ~p~n",[Msg]),
diff --git a/lib/wx/examples/sudoku/sudoku_gui.erl b/lib/wx/examples/sudoku/sudoku_gui.erl
index 3d0c95ffa7..5f3f1a2621 100644
--- a/lib/wx/examples/sudoku/sudoku_gui.erl
+++ b/lib/wx/examples/sudoku/sudoku_gui.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -307,19 +307,19 @@ dialog(?PRINT_PAGE_SETUP, S = #gs{frame=Frame, print_psdd=PsDD0, print_d=PD0}) -
     wxPageSetupDialogData:destroy(PsDD0),
     wxPrintData:destroy(PD0),
     S#gs{print_psdd=PsDD, print_d=PD};
-dialog(?PRINT_PRE, S = #gs{frame=Frame, print_d=PD}) ->    
+dialog(?PRINT_PRE, S = #gs{frame=Frame, print_d=PD, board=Board}) ->
+    {ok, BoardS} = sudoku_board:get_state(Board),
     PDD = wxPrintDialogData:new(PD),
-    Printout1 = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,S) end,
+    Printout1 = wxPrintout:new("Print 1", fun(This,Page) -> printout(This,Page,BoardS, S) end,
 			       [{getPageInfo, fun getPageInfo/1}]),
-    Printout2 = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,S) end,
+    Printout2 = wxPrintout:new("Print 2", fun(This,Page) -> printout(This,Page,BoardS, S) end,
 			       [{getPageInfo, fun getPageInfo/1}]),
-    Preview = wxPrintPreview:new(Printout1, [{printoutForPrinting,Printout2},{data,PDD}]), 
+    Preview = wxPrintPreview:new(Printout1, [{printoutForPrinting,Printout2},{data,PDD}]),
     case wxPrintPreview:isOk(Preview) of
 	true ->
 	    PF = wxPreviewFrame:new(Preview, Frame, [{title, "Print Preview"}]),
 	    wxPreviewFrame:centre(PF, [{dir, ?wxBOTH}]),
 	    wxPreviewFrame:initialize(PF),
-	    wxPreviewFrame:centre(PF),
 	    wxPreviewFrame:show(PF);
 	false ->
 	    io:format("Could not create preview window.\n"
@@ -327,10 +327,11 @@ dialog(?PRINT_PRE, S = #gs{frame=Frame, print_d=PD}) ->
 	    wxPrintPreview:destroy(Preview)
     end,
     S;
-dialog(?PRINT, S = #gs{frame=Frame, print_d=PD}) ->    
+dialog(?PRINT, S = #gs{frame=Frame, print_d=PD, board=Board}) ->
+    {ok, BoardS} = sudoku_board:get_state(Board),
     PDD = wxPrintDialogData:new(PD),
     Printer = wxPrinter:new([{data,PDD}]),
-    Printout = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,S) end,
+    Printout = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,BoardS,S) end,
 			      [{getPageInfo, fun getPageInfo/1}]),
 
     case wxPrinter:print(Printer, Frame, Printout, [{prompt,true}]) of
@@ -374,16 +375,14 @@ init_printer(S) ->
 getPageInfo(_This) -> 
     {1,1,1,1}.
 
-printout(This, _Page, #gs{board=Board, print_psdd=PsDD}) ->
+printout(This, _Page, Board, #gs{print_psdd=PsDD}) ->
     MX = MY = 500,  
     wxPrintout:fitThisSizeToPageMargins(This, {MX,MY}, PsDD),
-    
+
     _DBG = {_X,_Y,W,H} = wxPrintout:getLogicalPageMarginsRect(This, PsDD),
     wxPrintout:offsetLogicalOrigin(This,(W-MX) div 2, (H-MY) div 2),
-%%    io:format("~p ->{~p,~p} ~n", [_DBG, (W-MX) div 2, (H-MY) div 2]),
-
     DC = wxPrintout:getDC(This),
-    sudoku_board:draw(Board, DC, {500,500}),
+    sudoku_board:redraw(DC, {500,500}, Board),
     true.
 
 set_val(Id, Val, Board, G) ->
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index 62979908a6..a48c756dea 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -131,7 +131,7 @@
 -type wxScrollWin() :: #wxScrollWin{}. %% Callback event: {@link wxScrollWinEvent}
 
 -record(wxPaint, {type :: wxPaintEventType()}). %% Callback event: {@link wxPaintEvent}
--type wxPaintEventType() :: paint | paint_icon.
+-type wxPaintEventType() :: paint.
 -type wxPaint() :: #wxPaint{}. %% Callback event: {@link wxPaintEvent}
 
 -record(wxChildFocus, {type :: wxChildFocusEventType()}). %% Callback event: {@link wxChildFocusEvent}
@@ -252,7 +252,7 @@
 	wheelRotation :: integer(),
 	wheelDelta :: integer(),
 	linesPerAction :: integer()}).
--type wxMouseEventType() :: left_down | left_up | middle_down | middle_up | right_down | right_up | motion | enter_window | leave_window | left_dclick | middle_dclick | right_dclick | mousewheel | nc_left_down | nc_left_up | nc_middle_down | nc_middle_up | nc_right_down | nc_right_up | nc_motion | nc_enter_window | nc_leave_window | nc_left_dclick | nc_middle_dclick | nc_right_dclick.
+-type wxMouseEventType() :: left_down | left_up | middle_down | middle_up | right_down | right_up | motion | enter_window | leave_window | left_dclick | middle_dclick | right_dclick | mousewheel.
 -type wxMouse() :: #wxMouse{}. %% Callback event: {@link wxMouseEvent}
 
 -record(wxWindowCreate, {type :: wxWindowCreateEventType()}). %% Callback event: {@link wxWindowCreateEvent}
@@ -292,10 +292,6 @@
 -type wxIdleEventType() :: idle.
 -type wxIdle() :: #wxIdle{}. %% Callback event: {@link wxIdleEvent}
 
--record(wxNcPaint, {type :: wxNcPaintEventType()}). %% Callback event: {@link wxNcPaintEvent}
--type wxNcPaintEventType() :: nc_paint.
--type wxNcPaint() :: #wxNcPaint{}. %% Callback event: {@link wxNcPaintEvent}
-
 -record(wxColourPicker,{type :: wxColourPickerEventType(), %% Callback event: {@link wxColourPickerEvent}
 	colour :: wx:wx_colour()}).
 -type wxColourPickerEventType() :: command_colourpicker_changed.
@@ -312,8 +308,8 @@
 -type wxTreeEventType() :: command_tree_begin_drag | command_tree_begin_rdrag | command_tree_begin_label_edit | command_tree_end_label_edit | command_tree_delete_item | command_tree_get_info | command_tree_set_info | command_tree_item_expanded | command_tree_item_expanding | command_tree_item_collapsed | command_tree_item_collapsing | command_tree_sel_changed | command_tree_sel_changing | command_tree_key_down | command_tree_item_activated | command_tree_item_right_click | command_tree_item_middle_click | command_tree_end_drag | command_tree_state_image_click | command_tree_item_gettooltip | command_tree_item_menu.
 -type wxTree() :: #wxTree{}. %% Callback event: {@link wxTreeEvent}
 
--type event() :: wxAuiManager() | wxAuiNotebook() | wxCalendar() | wxChildFocus() | wxClose() | wxColourPicker() | wxCommand() | wxContextMenu() | wxDate() | wxDisplayChanged() | wxErase() | wxFileDirPicker() | wxFocus() | wxFontPicker() | wxGrid() | wxHelp() | wxHtmlLink() | wxIconize() | wxIdle() | wxJoystick() | wxKey() | wxList() | wxMaximize() | wxMenu() | wxMouse() | wxMouseCaptureChanged() | wxMove() | wxNavigationKey() | wxNcPaint() | wxNotebook() | wxPaint() | wxPaletteChanged() | wxQueryNewPalette() | wxSash() | wxScroll() | wxScrollWin() | wxSetCursor() | wxShow() | wxSize() | wxSpin() | wxSplitter() | wxStyledText() | wxSysColourChanged() | wxTaskBarIcon() | wxTree() | wxUpdateUI() | wxWindowCreate() | wxWindowDestroy().
--type wxEventType() :: wxAuiManagerEventType() | wxAuiNotebookEventType() | wxCalendarEventType() | wxChildFocusEventType() | wxCloseEventType() | wxColourPickerEventType() | wxCommandEventType() | wxContextMenuEventType() | wxDateEventType() | wxDisplayChangedEventType() | wxEraseEventType() | wxFileDirPickerEventType() | wxFocusEventType() | wxFontPickerEventType() | wxGridEventType() | wxHelpEventType() | wxHtmlLinkEventType() | wxIconizeEventType() | wxIdleEventType() | wxJoystickEventType() | wxKeyEventType() | wxListEventType() | wxMaximizeEventType() | wxMenuEventType() | wxMouseCaptureChangedEventType() | wxMouseEventType() | wxMoveEventType() | wxNavigationKeyEventType() | wxNcPaintEventType() | wxNotebookEventType() | wxPaintEventType() | wxPaletteChangedEventType() | wxQueryNewPaletteEventType() | wxSashEventType() | wxScrollEventType() | wxScrollWinEventType() | wxSetCursorEventType() | wxShowEventType() | wxSizeEventType() | wxSpinEventType() | wxSplitterEventType() | wxStyledTextEventType() | wxSysColourChangedEventType() | wxTaskBarIconEventType() | wxTreeEventType() | wxUpdateUIEventType() | wxWindowCreateEventType() | wxWindowDestroyEventType().
+-type event() :: wxAuiManager() | wxAuiNotebook() | wxCalendar() | wxChildFocus() | wxClose() | wxColourPicker() | wxCommand() | wxContextMenu() | wxDate() | wxDisplayChanged() | wxErase() | wxFileDirPicker() | wxFocus() | wxFontPicker() | wxGrid() | wxHelp() | wxHtmlLink() | wxIconize() | wxIdle() | wxJoystick() | wxKey() | wxList() | wxMaximize() | wxMenu() | wxMouse() | wxMouseCaptureChanged() | wxMove() | wxNavigationKey() | wxNotebook() | wxPaint() | wxPaletteChanged() | wxQueryNewPalette() | wxSash() | wxScroll() | wxScrollWin() | wxSetCursor() | wxShow() | wxSize() | wxSpin() | wxSplitter() | wxStyledText() | wxSysColourChanged() | wxTaskBarIcon() | wxTree() | wxUpdateUI() | wxWindowCreate() | wxWindowDestroy().
+-type wxEventType() :: wxAuiManagerEventType() | wxAuiNotebookEventType() | wxCalendarEventType() | wxChildFocusEventType() | wxCloseEventType() | wxColourPickerEventType() | wxCommandEventType() | wxContextMenuEventType() | wxDateEventType() | wxDisplayChangedEventType() | wxEraseEventType() | wxFileDirPickerEventType() | wxFocusEventType() | wxFontPickerEventType() | wxGridEventType() | wxHelpEventType() | wxHtmlLinkEventType() | wxIconizeEventType() | wxIdleEventType() | wxJoystickEventType() | wxKeyEventType() | wxListEventType() | wxMaximizeEventType() | wxMenuEventType() | wxMouseCaptureChangedEventType() | wxMouseEventType() | wxMoveEventType() | wxNavigationKeyEventType() | wxNotebookEventType() | wxPaintEventType() | wxPaletteChangedEventType() | wxQueryNewPaletteEventType() | wxSashEventType() | wxScrollEventType() | wxScrollWinEventType() | wxSetCursorEventType() | wxShowEventType() | wxSizeEventType() | wxSpinEventType() | wxSplitterEventType() | wxStyledTextEventType() | wxSysColourChangedEventType() | wxTaskBarIconEventType() | wxTreeEventType() | wxUpdateUIEventType() | wxWindowCreateEventType() | wxWindowDestroyEventType().
 
 %% Hardcoded Records
 -record(wxMouseState, {x :: integer(), y :: integer(),
@@ -420,78 +416,78 @@
 -define(wxDateTime_Country_Unknown, 0).
 -define(wxDateTime_Country_Default, 1).
 -define(wxDateTime_Country_WesternEurope_Start, 2).
--define(wxDateTime_Country_EEC, ?Country_WesternEurope_Start).
--define(wxDateTime_France, (?Country_WesternEurope_Start+1)).
--define(wxDateTime_Germany, (?Country_WesternEurope_Start+2)).
--define(wxDateTime_UK, (?Country_WesternEurope_Start+3)).
--define(wxDateTime_Country_WesternEurope_End, ?UK).
--define(wxDateTime_Russia, (?UK+1)).
--define(wxDateTime_USA, (?UK+2)).
+-define(wxDateTime_Country_EEC, ?wxDateTime_Country_WesternEurope_Start).
+-define(wxDateTime_France, (?wxDateTime_Country_WesternEurope_Start+1)).
+-define(wxDateTime_Germany, (?wxDateTime_Country_WesternEurope_Start+2)).
+-define(wxDateTime_UK, (?wxDateTime_Country_WesternEurope_Start+3)).
+-define(wxDateTime_Country_WesternEurope_End, ?wxDateTime_UK).
+-define(wxDateTime_Russia, (?wxDateTime_UK+1)).
+-define(wxDateTime_USA, (?wxDateTime_UK+2)).
 % From class wxDateTime::GregorianAdoption
 -define(wxDateTime_Gr_Unknown, 0).
 -define(wxDateTime_Gr_Standard, 1).
 -define(wxDateTime_Gr_Alaska, 2).
 -define(wxDateTime_Gr_Albania, 3).
--define(wxDateTime_Gr_Austria, ?Gr_Unknown).
--define(wxDateTime_Gr_Austria_Brixen, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Austria_Salzburg, ?Gr_Austria_Brixen).
--define(wxDateTime_Gr_Austria_Tyrol, ?Gr_Austria_Brixen).
--define(wxDateTime_Gr_Austria_Carinthia, (?Gr_Austria_Brixen+1)).
--define(wxDateTime_Gr_Austria_Styria, ?Gr_Austria_Carinthia).
--define(wxDateTime_Gr_Belgium, (?Gr_Austria_Carinthia+1)).
--define(wxDateTime_Gr_Bulgaria, ?Gr_Unknown).
--define(wxDateTime_Gr_Bulgaria_1, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Bulgaria_2, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Bulgaria_3, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_Canada, ?Gr_Unknown).
--define(wxDateTime_Gr_China, ?Gr_Unknown).
--define(wxDateTime_Gr_China_1, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_China_2, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Czechoslovakia, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_Denmark, (?Gr_Unknown+4)).
--define(wxDateTime_Gr_Egypt, (?Gr_Unknown+5)).
--define(wxDateTime_Gr_Estonia, (?Gr_Unknown+6)).
--define(wxDateTime_Gr_Finland, (?Gr_Unknown+7)).
--define(wxDateTime_Gr_France, (?Gr_Unknown+8)).
--define(wxDateTime_Gr_France_Alsace, (?Gr_Unknown+9)).
--define(wxDateTime_Gr_France_Lorraine, (?Gr_Unknown+10)).
--define(wxDateTime_Gr_France_Strasbourg, (?Gr_Unknown+11)).
--define(wxDateTime_Gr_Germany, ?Gr_Unknown).
--define(wxDateTime_Gr_Germany_Catholic, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Germany_Prussia, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Germany_Protestant, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_GreatBritain, (?Gr_Unknown+4)).
--define(wxDateTime_Gr_Greece, (?Gr_Unknown+5)).
--define(wxDateTime_Gr_Hungary, (?Gr_Unknown+6)).
--define(wxDateTime_Gr_Ireland, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Italy, ?Gr_Standard).
--define(wxDateTime_Gr_Japan, ?Gr_Unknown).
--define(wxDateTime_Gr_Japan_1, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Japan_2, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Japan_3, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_Latvia, (?Gr_Unknown+4)).
--define(wxDateTime_Gr_Lithuania, (?Gr_Unknown+5)).
--define(wxDateTime_Gr_Luxemburg, (?Gr_Unknown+6)).
--define(wxDateTime_Gr_Netherlands, ?Gr_Belgium).
--define(wxDateTime_Gr_Netherlands_Groningen, (?Gr_Belgium+1)).
--define(wxDateTime_Gr_Netherlands_Gelderland, (?Gr_Belgium+2)).
--define(wxDateTime_Gr_Netherlands_Utrecht, (?Gr_Belgium+3)).
--define(wxDateTime_Gr_Netherlands_Friesland, (?Gr_Belgium+4)).
--define(wxDateTime_Gr_Norway, ?Gr_Denmark).
--define(wxDateTime_Gr_Poland, ?Gr_Standard).
--define(wxDateTime_Gr_Portugal, ?Gr_Standard).
--define(wxDateTime_Gr_Romania, (?Gr_Standard+1)).
--define(wxDateTime_Gr_Russia, (?Gr_Standard+2)).
--define(wxDateTime_Gr_Scotland, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Spain, ?Gr_Standard).
--define(wxDateTime_Gr_Sweden, ?Gr_Finland).
--define(wxDateTime_Gr_Switzerland, ?Gr_Unknown).
--define(wxDateTime_Gr_Switzerland_Catholic, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Switzerland_Protestant, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Turkey, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_USA, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Wales, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Yugoslavia, (?Gr_GreatBritain+1)).
+-define(wxDateTime_Gr_Austria, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Austria_Brixen, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Austria_Salzburg, ?wxDateTime_Gr_Austria_Brixen).
+-define(wxDateTime_Gr_Austria_Tyrol, ?wxDateTime_Gr_Austria_Brixen).
+-define(wxDateTime_Gr_Austria_Carinthia, (?wxDateTime_Gr_Austria_Brixen+1)).
+-define(wxDateTime_Gr_Austria_Styria, ?wxDateTime_Gr_Austria_Carinthia).
+-define(wxDateTime_Gr_Belgium, (?wxDateTime_Gr_Austria_Carinthia+1)).
+-define(wxDateTime_Gr_Bulgaria, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Bulgaria_1, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Bulgaria_2, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Bulgaria_3, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_Canada, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_China, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_China_1, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_China_2, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Czechoslovakia, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_Denmark, (?wxDateTime_Gr_Unknown+4)).
+-define(wxDateTime_Gr_Egypt, (?wxDateTime_Gr_Unknown+5)).
+-define(wxDateTime_Gr_Estonia, (?wxDateTime_Gr_Unknown+6)).
+-define(wxDateTime_Gr_Finland, (?wxDateTime_Gr_Unknown+7)).
+-define(wxDateTime_Gr_France, (?wxDateTime_Gr_Unknown+8)).
+-define(wxDateTime_Gr_France_Alsace, (?wxDateTime_Gr_Unknown+9)).
+-define(wxDateTime_Gr_France_Lorraine, (?wxDateTime_Gr_Unknown+10)).
+-define(wxDateTime_Gr_France_Strasbourg, (?wxDateTime_Gr_Unknown+11)).
+-define(wxDateTime_Gr_Germany, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Germany_Catholic, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Germany_Prussia, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Germany_Protestant, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_GreatBritain, (?wxDateTime_Gr_Unknown+4)).
+-define(wxDateTime_Gr_Greece, (?wxDateTime_Gr_Unknown+5)).
+-define(wxDateTime_Gr_Hungary, (?wxDateTime_Gr_Unknown+6)).
+-define(wxDateTime_Gr_Ireland, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Italy, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Japan, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Japan_1, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Japan_2, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Japan_3, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_Latvia, (?wxDateTime_Gr_Unknown+4)).
+-define(wxDateTime_Gr_Lithuania, (?wxDateTime_Gr_Unknown+5)).
+-define(wxDateTime_Gr_Luxemburg, (?wxDateTime_Gr_Unknown+6)).
+-define(wxDateTime_Gr_Netherlands, ?wxDateTime_Gr_Belgium).
+-define(wxDateTime_Gr_Netherlands_Groningen, (?wxDateTime_Gr_Belgium+1)).
+-define(wxDateTime_Gr_Netherlands_Gelderland, (?wxDateTime_Gr_Belgium+2)).
+-define(wxDateTime_Gr_Netherlands_Utrecht, (?wxDateTime_Gr_Belgium+3)).
+-define(wxDateTime_Gr_Netherlands_Friesland, (?wxDateTime_Gr_Belgium+4)).
+-define(wxDateTime_Gr_Norway, ?wxDateTime_Gr_Denmark).
+-define(wxDateTime_Gr_Poland, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Portugal, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Romania, (?wxDateTime_Gr_Standard+1)).
+-define(wxDateTime_Gr_Russia, (?wxDateTime_Gr_Standard+2)).
+-define(wxDateTime_Gr_Scotland, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Spain, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Sweden, ?wxDateTime_Gr_Finland).
+-define(wxDateTime_Gr_Switzerland, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Switzerland_Catholic, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Switzerland_Protestant, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Turkey, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_USA, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Wales, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Yugoslavia, (?wxDateTime_Gr_GreatBritain+1)).
 % From class wxDateTime::Month
 -define(wxDateTime_Jan, 0).
 -define(wxDateTime_Feb, 1).
@@ -537,34 +533,34 @@
 -define(wxDateTime_GMT11, 24).
 -define(wxDateTime_GMT12, 25).
 -define(wxDateTime_GMT13, 26).
--define(wxDateTime_WET, ?GMT0).
--define(wxDateTime_WEST, ?GMT1).
--define(wxDateTime_CET, ?GMT1).
--define(wxDateTime_CEST, ?GMT2).
--define(wxDateTime_EET, ?GMT2).
--define(wxDateTime_EEST, ?GMT3).
--define(wxDateTime_MSK, ?GMT3).
--define(wxDateTime_MSD, ?GMT4).
--define(wxDateTime_AST, ?GMT_4).
--define(wxDateTime_ADT, ?GMT_3).
--define(wxDateTime_EST, ?GMT_5).
--define(wxDateTime_EDT, ?GMT_4).
--define(wxDateTime_CST, ?GMT_6).
--define(wxDateTime_CDT, ?GMT_5).
--define(wxDateTime_MST, ?GMT_7).
--define(wxDateTime_MDT, ?GMT_6).
--define(wxDateTime_PST, ?GMT_8).
--define(wxDateTime_PDT, ?GMT_7).
--define(wxDateTime_HST, ?GMT_10).
--define(wxDateTime_AKST, ?GMT_9).
--define(wxDateTime_AKDT, ?GMT_8).
--define(wxDateTime_A_WST, ?GMT8).
--define(wxDateTime_A_CST, ?GMT13+1).
--define(wxDateTime_A_EST, ?GMT10).
--define(wxDateTime_A_ESST, ?GMT11).
--define(wxDateTime_NZST, ?GMT12).
--define(wxDateTime_NZDT, ?GMT13).
--define(wxDateTime_UTC, ?GMT0).
+-define(wxDateTime_WET, ?wxDateTime_GMT0).
+-define(wxDateTime_WEST, ?wxDateTime_GMT1).
+-define(wxDateTime_CET, ?wxDateTime_GMT1).
+-define(wxDateTime_CEST, ?wxDateTime_GMT2).
+-define(wxDateTime_EET, ?wxDateTime_GMT2).
+-define(wxDateTime_EEST, ?wxDateTime_GMT3).
+-define(wxDateTime_MSK, ?wxDateTime_GMT3).
+-define(wxDateTime_MSD, ?wxDateTime_GMT4).
+-define(wxDateTime_AST, ?wxDateTime_GMT_4).
+-define(wxDateTime_ADT, ?wxDateTime_GMT_3).
+-define(wxDateTime_EST, ?wxDateTime_GMT_5).
+-define(wxDateTime_EDT, ?wxDateTime_GMT_4).
+-define(wxDateTime_CST, ?wxDateTime_GMT_6).
+-define(wxDateTime_CDT, ?wxDateTime_GMT_5).
+-define(wxDateTime_MST, ?wxDateTime_GMT_7).
+-define(wxDateTime_MDT, ?wxDateTime_GMT_6).
+-define(wxDateTime_PST, ?wxDateTime_GMT_8).
+-define(wxDateTime_PDT, ?wxDateTime_GMT_7).
+-define(wxDateTime_HST, ?wxDateTime_GMT_10).
+-define(wxDateTime_AKST, ?wxDateTime_GMT_9).
+-define(wxDateTime_AKDT, ?wxDateTime_GMT_8).
+-define(wxDateTime_A_WST, ?wxDateTime_GMT8).
+-define(wxDateTime_A_CST, (?wxDateTime_GMT13+1)).
+-define(wxDateTime_A_EST, ?wxDateTime_GMT10).
+-define(wxDateTime_A_ESST, ?wxDateTime_GMT11).
+-define(wxDateTime_NZST, ?wxDateTime_GMT12).
+-define(wxDateTime_NZDT, ?wxDateTime_GMT13).
+-define(wxDateTime_UTC, ?wxDateTime_GMT0).
 % From class wxDateTime::WeekDay
 -define(wxDateTime_Sun, 0).
 -define(wxDateTime_Mon, 1).
@@ -579,7 +575,6 @@
 -define(wxDateTime_Monday_First, 1).
 -define(wxDateTime_Sunday_First, 2).
 % From class wxDateTime::Year
--define(wxDateTime_Inv_Year, ?SHRT_MIN).
 % From class wxDialog
 -define(wxDialog_ButtonSizerFlags, (?wxOK bor ?wxCANCEL bor ?wxYES bor ?wxNO bor ?wxHELP bor ?wxNO_DEFAULT)).
 % From class wxGrid
@@ -760,6 +755,7 @@
 -define(wxCLRP_DEFAULT_STYLE, 0).
 -define(wxCLRP_USE_TEXTCTRL, ?wxPB_USE_TEXTCTRL).
 -define(wxCLRP_SHOW_LABEL, 8).
+% From "cmndata.h"
 % From "cmndata.h": wxPrintBin
 -define(wxPRINTBIN_DEFAULT, 0).
 -define(wxPRINTBIN_ONLYONE, 1).
@@ -782,6 +778,8 @@
 -define(wxC2S_NAME, 1).
 % From "confbase.h"
 -define(wxCONFIG_CASE_SENSITIVE, 0).
+% From "cpp.h"
+-define(wxEMPTY_PARAMETER_VALUE, ()).
 % From "datectrl.h"
 -define(wxDP_DEFAULT, 0).
 -define(wxDP_SPIN, 1).
@@ -789,7 +787,6 @@
 -define(wxDP_SHOWCENTURY, 4).
 -define(wxDP_ALLOWNONE, 8).
 % From "datetime.h"
--define(wxInvalidDateTime, ?wxDefaultDateTime).
 % From "dcbuffer.h"
 -define(wxBUFFER_CLIENT_AREA, 2).
 -define(wxBUFFER_VIRTUAL_AREA, 1).
@@ -1560,13 +1557,13 @@
 % From "event.h"
 % From "event.h": Propagation_state
 -define(wxEVENT_PROPAGATE_NONE, 0).
--define(wxEVENT_PROPAGATE_MAX, ?INT_MAX).
 % From "event.h": wxIdleMode
 -define(wxIDLE_PROCESS_ALL, 0).
 -define(wxIDLE_PROCESS_SPECIFIED, 1).
 % From "event.h": wxUpdateUIMode
 -define(wxUPDATE_UI_PROCESS_ALL, 0).
 -define(wxUPDATE_UI_PROCESS_SPECIFIED, 1).
+% From "fdrepdlg.h"
 % From "fdrepdlg.h": wxFindReplaceDialogStyles
 -define(wxFR_REPLACEDIALOG, 1).
 -define(wxFR_NOUPDOWN, 2).
@@ -1810,7 +1807,6 @@
 -define(wxGA_VERTICAL, ?wxVERTICAL).
 -define(wxGA_HORIZONTAL, ?wxHORIZONTAL).
 % From "gdicmn.h"
--define(wxGetDisplayDepth, ?wxDisplayDepth).
 % From "gdicmn.h": wxBitmapType
 -define(wxBITMAP_TYPE_INVALID, 0).
 -define(wxBITMAP_TYPE_BMP, 1).
@@ -2091,7 +2087,6 @@
 -define(wxLB_TOP, ?wxBK_TOP).
 -define(wxLB_DEFAULT, ?wxBK_DEFAULT).
 % From "log.h"
--define(wxTRACE_OleCalls, ?wxEmptyString).
 -define(wxTraceRefCount, 8).
 -define(wxTraceResAlloc, 4).
 -define(wxTraceMessages, 2).
@@ -2195,7 +2190,8 @@
 -define(wxSYS_COLOUR_MENUHILIGHT, (?wxSYS_COLOUR_BTNHIGHLIGHT+9)).
 -define(wxSYS_COLOUR_MENUBAR, (?wxSYS_COLOUR_BTNHIGHLIGHT+10)).
 -define(wxSYS_COLOUR_LISTBOXTEXT, (?wxSYS_COLOUR_BTNHIGHLIGHT+11)).
--define(wxSYS_COLOUR_MAX, (?wxSYS_COLOUR_BTNHIGHLIGHT+12)).
+-define(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT, (?wxSYS_COLOUR_BTNHIGHLIGHT+12)).
+-define(wxSYS_COLOUR_MAX, (?wxSYS_COLOUR_BTNHIGHLIGHT+13)).
 % From "settings.h": wxSystemFeature
 -define(wxSYS_CAN_DRAW_FRAME_DECORATIONS, 1).
 -define(wxSYS_CAN_ICONIZE_FRAME, 2).
@@ -3797,6 +3793,7 @@
 -define(wxRELEASE_NUMBER, wxe_util:get_const(wxRELEASE_NUMBER)).
 -define(wxMINOR_VERSION, wxe_util:get_const(wxMINOR_VERSION)).
 -define(wxMAJOR_VERSION, wxe_util:get_const(wxMAJOR_VERSION)).
+% From "window.h"
 % From "window.h": wxWindowVariant
 -define(wxWINDOW_VARIANT_NORMAL, 0).
 -define(wxWINDOW_VARIANT_SMALL, 1).
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index 777fb7d998..26574ed86f 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -101,19 +101,19 @@ archive: opt
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk Makefile
-	sed -e 's;%GEN_MODS%;$(GEN_MODS);' $< > [email protected]
-	sed -e 's;%VSN%;$(VSN);' [email protected] > $@
-	rm [email protected]
+	$(gen_verbose)sed -e 's;%GEN_MODS%;$(GEN_MODS);' $< > [email protected]
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' [email protected] > $@
+	$(V_at)rm [email protected]
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk Makefile
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # Rules
 $(EBIN)/%.beam: $(ESRC)/%.erl $(HEADER_FILES)
-	$(ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $< 
+	$(V_ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
-	$(ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $< 
+	$(V_ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/wx/src/gen/gl.erl b/lib/wx/src/gen/gl.erl
index ff381683ee..8a8158c35e 100644
--- a/lib/wx/src/gen/gl.erl
+++ b/lib/wx/src/gen/gl.erl
@@ -1,7 +1,9 @@
+%% -*- coding: utf-8 -*-
+
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -460,7 +462,7 @@ alphaFunc(Func,Ref) ->
 %% as (R s0 G s0 B s0 A s0), (R s1 G s1 B s1 A s1) and (R d G d B d A d), respectively. The color specified by  {@link gl:blendColor/4}  is referred to
 %% as (R c G c B c A c). They are understood to have integer values between 0 and (k R k G k B k A), where 
 %%
-%%  k c= 2(m c)-1
+%%  k c=2(m c)-1
 %%
 %%  and (m R m G m B m A) is the number of red, green, blue, and alpha bitplanes. 
 %%
@@ -489,12 +491,12 @@ alphaFunc(Func,Ref) ->
 %%
 %%  In the table, 
 %%
-%%  i= min(A s k A-A d) k/A
+%%  i=min(A s k A-A d) k/A
 %%
 %%  To determine the blended RGBA values of a pixel, the system uses the following equations:
 %% 
 %%
-%%  R d= min(k R R s  s R+R d  d R) G d= min(k G G s  s G+G d  d G) B d= min(k B B s  s B+B d  d B) A d= min(k A A s  s A+A d  d A)
+%%  R d=min(k R R s  s R+R d  d R) G d=min(k G G s  s G+G d  d G) B d=min(k B B s  s B+B d  d B) A d=min(k A A s  s A+A d  d A)
 %%
 %%  Despite the apparent precision of the above equations, blending arithmetic is not exactly
 %% specified, because blending operates with imprecise integer color values. However, a blend
@@ -503,7 +505,7 @@ alphaFunc(Func,Ref) ->
 %% ,  `Dfactor'  is `?GL_ONE_MINUS_SRC_ALPHA', and   A s is equal to   k A, the equations
 %% reduce to simple replacement: 
 %%
-%%  R d= R s G d= G s B d= B s A d= A s
+%%  R d=R s G d=G s B d=B s A d=A s
 %%
 %% 
 %%
@@ -643,7 +645,7 @@ lineWidth(Width) ->
 %%  is 0, otherwise these fragments are sent to the frame buffer. Bit zero of  `Pattern' 
 %% is the least significant bit. 
 %%
-%%  Antialiased lines are treated as a sequence of   1*width rectangles for purposes of stippling.
+%%  Antialiased lines are treated as a sequence of   1×width rectangles for purposes of stippling.
 %% Whether rectangle   s is rasterized or not depends on the fragment rule described for
 %% aliased lines, counting rectangles rather than groups of fragments. 
 %%
@@ -690,7 +692,7 @@ polygonMode(Face,Mode) ->
 %%  When `?GL_POLYGON_OFFSET_FILL', `?GL_POLYGON_OFFSET_LINE', or `?GL_POLYGON_OFFSET_POINT'
 %%  is enabled, each fragment's `depth' value will be offset after it is interpolated
 %% from the `depth' values of the appropriate vertices. The value of the offset is  
-%% factor*DZ+r*units, where   DZ is a measurement of the change in depth relative to the
+%% factor×DZ+r×units, where   DZ is a measurement of the change in depth relative to the
 %% screen area of the polygon, and   r is the smallest value that is guaranteed to produce
 %% a resolvable offset for a given implementation. The offset is added before the depth test
 %% is performed and before the value is written into the depth buffer. 
@@ -709,10 +711,10 @@ polygonOffset(Factor,Units) ->
 %% fragments produced by rasterization, creating a pattern. Stippling is independent of polygon
 %% antialiasing. 
 %%
-%%  `Pattern'  is a pointer to a   32*32 stipple pattern that is stored in memory just
+%%  `Pattern'  is a pointer to a   32×32 stipple pattern that is stored in memory just
 %% like the pixel data supplied to a  {@link gl:drawPixels/5}  call with  height and `width'
 %%  both equal to 32, a pixel format of `?GL_COLOR_INDEX', and data type of `?GL_BITMAP'
-%% . That is, the stipple pattern is represented as a   32*32 array of 1-bit color indices
+%% . That is, the stipple pattern is represented as a   32×32 array of 1-bit color indices
 %% packed in unsigned bytes.  {@link gl:pixelStoref/2}  parameters like `?GL_UNPACK_SWAP_BYTES'
 %%  and `?GL_UNPACK_LSB_FIRST' affect the assembling of the bits into a stipple pattern.
 %% Pixel transfer operations (shift, offset, pixel map) are not applied to the stipple image,
@@ -737,10 +739,10 @@ polygonStipple(Mask) ->
 
 %% @doc Return the polygon stipple pattern
 %%
-%% ``gl:getPolygonStipple'' returns to  `Pattern'  a   32*32 polygon stipple pattern.
+%% ``gl:getPolygonStipple'' returns to  `Pattern'  a   32×32 polygon stipple pattern.
 %% The pattern is packed into memory as if  {@link gl:readPixels/7}  with both `height'
 %% and `width' of 32, `type' of `?GL_BITMAP', and `format' of `?GL_COLOR_INDEX'
-%%  were called, and the stipple pattern were stored in an internal   32*32 color index buffer.
+%%  were called, and the stipple pattern were stored in an internal   32×32 color index buffer.
 %% Unlike  {@link gl:readPixels/7} , however, pixel transfer operations (shift, offset, pixel
 %% map) are not applied to the returned stipple image. 
 %%
@@ -2635,7 +2637,7 @@ loadIdentity() ->
 %% and  `M'  points to an array of   16 single- or double-precision floating-point values
 %%   m={m[0] m[1] ... m[15]}, then the modelview transformation   M(v) does the following: 
 %%
-%%  M(v)=(m[0] m[4] m[8] m[12] m[1] m[5] m[9] m[13] m[2] m[6] m[10] m[14] m[3] m[7] m[11] m[15])*(v[0] v[1] v[2] v[3])
+%%  M(v)=(m[0] m[4] m[8] m[12] m[1] m[5] m[9] m[13] m[2] m[6] m[10] m[14] m[3] m[7] m[11] m[15])×(v[0] v[1] v[2] v[3])
 %%
 %%  Projection and texture transformations are similarly defined. 
 %%
@@ -2687,7 +2689,7 @@ multMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %% (x 2(1-c)+c x  y(1-c)-z  s x  z(1-c)+y  s 0 y  x(1-c)+z  s y 2(1-c)+c y  z(1-c)-x  s 0 x  z(1-c)-y  s y  z(1-c)+x  s z 2(1-c)+c 0 0 0 0
 %% 1)
 %%
-%%  Where   c= cos(angle),   s= sin(angle), and ||(x y z)||= 1 (if not, the GL will normalize this vector). 
+%%  Where   c=cos(angle),   s=sin(angle), and ||(x y z)||=1 (if not, the GL will normalize this vector). 
 %%
 %%  If the matrix mode is either `?GL_MODELVIEW' or `?GL_PROJECTION', all objects
 %% drawn after ``gl:rotate'' is called are rotated. Use  {@link gl:pushMatrix/0}  and  {@link gl:pushMatrix/0} 
@@ -3814,7 +3816,7 @@ rasterPos4sv({X,Y,Z,W}) ->  rasterPos4s(X,Y,Z,W).
 %% ``gl:rect'' supports efficient specification of rectangles as two corner points. Each
 %% rectangle command takes four arguments, organized either as two consecutive pairs of  (x y)
 %% coordinates or as two pointers to arrays, each containing an  (x y) pair. The resulting rectangle
-%% is defined in the   z= 0 plane. 
+%% is defined in the   z=0 plane. 
 %%
 %% ``gl:rect''( `X1' ,  `Y1' ,  `X2' ,  `Y2' ) is exactly equivalent to the
 %% following sequence:  glBegin(`?GL_POLYGON'); glVertex2( `X1' ,  `Y1' ); glVertex2(
@@ -4684,9 +4686,9 @@ pixelZoom(Xfactor,Yfactor) ->
 %% is the number of pixels in a row (`?GL_PACK_ROW_LENGTH' if it is greater than 0,
 %% the   width argument to the pixel routine otherwise),  a is the value of `?GL_PACK_ALIGNMENT'
 %% , and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=
-%%  s). In the case of 1-bit values, the location of the next row is obtained by skipping 
+%% s). In the case of 1-bit values, the location of the next row is obtained by skipping 
 %%
-%%  k= 8  a |(n  l)/(8  a)|
+%%  k=8  a |(n  l)/(8  a)|
 %%
 %%  components or indices. 
 %%
@@ -4708,7 +4710,7 @@ pixelZoom(Xfactor,Yfactor) ->
 %% a pixel image (`?GL_PACK_IMAGE_HEIGHT' if it is greater than 0, the   height argument
 %% to the  {@link gl:texImage3D/10}  routine otherwise),  a is the value of `?GL_PACK_ALIGNMENT'
 %% , and   s is the size, in bytes, of a single component (if   a&lt; s, then it is as if  
-%% a= s). 
+%% a=s). 
 %%
 %%  The word `component' in this description refers to the nonindex values red, green,
 %% blue, alpha, and depth. Storage format `?GL_RGB', for example, has three components
@@ -4758,9 +4760,9 @@ pixelZoom(Xfactor,Yfactor) ->
 %% is the number of pixels in a row (`?GL_UNPACK_ROW_LENGTH' if it is greater than 0,
 %% the   width argument to the pixel routine otherwise),  a is the value of `?GL_UNPACK_ALIGNMENT'
 %% , and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=
-%%  s). In the case of 1-bit values, the location of the next row is obtained by skipping 
+%% s). In the case of 1-bit values, the location of the next row is obtained by skipping 
 %%
-%%  k= 8  a |(n  l)/(8  a)|
+%%  k=8  a |(n  l)/(8  a)|
 %%
 %%  components or indices. 
 %%
@@ -4781,8 +4783,8 @@ pixelZoom(Xfactor,Yfactor) ->
 %% the   width argument to  {@link gl:texImage3D/10}  otherwise),  h is the number of rows in
 %% an image (`?GL_UNPACK_IMAGE_HEIGHT' if it is greater than 0, the   height argument
 %% to  {@link gl:texImage3D/10}  otherwise),  a is the value of `?GL_UNPACK_ALIGNMENT',
-%% and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=
-%% s). 
+%% and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=s).
+%% 
 %%
 %%  The word `component' in this description refers to the nonindex values red, green,
 %% blue, alpha, and depth. Storage format `?GL_RGB', for example, has three components
@@ -5327,7 +5329,7 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %%  or `?GL_STENCIL_INDEX'. Each unsigned byte is treated as eight 1-bit pixels, with
 %% bit ordering determined by `?GL_UNPACK_LSB_FIRST' (see  {@link gl:pixelStoref/2} ). 
 %%
-%%  width*height pixels are read from memory, starting at location  `Data' . By default,
+%%  width×height pixels are read from memory, starting at location  `Data' . By default,
 %% these pixels are taken from adjacent memory locations, except that after all  `Width' 
 %% pixels are read, the read pointer is advanced to the next four-byte boundary. The four-byte
 %% row alignment is specified by  {@link gl:pixelStoref/2}  with argument `?GL_UNPACK_ALIGNMENT'
@@ -5340,7 +5342,7 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %%  (see  {@link gl:bindBuffer/2} ) while a block of pixels is specified,  `Data'  is treated
 %% as a byte offset into the buffer object's data store. 
 %%
-%%  The   width*height pixels that are read from memory are each operated on in the same
+%%  The   width×height pixels that are read from memory are each operated on in the same
 %% way, based on the values of several parameters specified by  {@link gl:pixelTransferf/2} 
 %% and  {@link gl:pixelMapfv/3} . The details of these operations, as well as the target buffer
 %% into which the pixels are drawn, are specific to the format of the pixels, as specified
@@ -5366,10 +5368,10 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %%
 %%  The GL then converts the resulting indices or RGBA colors to fragments by attaching the
 %% current raster position `z' coordinate and texture coordinates to each pixel, then
-%% assigning   x and   y window coordinates to the   nth fragment such that  x n= x r+n%
-%% width
+%% assigning   x and   y window coordinates to the   nth fragment such that  x n=x r+n% width
+%% 
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. These pixel fragments are then treated just like
 %% the fragments generated by rasterizing points, lines, or polygons. Texture mapping, fog,
@@ -5391,9 +5393,9 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %% the number of bits in the stencil buffer. The resulting stencil indices are then written
 %% to the stencil buffer such that the   nth index is written to location 
 %%
-%%  x n= x r+n% width
+%%  x n=x r+n% width
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. Only the pixel ownership test, the scissor test,
 %% and the stencil writemask affect these write operations. 
@@ -5411,9 +5413,9 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %% raster position color or color index and texture coordinates to each pixel, then assigning
 %%   x and   y window coordinates to the   nth fragment such that 
 %%
-%%  x n= x r+n% width
+%%  x n=x r+n% width
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. These pixel fragments are then treated just like
 %% the fragments generated by rasterizing points, lines, or polygons. Texture mapping, fog,
@@ -5442,9 +5444,9 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %% raster position `z' coordinate and texture coordinates to each pixel, then assigning
 %%   x and   y window coordinates to the   nth fragment such that 
 %%
-%%  x n= x r+n% width
+%%  x n=x r+n% width
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. These pixel fragments are then treated just like
 %% the fragments generated by rasterizing points, lines, or polygons. Texture mapping, fog,
@@ -5810,7 +5812,7 @@ clearStencil(S) ->
 %%
 %%  If the texture generation function is `?GL_OBJECT_LINEAR', the function 
 %%
-%%  g= p 1*x o+p 2*y o+p 3*z o+p 4*w o
+%%  g=p 1×x o+p 2×y o+p 3×z o+p 4×w o
 %%
 %%  is used, where   g is the value computed for the coordinate named in  `Coord' ,  p 1,
 %%  p 2,  p 3, and  p 4 are the four values supplied in  `Params' , and  x o,  y o,  z o,
@@ -5823,7 +5825,7 @@ clearStencil(S) ->
 %%
 %%  If the texture generation function is `?GL_EYE_LINEAR', the function 
 %%
-%%  g=(p 1)"*x e+(p 2)"*y e+(p 3)"*z e+(p 4)"*w e
+%%  g=(p 1)"×x e+(p 2)"×y e+(p 3)"×z e+(p 4)"×w e
 %%
 %%  is used, where 
 %%
@@ -5847,14 +5849,14 @@ clearStencil(S) ->
 %%
 %%  f=(f x  f y  f z) T be the reflection vector such that 
 %%
-%%  f= u-2  n" (n") T  u
+%%  f=u-2  n" (n") T  u
 %%
-%%  Finally, let   m= 2 ((f x) 2+(f y) 2+(f z+1) 2). Then the values assigned to the   s and   t texture coordinates
+%%  Finally, let   m=2 ((f x) 2+(f y) 2+(f z+1) 2). Then the values assigned to the   s and   t texture coordinates
 %% are 
 %%
-%%  s= f x/m+1/2
+%%  s=f x/m+1/2
 %%
-%%  t= f y/m+1/2
+%%  t=f y/m+1/2
 %%
 %%  To enable or disable a texture-coordinate generation function, call  {@link gl:enable/1} 
 %% or  {@link gl:enable/1}  with one of the symbolic texture-coordinate names (`?GL_TEXTURE_GEN_S'
@@ -6002,7 +6004,7 @@ texEnvi(Target,Pname,Param) ->
 %% `?GL_BLEND' Function </td><td>`?GL_ADD' Function </td></tr></tbody><tbody><tr><td>
 %% `?GL_ALPHA'</td><td> C v=</td><td> C p</td><td> C p</td><td> undefined </td><td> C p</td>
 %% <td> C p</td></tr><tr><td></td><td> A v=</td><td> A s</td><td> A p  A s</td><td></td><td>
-%% A v= A p  A s</td><td> A p  A s</td></tr><tr><td>`?GL_LUMINANCE'</td><td> C v=</td><td>
+%% A v=A p  A s</td><td> A p  A s</td></tr><tr><td>`?GL_LUMINANCE'</td><td> C v=</td><td>
 %%  C s</td><td> C p  C s</td><td> undefined </td><td> C p (1-C s)+C c  C s</td><td> C p+C s</td></tr>
 %% <tr><td> (or 1) </td><td> A v=</td><td> A p</td><td> A p</td><td></td><td> A p</td><td> A
 %% p</td></tr><tr><td>`?GL_LUMINANCE_ALPHA'</td><td> C v=</td><td> C s</td><td> C p  C
@@ -6034,11 +6036,11 @@ texEnvi(Target,Pname,Param) ->
 %%
 %% <table><tbody><tr><td>`?GL_COMBINE_RGB'</td><td>` Texture Function '</td></tr></tbody>
 %% <tbody><tr><td>`?GL_REPLACE'</td><td> Arg0</td></tr><tr><td>`?GL_MODULATE'</td><td>
-%%  Arg0*Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
-%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0*Arg2+Arg1*(1-
+%%  Arg0×Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
+%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0×Arg2+Arg1×(1-
 %% Arg2)</td>
 %% </tr><tr><td>`?GL_SUBTRACT'</td><td> Arg0-Arg1</td></tr><tr><td>`?GL_DOT3_RGB'
-%% or `?GL_DOT3_RGBA'</td><td> 4*((((Arg0 r)-0.5)*((Arg1 r)-0.5))+(((Arg0 g)-0.5)*((Arg1 g)-0.5))+(((Arg0 b)-0.5)*((Arg1 b)-0.5)))</td></tr></tbody></table>
+%% or `?GL_DOT3_RGBA'</td><td> 4×((((Arg0 r)-0.5)×((Arg1 r)-0.5))+(((Arg0 g)-0.5)×((Arg1 g)-0.5))+(((Arg0 b)-0.5)×((Arg1 b)-0.5)))</td></tr></tbody></table>
 %%
 %%  The scalar results for `?GL_DOT3_RGB' and `?GL_DOT3_RGBA' are placed into each
 %% of the 3 (RGB) or 4 (RGBA) components on output. 
@@ -6049,8 +6051,8 @@ texEnvi(Target,Pname,Param) ->
 %%
 %% <table><tbody><tr><td>`?GL_COMBINE_ALPHA'</td><td>` Texture Function '</td></tr>
 %% </tbody><tbody><tr><td>`?GL_REPLACE'</td><td> Arg0</td></tr><tr><td>`?GL_MODULATE'
-%% </td><td> Arg0*Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
-%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0*Arg2+Arg1*(1-
+%% </td><td> Arg0×Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
+%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0×Arg2+Arg1×(1-
 %% Arg2)</td>
 %% </tr><tr><td>`?GL_SUBTRACT'</td><td> Arg0-Arg1</td></tr></tbody></table>
 %%
@@ -6245,19 +6247,18 @@ getTexEnviv(Target,Pname) ->
 %%  If the values for `?GL_TEXTURE_BORDER_COLOR' are specified with ``gl:texParameterIiv''
 %%  or ``gl:texParameterIuiv'', the values are stored unmodified with an internal data
 %% type of integer. If specified with ``gl:texParameteriv'', they are converted to floating
-%% point with the following equation:  f= 2 c+1 2 b-/1. If specified with ``gl:texParameterfv''
+%% point with the following equation:  f=2 c+1 2 b-/1. If specified with ``gl:texParameterfv''
 %% , they are stored unmodified as floating-point values. 
 %%
 %% `?GL_TEXTURE_COMPARE_FUNC':  Specifies the comparison operator used when `?GL_TEXTURE_COMPARE_MODE'
 %%  is set to `?GL_COMPARE_REF_TO_TEXTURE'. Permissible values are: <table><tbody><tr><td>
 %% ` Texture Comparison Function '</td><td>` Computed result  '</td></tr></tbody><tbody>
-%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
-%% result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;
-%% (D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp;
-%%  r=(D t) r&amp;ne;(D t))</td></tr><tr><td>`?GL_NOTEQUAL'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result= 1.0</td></tr><tr><td>
-%% `?GL_NEVER'</td><td> result= 0.0</td></tr></tbody></table> where  r is the current
+%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0    r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
+%% result={1.0 0.0    r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0    r&lt;(D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
+%% </td><td> result={1.0 0.0    r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0    r=(D t) r&amp;ne;
+%% (D t))</td></tr><tr><td>`?GL_NOTEQUAL'
+%% </td><td> result={1.0 0.0    r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result=1.0</td></tr><tr><td>
+%% `?GL_NEVER'</td><td> result=0.0</td></tr></tbody></table> where  r is the current
 %% interpolated texture coordinate, and   D t is the depth texture value sampled from the
 %% currently bound depth texture.  result is assigned to the the red channel. 
 %%
@@ -6286,14 +6287,14 @@ getTexEnviv(Target,Pname) ->
 %% The other four use mipmaps. 
 %%
 %%  A mipmap is an ordered set of arrays representing the same image at progressively lower
-%% resolutions. If the texture has dimensions   2 n*2 m, there are  max(n m)+1 mipmaps. The first
-%% mipmap is the original texture, with dimensions   2 n*2 m. Each subsequent mipmap has
-%% dimensions   2(k-1)*2(l-1), where   2 k*2 l are the dimensions of the previous mipmap, until either
-%%   k= 0 or   l= 0. At that point, subsequent mipmaps have dimension   1*2(l-1) or   2(k-1)*1 until
-%% the final mipmap, which has dimension   1*1. To define the mipmaps, call  {@link gl:texImage1D/8} 
+%% resolutions. If the texture has dimensions   2 n×2 m, there are  max(n m)+1 mipmaps. The first
+%% mipmap is the original texture, with dimensions   2 n×2 m. Each subsequent mipmap has
+%% dimensions   2(k-1)×2(l-1), where   2 k×2 l are the dimensions of the previous mipmap, until either
+%%   k=0 or   l=0. At that point, subsequent mipmaps have dimension   1×2(l-1) or   2(k-1)×1 until
+%% the final mipmap, which has dimension   1×1. To define the mipmaps, call  {@link gl:texImage1D/8} 
 %% ,  {@link gl:texImage2D/9} ,  {@link gl:texImage3D/10} ,  {@link gl:copyTexImage1D/7} , or  {@link gl:copyTexImage2D/8} 
 %%  with the `level' argument indicating the order of the mipmaps. Level 0 is the original
-%% texture; level   max(n m) is the final   1*1 mipmap. 
+%% texture; level   max(n m) is the final   1×1 mipmap. 
 %%
 %%  `Params'  supplies a function for minifying the texture as one of the following: 
 %%
@@ -7255,7 +7256,7 @@ map2f(Target,U1,U2,Ustride,Uorder,V1,V2,Vstride,Vorder,Points) ->
 %%  `Query'  can assume the following values: 
 %%
 %% `?GL_COEFF':  `V'  returns the control points for the evaluator function. One-dimensional
-%% evaluators return   order control points, and two-dimensional evaluators return   uorder*vorder
+%% evaluators return   order control points, and two-dimensional evaluators return   uorder×vorder
 %%  control points. Each control point consists of one, two, three, or four integer, single-precision
 %% floating-point, or double-precision floating-point values, depending on the type of the
 %% evaluator. The GL returns two-dimensional control points in row-major order, incrementing
@@ -7330,9 +7331,9 @@ getMapiv(Target,Query,V) ->
 %% `?GL_AUTO_NORMAL', ``gl:evalCoord2'' generates surface normals analytically, regardless
 %% of the contents or enabling of the `?GL_MAP2_NORMAL' map. Let 
 %%
-%%  m=((&amp;PartialD; p)/(&amp;PartialD; u))*((&amp;PartialD; p)/(&amp;PartialD; v))
+%%  m=((&amp;PartialD; p)/(&amp;PartialD; u))×((&amp;PartialD; p)/(&amp;PartialD; v))
 %%
-%%  Then the generated normal   n is  n= m/(||m||)
+%%  Then the generated normal   n is  n=m/(||m||)
 %%
 %%  If automatic normal generation is disabled, the corresponding normal map `?GL_MAP2_NORMAL'
 %% , if enabled, is used to produce a normal. If neither automatic normal generation nor
@@ -7393,17 +7394,17 @@ evalCoord2fv({U,V}) ->  evalCoord2f(U,V).
 %% 0 maps exactly to  `U1' , and integer grid coordinate  `Un'  maps exactly to  `U2' 
 %% . All other integer grid coordinates   i are mapped so that 
 %%
-%%  u= i(u2-u1)/un+u1
+%%  u=i(u2-u1)/un+u1
 %%
 %% ``gl:mapGrid2'' specifies two such linear mappings. One maps integer grid coordinate  
-%% i= 0 exactly to  `U1' , and integer grid coordinate   i= un exactly to  `U2' . The
-%% other maps integer grid coordinate   j= 0 exactly to  `V1' , and integer grid coordinate
-%%   j= vn exactly to  `V2' . Other integer grid coordinates   i and   j are mapped such
+%% i=0 exactly to  `U1' , and integer grid coordinate   i=un exactly to  `U2' . The
+%% other maps integer grid coordinate   j=0 exactly to  `V1' , and integer grid coordinate
+%%   j=vn exactly to  `V2' . Other integer grid coordinates   i and   j are mapped such
 %% that 
 %%
-%%  u= i(u2-u1)/un+u1
+%%  u=i(u2-u1)/un+u1
 %%
-%%  v= j(v2-v1)/vn+v1
+%%  v=j(v2-v1)/vn+v1
 %%
 %%  The mappings specified by ``gl:mapGrid'' are used identically by  {@link gl:evalMesh1/3} 
 %% and  {@link gl:evalPoint1/1} . 
@@ -7440,7 +7441,7 @@ mapGrid2f(Un,U1,U2,Vn,V1,V2) ->
 %% 1 );  where &amp;Delta; u=(u 2-u 1)/n
 %%
 %%  and   n,   u 1, and   u 2 are the arguments to the most recent  {@link gl:mapGrid1d/3}  command.
-%% The one absolute numeric requirement is that if   i= n, then the value computed from  i.&amp;Delta;
+%% The one absolute numeric requirement is that if   i=n, then the value computed from  i.&amp;Delta;
 %%  u+u 1 is exactly   u 2. 
 %%
 %%  In the two-dimensional case, ``gl:evalPoint2'', let 
@@ -7452,8 +7453,8 @@ mapGrid2f(Un,U1,U2,Vn,V1,V2) ->
 %%  where   n,   u 1,   u 2,   m,   v 1, and   v 2 are the arguments to the most recent  {@link gl:mapGrid1d/3} 
 %%  command. Then the ``gl:evalPoint2'' command is equivalent to calling  glEvalCoord2(  i.
 %% &amp;Delta; u+u 1, j.&amp;Delta; v+v 1 );  The only absolute numeric requirements are
-%% that if   i= n, then the value computed from  i.&amp;Delta; u+u 1 is exactly   u 2, and
-%% if   j= m, then the value computed from  j.&amp;Delta; v+v 1 is exactly   v 2. 
+%% that if   i=n, then the value computed from  i.&amp;Delta; u+u 1 is exactly   u 2, and
+%% if   j=m, then the value computed from  j.&amp;Delta; v+v 1 is exactly   v 2. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalPoint.xml">external</a> documentation.
 -spec evalPoint1(I) -> ok when I :: integer().
@@ -7486,8 +7487,8 @@ evalPoint2(I,J) ->
 %% `type' is `?GL_POINTS' if  `Mode'  is `?GL_POINT', or `?GL_LINES'
 %% if  `Mode'  is `?GL_LINE'. 
 %%
-%%  The one absolute numeric requirement is that if   i= n, then the value computed from   i.
-%% &amp;Delta; u+u 1 is exactly   u 2. 
+%%  The one absolute numeric requirement is that if   i=n, then the value computed from   i.&amp;Delta;
+%%  u+u 1 is exactly   u 2. 
 %%
 %%  In the two-dimensional case, ``gl:evalMesh2'', let .cp &amp;Delta; u=(u 2-u 1)/n
 %%
@@ -7516,8 +7517,8 @@ evalPoint2(I,J) ->
 %% ; i &lt;=  `I2' ; i += 1 ) glEvalCoord2(  i.&amp;Delta; u+u 1, j.&amp;Delta; v+v 1
 %% ); glEnd(); 
 %%
-%%  In all three cases, the only absolute numeric requirements are that if   i= n, then the
-%% value computed from   i.&amp;Delta; u+u 1 is exactly  u 2, and if   j= m, then the value
+%%  In all three cases, the only absolute numeric requirements are that if   i=n, then the
+%% value computed from   i.&amp;Delta; u+u 1 is exactly  u 2, and if   j=m, then the value
 %% computed from  j.&amp;Delta; v+v 1 is exactly   v 2. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalMesh.xml">external</a> documentation.
@@ -7578,21 +7579,21 @@ evalMesh2(Mode,I1,I2,J1,J2) ->
 %% (in the case that `?GL_FOG_COORD_SRC' is `?GL_FOG_COORD'). The equation for `?GL_LINEAR'
 %%  fog is  f=(end-c)/(end-start)
 %%
-%%  The equation for `?GL_EXP' fog is  f= e(-(density. c))
+%%  The equation for `?GL_EXP' fog is  f=e(-(density. c))
 %%
-%%  The equation for `?GL_EXP2' fog is  f= e(-(density. c)) 2
+%%  The equation for `?GL_EXP2' fog is  f=e(-(density. c)) 2
 %%
 %%  Regardless of the fog mode,  f is clamped to the range  [0 1] after it is computed. Then,
 %% if the GL is in RGBA color mode, the fragment's red, green, and blue colors, represented
 %% by   C r, are replaced by 
 %%
-%% (C r)"= f*C r+(1-f)*C f
+%% (C r)"=f×C r+(1-f)×C f
 %%
 %%  Fog does not affect a fragment's alpha component. 
 %%
 %%  In color index mode, the fragment's color index   i r is replaced by 
 %%
-%% (i r)"= i r+(1-f)*i f
+%% (i r)"=i r+(1-f)×i f
 %%
 %% 
 %%
@@ -7664,44 +7665,45 @@ fogiv(Pname,Params) ->
 %% is fed back as some number of floating-point values, as determined by  `Type' . Colors
 %% are fed back as four values in RGBA mode and one value in color index mode. 
 %%
-%%  feedbackList  feedbackItem feedbackList | feedbackItem 
+%%  feedbackList  ← feedbackItem feedbackList | feedbackItem 
 %%
-%%  feedbackItem  point | lineSegment | polygon | bitmap | pixelRectangle | passThru 
+%%  feedbackItem  ← point | lineSegment | polygon | bitmap | pixelRectangle | passThru 
 %%
-%%  point `?GL_POINT_TOKEN' vertex 
+%%  point  ←`?GL_POINT_TOKEN' vertex 
 %%
-%%  lineSegment `?GL_LINE_TOKEN' vertex vertex | `?GL_LINE_RESET_TOKEN' vertex
+%%  lineSegment  ←`?GL_LINE_TOKEN' vertex vertex | `?GL_LINE_RESET_TOKEN' vertex
 %% vertex 
 %%
-%%  polygon `?GL_POLYGON_TOKEN' n polySpec 
+%%  polygon  ←`?GL_POLYGON_TOKEN' n polySpec 
 %%
-%%  polySpec  polySpec vertex | vertex vertex vertex 
+%%  polySpec  ← polySpec vertex | vertex vertex vertex 
 %%
-%%  bitmap `?GL_BITMAP_TOKEN' vertex 
+%%  bitmap  ←`?GL_BITMAP_TOKEN' vertex 
 %%
-%%  pixelRectangle `?GL_DRAW_PIXEL_TOKEN' vertex | `?GL_COPY_PIXEL_TOKEN' vertex 
+%%  pixelRectangle  ←`?GL_DRAW_PIXEL_TOKEN' vertex | `?GL_COPY_PIXEL_TOKEN' vertex
+%% 
 %%
-%%  passThru `?GL_PASS_THROUGH_TOKEN' value 
+%%  passThru  ←`?GL_PASS_THROUGH_TOKEN' value 
 %%
-%%  vertex  2d | 3d | 3dColor | 3dColorTexture | 4dColorTexture 
+%%  vertex  ← 2d | 3d | 3dColor | 3dColorTexture | 4dColorTexture 
 %%
-%%  2d  value value 
+%%  2d  ← value value 
 %%
-%%  3d  value value value 
+%%  3d  ← value value value 
 %%
-%%  3dColor  value value value color 
+%%  3dColor  ← value value value color 
 %%
-%%  3dColorTexture  value value value color tex 
+%%  3dColorTexture  ← value value value color tex 
 %%
-%%  4dColorTexture  value value value value color tex 
+%%  4dColorTexture  ← value value value value color tex 
 %%
-%%  color  rgba | index 
+%%  color  ← rgba | index 
 %%
-%%  rgba  value value value value 
+%%  rgba  ← value value value value 
 %%
-%%  index  value 
+%%  index  ← value 
 %%
-%%  tex  value value value value 
+%%  tex  ← value value value value 
 %%
 %% `value' is a floating-point number, and `n' is a floating-point integer giving
 %% the number of vertices in the polygon. `?GL_POINT_TOKEN', `?GL_LINE_TOKEN', `?GL_LINE_RESET_TOKEN'
@@ -7886,13 +7888,13 @@ blendColor(Red,Green,Blue,Alpha) ->
 %% blend factors are denoted (s R s G s B s A) and (d R d G d B d A), respectively. For these equations all color components
 %% are understood to have values in the range  [0 1].  <table><tbody><tr><td>` Mode '</td><td>
 %% ` RGB Components '</td><td>` Alpha Component '</td></tr></tbody><tbody><tr><td>`?GL_FUNC_ADD'
-%% </td><td> Rr= R s  s R+R d  d R Gr= G s  s G+G d  d G Br= B s  s B+B d  d B</td><td> Ar=
-%% A s  s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr= R s  s R-R d  d
-%% R Gr= G s  s G-G d  d G Br= B s  s B-B d  d B</td><td> Ar= A s  s A-A d  d A</td></tr><tr>
-%% <td>`?GL_FUNC_REVERSE_SUBTRACT'</td><td> Rr= R d  d R-R s  s R Gr= G d  d G-G s  s G
-%% Br= B d  d B-B s  s B</td><td> Ar= A d  d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td>
-%%  Rr= min(R s R d) Gr= min(G s G d) Br= min(B s B d)</td><td> Ar= min(A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=
-%% max(R s R d) Gr= max(G s G d) Br= max(B s B d)</td><td> Ar= max(A s A d)</td></tr></tbody></table>
+%% </td><td> Rr=R s  s R+R d  d R Gr=G s  s G+G d  d G Br=B s  s B+B d  d B</td><td> Ar=A s 
+%% s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr=R s  s R-R d  d R Gr=G
+%% s  s G-G d  d G Br=B s  s B-B d  d B</td><td> Ar=A s  s A-A d  d A</td></tr><tr><td>`?GL_FUNC_REVERSE_SUBTRACT'
+%% </td><td> Rr=R d  d R-R s  s R Gr=G d  d G-G s  s G Br=B d  d B-B s  s B</td><td> Ar=A d 
+%% d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td> Rr=min(R s R d) Gr=min(G s G d) Br=min(B s B d)</td><td> Ar=min
+%% (A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=max(R s R d) Gr=max(G s G d) Br=max(B s B d)</td><td> Ar=max(A s A d)</td></tr></tbody>
+%% </table>
 %%
 %%  The results of these equations are clamped to the range  [0 1]. 
 %%
@@ -9062,7 +9064,7 @@ sampleCoverage(Value,Invert) ->
 %%
 %%  `ImageSize'  must be equal to: 
 %%
-%%  b s*|width b/w|*|height b/h|*|depth b/d|
+%%  b s×|width b/w|×|height b/h|×|depth b/d|
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage3D.xml">external</a> documentation.
 -spec compressedTexImage3D(Target, Level, Internalformat, Width, Height, Depth, Border, ImageSize, Data) -> ok when Target :: enum(),Level :: integer(),Internalformat :: enum(),Width :: integer(),Height :: integer(),Depth :: integer(),Border :: integer(),ImageSize :: integer(),Data :: offset()|mem().
@@ -9124,7 +9126,7 @@ compressedTexImage3D(Target,Level,Internalformat,Width,Height,Depth,Border,Image
 %%
 %%  `ImageSize'  must be equal to: 
 %%
-%%  b s*|width b/w|*|height b/h|
+%%  b s×|width b/w|×|height b/h|
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage2D.xml">external</a> documentation.
 -spec compressedTexImage2D(Target, Level, Internalformat, Width, Height, Border, ImageSize, Data) -> ok when Target :: enum(),Level :: integer(),Internalformat :: enum(),Width :: integer(),Height :: integer(),Border :: integer(),ImageSize :: integer(),Data :: offset()|mem().
@@ -9181,7 +9183,7 @@ compressedTexImage2D(Target,Level,Internalformat,Width,Height,Border,ImageSize,D
 %%
 %%  `ImageSize'  must be equal to: 
 %%
-%%  b s*|width b/w|
+%%  b s×|width b/w|
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage1D.xml">external</a> documentation.
 -spec compressedTexImage1D(Target, Level, Internalformat, Width, Border, ImageSize, Data) -> ok when Target :: enum(),Level :: integer(),Internalformat :: enum(),Width :: integer(),Border :: integer(),ImageSize :: integer(),Data :: offset()|mem().
@@ -9502,7 +9504,7 @@ multiTexCoord4sv(Target,{S,T,R,Q}) ->  multiTexCoord4s(Target,S,T,R,Q).
 %% and  `M'  points to an array of   16 single- or double-precision floating-point values
 %%   m={m[0] m[1] ... m[15]}, then the modelview transformation   M(v) does the following: 
 %%
-%%  M(v)=(m[0] m[1] m[2] m[3] m[4] m[5] m[6] m[7] m[8] m[9] m[10] m[11] m[12] m[13] m[14] m[15])*(v[0] v[1] v[2] v[3])
+%%  M(v)=(m[0] m[1] m[2] m[3] m[4] m[5] m[6] m[7] m[8] m[9] m[10] m[11] m[12] m[13] m[14] m[15])×(v[0] v[1] v[2] v[3])
 %%
 %%  Projection and texture transformations are similarly defined. 
 %%
@@ -9569,7 +9571,7 @@ multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %%  is referred to as (R c G c B c A c). They are understood to have integer values between 0 and (k R k G k B
 %% k A), where 
 %%
-%%  k c= 2(m c)-1
+%%  k c=2(m c)-1
 %%
 %%  and (m R m G m B m A) is the number of red, green, blue, and alpha bitplanes. 
 %%
@@ -9601,12 +9603,12 @@ multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %%
 %%  In the table, 
 %%
-%%  i= min(A s 1-(A d))
+%%  i=min(A s 1-(A d))
 %%
 %%  To determine the blended RGBA values of a pixel, the system uses the following equations:
 %% 
 %%
-%%  R d= min(k R R s  s R+R d  d R) G d= min(k G G s  s G+G d  d G) B d= min(k B B s  s B+B d  d B) A d= min(k A A s  s A+A d  d A)
+%%  R d=min(k R R s  s R+R d  d R) G d=min(k G G s  s G+G d  d G) B d=min(k B B s  s B+B d  d B) A d=min(k A A s  s A+A d  d A)
 %%
 %%  Despite the apparent precision of the above equations, blending arithmetic is not exactly
 %% specified, because blending operates with imprecise integer color values. However, a blend
@@ -9615,7 +9617,7 @@ multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %% ,  `DstRGB'  is `?GL_ONE_MINUS_SRC_ALPHA', and   A s is equal to   k A, the equations
 %% reduce to simple replacement: 
 %%
-%%  R d= R s G d= G s B d= B s A d= A s
+%%  R d=R s G d=G s B d=B s A d=A s
 %%
 %% 
 %%
@@ -9899,7 +9901,7 @@ secondaryColorPointer(Size,Type,Stride,Pointer) ->
 %% current modelview and projection matrices, nor by the viewport-to-window transform. The  
 %% z coordinate of the current raster position is updated in the following manner: 
 %%
-%%  z={n f(n+z*(f-n))  if  z&lt;= 0 if  z&gt;= 1(otherwise))
+%%  z={n f(n+z×(f-n))  if  z&lt;= 0 if  z&gt;= 1(otherwise))
 %%
 %%  where   n is `?GL_DEPTH_RANGE''s near value, and   f is `?GL_DEPTH_RANGE''s
 %% far value. See  {@link gl:depthRange/2} . 
@@ -10397,13 +10399,13 @@ getBufferParameteriv(Target,Pname) ->
 %% blend factors are denoted (s R s G s B s A) and (d R d G d B d A), respectively. For these equations all color components
 %% are understood to have values in the range  [0 1].  <table><tbody><tr><td>` Mode '</td><td>
 %% ` RGB Components '</td><td>` Alpha Component '</td></tr></tbody><tbody><tr><td>`?GL_FUNC_ADD'
-%% </td><td> Rr= R s  s R+R d  d R Gr= G s  s G+G d  d G Br= B s  s B+B d  d B</td><td> Ar=
-%% A s  s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr= R s  s R-R d  d
-%% R Gr= G s  s G-G d  d G Br= B s  s B-B d  d B</td><td> Ar= A s  s A-A d  d A</td></tr><tr>
-%% <td>`?GL_FUNC_REVERSE_SUBTRACT'</td><td> Rr= R d  d R-R s  s R Gr= G d  d G-G s  s G
-%% Br= B d  d B-B s  s B</td><td> Ar= A d  d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td>
-%%  Rr= min(R s R d) Gr= min(G s G d) Br= min(B s B d)</td><td> Ar= min(A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=
-%% max(R s R d) Gr= max(G s G d) Br= max(B s B d)</td><td> Ar= max(A s A d)</td></tr></tbody></table>
+%% </td><td> Rr=R s  s R+R d  d R Gr=G s  s G+G d  d G Br=B s  s B+B d  d B</td><td> Ar=A s 
+%% s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr=R s  s R-R d  d R Gr=G
+%% s  s G-G d  d G Br=B s  s B-B d  d B</td><td> Ar=A s  s A-A d  d A</td></tr><tr><td>`?GL_FUNC_REVERSE_SUBTRACT'
+%% </td><td> Rr=R d  d R-R s  s R Gr=G d  d G-G s  s G Br=B d  d B-B s  s B</td><td> Ar=A d 
+%% d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td> Rr=min(R s R d) Gr=min(G s G d) Br=min(B s B d)</td><td> Ar=min
+%% (A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=max(R s R d) Gr=max(G s G d) Br=max(B s B d)</td><td> Ar=max(A s A d)</td></tr></tbody>
+%% </table>
 %%
 %%  The results of these equations are clamped to the range  [0 1]. 
 %%
@@ -11626,11 +11628,11 @@ useProgram(Program) ->
 %%
 %% The commands ``gl:uniformMatrix{2|3|4|2x3|3x2|2x4|4x2|3x4|4x3}fv''  are used to modify
 %% a matrix or an array of matrices. The numbers in the command name are interpreted as the
-%% dimensionality of the matrix. The number `2' indicates a 2 � 2 matrix (i.e., 4 values),
-%% the number `3' indicates a 3 � 3 matrix (i.e., 9 values), and the number `4'
-%% indicates a 4 � 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
+%% dimensionality of the matrix. The number `2' indicates a 2 × 2 matrix (i.e., 4 values),
+%% the number `3' indicates a 3 × 3 matrix (i.e., 9 values), and the number `4'
+%% indicates a 4 × 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
 %% with the first number representing the number of columns and the second number representing
-%% the number of rows. For example,  `2x4' indicates a 2 � 4 matrix with 2 columns and
+%% the number of rows. For example,  `2x4' indicates a 2 × 4 matrix with 2 columns and
 %% 4 rows (i.e., 8 values). If  `Transpose'  is `?GL_FALSE', each matrix is assumed
 %% to be supplied in column major order. If  `Transpose'  is `?GL_TRUE', each matrix
 %% is assumed to be supplied in row major order. The  `Count'  argument indicates the
@@ -12753,7 +12755,7 @@ drawElementsInstanced(Mode,Count,Type,Indices,Primcount) ->
 %%
 %%  When a buffer object is attached to a buffer texture, the buffer object's data store
 %% is taken as the texture's texel array. The number of texels in the buffer texture's texel
-%% array is given by  buffer_size components� sizeof( base_type/)
+%% array is given by  buffer_size components×sizeof( base_type/)
 %%
 %%  where `buffer_size' is the size of the buffer object, in basic machine units and
 %% components and base type are the element count and base data type for elements, as specified
@@ -14576,14 +14578,14 @@ bindSampler(Unit,Sampler) ->
 %% to compute the texture value. The other four use mipmaps. 
 %%
 %%  A mipmap is an ordered set of arrays representing the same image at progressively lower
-%% resolutions. If the texture has dimensions   2 n*2 m, there are  max(n m)+1 mipmaps. The first
-%% mipmap is the original texture, with dimensions   2 n*2 m. Each subsequent mipmap has
-%% dimensions   2(k-1)*2(l-1), where   2 k*2 l are the dimensions of the previous mipmap, until either
-%%   k= 0 or   l= 0. At that point, subsequent mipmaps have dimension   1*2(l-1) or   2(k-1)*1 until
-%% the final mipmap, which has dimension   1*1. To define the mipmaps, call  {@link gl:texImage1D/8} 
+%% resolutions. If the texture has dimensions   2 n×2 m, there are  max(n m)+1 mipmaps. The first
+%% mipmap is the original texture, with dimensions   2 n×2 m. Each subsequent mipmap has
+%% dimensions   2(k-1)×2(l-1), where   2 k×2 l are the dimensions of the previous mipmap, until either
+%%   k=0 or   l=0. At that point, subsequent mipmaps have dimension   1×2(l-1) or   2(k-1)×1 until
+%% the final mipmap, which has dimension   1×1. To define the mipmaps, call  {@link gl:texImage1D/8} 
 %% ,  {@link gl:texImage2D/9} ,  {@link gl:texImage3D/10} ,  {@link gl:copyTexImage1D/7} , or  {@link gl:copyTexImage2D/8} 
 %%  with the `level' argument indicating the order of the mipmaps. Level 0 is the original
-%% texture; level   max(n m) is the final   1*1 mipmap. 
+%% texture; level   max(n m) is the final   1×1 mipmap. 
 %%
 %%  `Params'  supplies a function for minifying the texture as one of the following: 
 %%
@@ -14695,13 +14697,12 @@ bindSampler(Unit,Sampler) ->
 %% `?GL_TEXTURE_COMPARE_FUNC':  Specifies the comparison operator used when `?GL_TEXTURE_COMPARE_MODE'
 %%  is set to `?GL_COMPARE_REF_TO_TEXTURE'. Permissible values are: <table><tbody><tr><td>
 %% ` Texture Comparison Function '</td><td>` Computed result  '</td></tr></tbody><tbody>
-%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
-%% result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;
-%% (D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp;
-%%  r=(D t) r&amp;ne;(D t))</td></tr><tr><td>`?GL_NOTEQUAL'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result= 1.0</td></tr><tr><td>
-%% `?GL_NEVER'</td><td> result= 0.0</td></tr></tbody></table> where  r is the current
+%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0    r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
+%% result={1.0 0.0    r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0    r&lt;(D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
+%% </td><td> result={1.0 0.0    r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0    r=(D t) r&amp;ne;
+%% (D t))</td></tr><tr><td>`?GL_NOTEQUAL'
+%% </td><td> result={1.0 0.0    r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result=1.0</td></tr><tr><td>
+%% `?GL_NEVER'</td><td> result=0.0</td></tr></tbody></table> where  r is the current
 %% interpolated texture coordinate, and   D t is the texture value sampled from the currently
 %% bound texture.  result is assigned to  R t. 
 %%
@@ -15774,11 +15775,11 @@ getProgramPipelineiv(Pipeline,Pname) ->
 %%
 %% The commands ``gl:programUniformMatrix{2|3|4|2x3|3x2|2x4|4x2|3x4|4x3}fv''  are used
 %% to modify a matrix or an array of matrices. The numbers in the command name are interpreted
-%% as the dimensionality of the matrix. The number `2' indicates a 2 � 2 matrix (i.e.,
-%% 4 values), the number `3' indicates a 3 � 3 matrix (i.e., 9 values), and the number `4'
-%%  indicates a 4 � 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
+%% as the dimensionality of the matrix. The number `2' indicates a 2 × 2 matrix (i.e.,
+%% 4 values), the number `3' indicates a 3 × 3 matrix (i.e., 9 values), and the number `4'
+%%  indicates a 4 × 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
 %% with the first number representing the number of columns and the second number representing
-%% the number of rows. For example,  `2x4' indicates a 2 � 4 matrix with 2 columns and
+%% the number of rows. For example,  `2x4' indicates a 2 × 4 matrix with 2 columns and
 %% 4 rows (i.e., 8 values). If  `Transpose'  is `?GL_FALSE', each matrix is assumed
 %% to be supplied in column major order. If  `Transpose'  is `?GL_TRUE', each matrix
 %% is assumed to be supplied in row major order. The  `Count'  argument indicates the
diff --git a/lib/wx/src/gen/glu.erl b/lib/wx/src/gen/glu.erl
index 2c82c9792f..dc64c3c3a7 100644
--- a/lib/wx/src/gen/glu.erl
+++ b/lib/wx/src/gen/glu.erl
@@ -1,7 +1,9 @@
+%% -*- coding: utf-8 -*-
+
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -91,19 +93,19 @@ tesselate({Nx,Ny,Nz}, Vs) ->
 %% ). 
 %%
 %%  A series of mipmap levels from  `Base'  to  `Max'  is built by decimating   `Data' 
-%%  in half  until size   1*1 is reached. At each level, each texel in the halved mipmap
+%%  in half  until size   1×1 is reached. At each level, each texel in the halved mipmap
 %% level is an average of the corresponding two texels in the larger mipmap level.   {@link gl:texImage1D/8} 
 %%  is called to load these mipmap levels from  `Base'  to  `Max' . If  `Max'  is
 %% larger than the highest mipmap level for the texture of the specified size, then a GLU
 %% error code is returned (see  {@link glu:errorString/1} ) and nothing is loaded. 
 %%
 %%  For example, if  `Level'  is 2 and  `Width'  is 16, the following levels are possible:
-%%   16*1,   8*1,   4*1,  2*1,   1*1. These correspond to levels 2 through 6 respectively.
-%% If  `Base'  is 3 and  `Max'  is 5, then only mipmap levels   8*1,  4*1 and   2*1
+%%   16×1,   8×1,   4×1,  2×1,   1×1. These correspond to levels 2 through 6 respectively.
+%% If  `Base'  is 3 and  `Max'  is 5, then only mipmap levels   8×1,  4×1 and   2×1
 %% are loaded. However, if  `Max'  is 7, then an error is returned and nothing is loaded
 %% since  `Max'  is larger than the highest mipmap level which is, in  this case, 6. 
 %%
-%%  The highest mipmap level can be derived from the formula  log 2(width*2 level). 
+%%  The highest mipmap level can be derived from the formula  log 2(width×2 level). 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Type'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -134,13 +136,13 @@ build1DMipmapLevels(Target,InternalFormat,Width,Format,Type,Level,Base,Max,Data)
 %% can fit the requested texture. If not,  `Width'  is continually halved until it fits. 
 %%
 %%  Next, a series of mipmap levels is built by decimating a copy of  `Data'  in half
-%% until size   1*1 is reached. At each level, each texel in the halved mipmap level is an
+%% until size   1×1 is reached. At each level, each texel in the halved mipmap level is an
 %% average of the corresponding two texels in the larger mipmap level. 
 %%
 %%  {@link gl:texImage1D/8}  is called to load each of these mipmap levels. Level 0 is a copy
 %% of  `Data' .  The highest level is  (log 2)(width). For example, if  `Width'  is 64 and the implementation
-%% can store a texture of this size, the following mipmap levels are built:   64*1,   32*1,
-%%   16*1,   8*1,  4*1,   2*1, and   1*1. These correspond to  levels 0 through 6, respectively.
+%% can store a texture of this size, the following mipmap levels are built:   64×1,   32×1,
+%%   16×1,   8×1,  4×1,   2×1, and   1×1. These correspond to  levels 0 through 6, respectively.
 %% 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
@@ -163,22 +165,22 @@ build1DMipmaps(Target,InternalFormat,Width,Format,Type,Data) ->
 %% ). 
 %%
 %%  A series of mipmap levels from  `Base'  to  `Max'  is built by decimating   `Data' 
-%%  in half along both dimensions until size   1*1 is reached. At each level, each texel
+%%  in half along both dimensions until size   1×1 is reached. At each level, each texel
 %% in the halved mipmap level is an average of the corresponding four texels in the larger
 %% mipmap level. (In the case of rectangular images, the decimation will ultimately  reach
-%% an   N*1 or   1*N configuration. Here, two texels are averaged instead.)  {@link gl:texImage2D/9} 
+%% an   N×1 or   1×N configuration. Here, two texels are averaged instead.)  {@link gl:texImage2D/9} 
 %%  is called to load these mipmap levels from  `Base'  to  `Max' . If  `Max'  is
 %% larger than the highest mipmap level for the texture of the specified size, then a GLU
 %% error code is returned (see  {@link glu:errorString/1} ) and nothing is loaded. 
 %%
 %%  For example, if  `Level'  is 2 and  `Width'  is 16 and  `Height'  is 8, the
-%% following levels are possible:   16*8,   8*4,   4*2,  2*1,   1*1. These correspond to
+%% following levels are possible:   16×8,   8×4,   4×2,  2×1,   1×1. These correspond to
 %% levels 2 through 6 respectively. If  `Base'  is 3 and  `Max'  is 5, then only mipmap
-%% levels  8*4,   4*2, and   2*1 are loaded. However, if  `Max'  is 7, then an error is
+%% levels  8×4,   4×2, and   2×1 are loaded. However, if  `Max'  is 7, then an error is
 %% returned and nothing is loaded since  `Max'  is larger than the highest mipmap level
 %% which is, in this case, 6. 
 %%
-%%  The highest mipmap level can be derived from the formula  log 2(max(width height)*2 level). 
+%%  The highest mipmap level can be derived from the formula  log 2(max(width height)×2 level). 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Format'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -214,15 +216,15 @@ build2DMipmapLevels(Target,InternalFormat,Width,Height,Format,Type,Level,Base,Ma
 %% .) 
 %%
 %%  Next, a series of mipmap levels is built by decimating a copy of  `Data'  in half
-%% along both dimensions until size   1*1 is reached. At each level, each texel in the halved
+%% along both dimensions until size   1×1 is reached. At each level, each texel in the halved
 %% mipmap level is an average of the corresponding four texels in the larger mipmap level.
-%% (In the case of rectangular images, the decimation will ultimately reach an   N*1 or  1*N
+%% (In the case of rectangular images, the decimation will ultimately reach an   N×1 or  1×N
 %% configuration. Here, two texels are averaged instead.) 
 %%
 %%  {@link gl:texImage2D/9}  is called to load each of these mipmap levels. Level 0 is a copy
 %% of  `Data' . The highest level is (log 2)(max(width height)). For example, if  `Width'  is 64 and  `Height' 
 %%  is 16 and the implementation can store a texture of this size, the following mipmap levels
-%% are built:   64*16,   32*8,   16*4,  8*2,   4*1,   2*1, and   1*1 These correspond to
+%% are built:   64×16,   32×8,   16×4,  8×2,   4×1,   2×1, and   1×1 These correspond to
 %% levels 0 through 6, respectively. 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
@@ -245,7 +247,7 @@ build2DMipmaps(Target,InternalFormat,Width,Height,Format,Type,Data) ->
 %% ). 
 %%
 %%  A series of mipmap levels from  `Base'  to  `Max'  is built by decimating  `Data' 
-%%  in half along both dimensions until size  1*1*1 is reached. At each level, each texel
+%%  in half along both dimensions until size  1×1×1 is reached. At each level, each texel
 %% in the halved mipmap level is an average of the corresponding eight texels in the larger
 %% mipmap level. (If exactly one of the dimensions is 1, four texels are averaged. If exactly
 %% two of the dimensions are 1, two texels are averaged.)  {@link gl:texImage3D/10}  is called
@@ -254,13 +256,13 @@ build2DMipmaps(Target,InternalFormat,Width,Height,Format,Type,Data) ->
 %% is returned (see  {@link glu:errorString/1} ) and nothing is loaded. 
 %%
 %%  For example, if  `Level'  is 2 and  `Width'  is 16,  `Height'  is 8 and  `Depth' 
-%%  is 4, the following levels are possible:   16*8*4,   8*4*2,  4*2*1,   2*1*1,  1*1*1.
+%%  is 4, the following levels are possible:   16×8×4,   8×4×2,  4×2×1,   2×1×1,  1×1×1.
 %% These correspond to levels 2 through 6 respectively. If  `Base'  is 3 and  `Max' 
-%% is 5, then only mipmap levels   8*4*2,  4*2*1, and   2*1*1 are loaded. However, if  `Max' 
+%% is 5, then only mipmap levels   8×4×2,  4×2×1, and   2×1×1 are loaded. However, if  `Max' 
 %%  is 7, then an error is returned and nothing is loaded, since  `Max'  is larger than
 %% the highest mipmap level which is, in this case, 6. 
 %%
-%%  The highest mipmap level can be derived from the formula  log 2(max(width height depth)*2 level). 
+%%  The highest mipmap level can be derived from the formula  log 2(max(width height depth)×2 level). 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Format'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -295,7 +297,7 @@ build3DMipmapLevels(Target,InternalFormat,Width,Height,Depth,Format,Type,Level,B
 %% it fits.  
 %%
 %%  Next, a series of mipmap levels is built by decimating a copy of  `Data'  in half
-%% along all three dimensions until size   1*1*1 is reached. At each level, each texel in
+%% along all three dimensions until size   1×1×1 is reached. At each level, each texel in
 %% the halved mipmap level is an average of the corresponding eight texels in the larger
 %% mipmap level. (If exactly one of the dimensions is 1, four texels are averaged. If exactly
 %% two of the dimensions are 1, two texels are averaged.) 
@@ -303,8 +305,8 @@ build3DMipmapLevels(Target,InternalFormat,Width,Height,Depth,Format,Type,Level,B
 %%  {@link gl:texImage3D/10}  is called to load each of these mipmap levels. Level 0 is a copy
 %% of  `Data' . The highest level is (log 2)(max(width height depth)). For example, if  `Width'  is 64,  `Height' 
 %% is 16, and  `Depth'  is 32, and the implementation can store a texture of this size,
-%% the following mipmap levels are built:   64*16*32,  32*8*16,   16*4*8,  8*2*4,   4*1*2, 
-%% 2*1*1, and   1*1*1. These correspond to levels 0 through 6, respectively. 
+%% the following mipmap levels are built:   64×16×32,  32×8×16,   16×4×8,  8×2×4,   4×1×2, 
+%% 2×1×1, and   1×1×1. These correspond to levels 0 through 6, respectively. 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Format'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -334,7 +336,7 @@ checkExtension(ExtName,ExtString) ->
 %% @doc Draw a cylinder
 %%
 %% ``glu:cylinder'' draws a cylinder oriented along the `z' axis. The base of the
-%% cylinder is placed at `z' = 0 and the top at   z= height. Like a sphere, a cylinder
+%% cylinder is placed at `z' = 0 and the top at   z=height. Like a sphere, a cylinder
 %% is subdivided around the `z' axis into slices and along the  `z' axis into stacks.
 %% 
 %%
@@ -380,7 +382,7 @@ deleteQuadric(Quad) ->
 %% the -`z'  axis. 
 %%
 %%  If texturing has been turned on (with  {@link glu:quadricTexture/2} ),  texture coordinates
-%% are generated linearly such that where   r= outer, the value at (`r', 0, 0) is  (1,
+%% are generated linearly such that where   r=outer, the value at (`r', 0, 0) is  (1,
 %% 0.5), at (0, `r', 0) it is (0.5, 1), at (-`r', 0, 0)  it is (0, 0.5), and  at
 %% (0, -`r', 0) it is (0.5, 0). 
 %%
@@ -451,11 +453,11 @@ getString(Name) ->
 %%
 %%  Let `UP' be the vector  (upX upY upZ).  
 %%
-%%  Then normalize as follows:   f= F/(||F||)
+%%  Then normalize as follows:   f=F/(||F||)
 %%
-%%  UP"= UP/(||UP||)
+%%  UP"=UP/(||UP||)
 %%
-%%  Finally, let   s= f*UP", and   u= s*f. 
+%%  Finally, let   s=f×UP", and   u=s×f. 
 %%
 %%  M is then constructed as follows:  M=(s[0] s[1] s[2] 0 u[0] u[1] u[2] 0-f[0]-f[1]-f[2] 0 0 0 0 1)
 %%
@@ -481,7 +483,7 @@ newQuadric() ->
 %% @doc Define a 2D orthographic projection matrix
 %%
 %% ``glu:ortho2D'' sets up a two-dimensional orthographic viewing region.  This is equivalent
-%% to calling  {@link gl:ortho/6}  with   near= -1 and   far= 1. 
+%% to calling  {@link gl:ortho/6}  with   near=-1 and   far=1. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluOrtho2D.xml">external</a> documentation.
 -spec ortho2D(Left, Right, Bottom, Top) -> ok when Left :: float(),Right :: float(),Bottom :: float(),Top :: float().
@@ -490,7 +492,7 @@ ortho2D(Left,Right,Bottom,Top) ->
 
 %% @doc Draw an arc of a disk
 %%
-%% ``glu:partialDisk'' renders a partial disk on the   z= 0 plane. A partial disk is  similar
+%% ``glu:partialDisk'' renders a partial disk on the   z=0 plane. A partial disk is  similar
 %% to a full disk, except that only the subset of the disk from  `Start'  through  `Start' 
 %%  +  `Sweep'  is included (where 0 degrees is along the  +f2yf axis, 90 degrees along
 %% the +`x' axis, 180 degrees along the -`y' axis, and  270 degrees along the -`x'
@@ -508,7 +510,7 @@ ortho2D(Left,Right,Bottom,Top) ->
 %% Otherwise, they point along the -`z'  axis. 
 %%
 %%  If texturing is turned on (with  {@link glu:quadricTexture/2} ), texture coordinates are
-%% generated linearly such that where   r= outer, the value at (`r', 0, 0) is  (1.0,
+%% generated linearly such that where   r=outer, the value at (`r', 0, 0) is  (1.0,
 %% 0.5), at (0, `r', 0) it is (0.5, 1.0), at (-`r', 0, 0)  it is (0.0, 0.5), and
 %%  at (0, -`r', 0) it is (0.5, 0.0). 
 %%
@@ -521,7 +523,7 @@ partialDisk(Quad,Inner,Outer,Slices,Loops,Start,Sweep) ->
 %%
 %% ``glu:perspective'' specifies a viewing frustum into the world coordinate system. In
 %% general, the aspect ratio in ``glu:perspective'' should match the aspect ratio of the
-%% associated viewport. For example,   aspect= 2.0 means  the viewer's angle of view is twice
+%% associated viewport. For example,   aspect=2.0 means  the viewer's angle of view is twice
 %% as wide in `x' as it is in `y'. If the viewport is twice as wide as it is tall,
 %% it displays the image without distortion. 
 %%
@@ -532,9 +534,9 @@ partialDisk(Quad,Inner,Outer,Slices,Loops,Start,Sweep) ->
 %%
 %%  Given `f' defined as follows: 
 %%
-%%  f= cotangent(fovy/2) The generated matrix is 
+%%  f=cotangent(fovy/2) The generated matrix is 
 %%
-%% (f/aspect 0 0 0 0 f 0 0 0 0(zFar+zNear)/(zNear-zFar)(2*zFar*zNear)/(zNear-zFar) 0 0 -1 0)
+%% (f/aspect 0 0 0 0 f 0 0 0 0(zFar+zNear)/(zNear-zFar)(2×zFar×zNear)/(zNear-zFar) 0 0 -1 0)
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluPerspective.xml">external</a> documentation.
 -spec perspective(Fovy, Aspect, ZNear, ZFar) -> ok when Fovy :: float(),Aspect :: float(),ZNear :: float(),ZFar :: float().
@@ -577,16 +579,16 @@ pickMatrix(X,Y,DelX,DelY,{V1,V2,V3,V4}) ->
 %%  To compute the coordinates, let   v=(objX objY objZ 1.0) represented as a matrix with 4 rows and 1 column.
 %% Then ``glu:project'' computes   v" as follows:  
 %%
-%%  v"= P*M*v
+%%  v"=P×M×v
 %%
 %%  where   P is the current projection matrix  `Proj'  and   M is the current modelview
-%% matrix  `Model'  (both represented as  4*4 matrices in column-major order). 
+%% matrix  `Model'  (both represented as  4×4 matrices in column-major order). 
 %%
 %%  The window coordinates are then computed as follows:  
 %%
-%%  winX= view(0)+view(2)*(v"(0)+1)/2
+%%  winX=view(0)+view(2)×(v"(0)+1)/2
 %%
-%%  winY= view(1)+view(3)*(v"(1)+1)/2
+%%  winY=view(1)+view(3)×(v"(1)+1)/2
 %%
 %%  winZ=(v"(2)+1)/2
 %%
@@ -703,7 +705,7 @@ scaleImage(Format,WIn,HIn,TypeIn,DataIn,WOut,HOut,TypeOut,DataOut) ->
 %% point toward the center of the sphere. 
 %%
 %%  If texturing is turned on (with  {@link glu:quadricTexture/2} ), then texture  coordinates
-%% are  generated so that `t' ranges from 0.0 at   z=-radius to 1.0 at   z= radius (`t'
+%% are  generated so that `t' ranges from 0.0 at   z=-radius to 1.0 at   z=radius (`t'
 %%  increases linearly along longitudinal lines), and `s' ranges from 0.0 at the +`y'
 %%  axis, to 0.25 at the  +`x' axis,  to 0.5 at the -`y' axis, to 0.75 at the -`x'
 %%  axis, and back to 1.0  at the +`y' axis. 
@@ -723,7 +725,7 @@ sphere(Quad,Radius,Slices,Stacks) ->
 %%  To compute the coordinates  (objX objY objZ), ``glu:unProject'' multiplies the normalized device coordinates
 %% by the inverse of  `Model'  *  `Proj'  as follows: 
 %%
-%% (objX objY objZ W)= INV(P  M) ((2(winX-view[0]))/(view[2])-1(2(winY-view[1]))/(view[3])-1 2(winZ)-1 1) INV denotes matrix inversion.  W is an unused variable, included for consistent
+%% (objX objY objZ W)=INV(P  M) ((2(winX-view[0]))/(view[2])-1(2(winY-view[1]))/(view[3])-1 2(winZ)-1 1) INV denotes matrix inversion.  W is an unused variable, included for consistent
 %% matrix notation. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluUnProject.xml">external</a> documentation.
diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl
index 01d171800b..2a476c5e92 100644
--- a/lib/wx/src/gen/wxCalendarCtrl.erl
+++ b/lib/wx/src/gen/wxCalendarCtrl.erl
@@ -75,6 +75,8 @@
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxCalendarCtrl/0]).
+-deprecated([enableYearChange/1,enableYearChange/2]).
+
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
diff --git a/lib/wx/src/gen/wxClientDC.erl b/lib/wx/src/gen/wxClientDC.erl
index 7dfebe4068..cb75fdc58d 100644
--- a/lib/wx/src/gen/wxClientDC.erl
+++ b/lib/wx/src/gen/wxClientDC.erl
@@ -54,6 +54,8 @@
   startPage/1]).
 
 -export_type([wxClientDC/0]).
+-deprecated([new/0]).
+
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
diff --git a/lib/wx/src/gen/wxClipboard.erl b/lib/wx/src/gen/wxClipboard.erl
index 8f1d59f603..c7336fcc47 100644
--- a/lib/wx/src/gen/wxClipboard.erl
+++ b/lib/wx/src/gen/wxClipboard.erl
@@ -130,8 +130,9 @@ usePrimarySelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardissupported">external documentation</a>.
+%%<br /> Format = ?wxDF_INVALID | ?wxDF_TEXT | ?wxDF_BITMAP | ?wxDF_METAFILE | ?wxDF_SYLK | ?wxDF_DIF | ?wxDF_TIFF | ?wxDF_OEMTEXT | ?wxDF_DIB | ?wxDF_PALETTE | ?wxDF_PENDATA | ?wxDF_RIFF | ?wxDF_WAVE | ?wxDF_UNICODETEXT | ?wxDF_ENHMETAFILE | ?wxDF_FILENAME | ?wxDF_LOCALE | ?wxDF_PRIVATE | ?wxDF_HTML | ?wxDF_MAX
 -spec isSupported(This, Format) -> boolean() when
-	This::wxClipboard(), Format::integer().
+	This::wxClipboard(), Format::wx:wx_enum().
 isSupported(#wx_ref{type=ThisT,ref=ThisRef},Format)
  when is_integer(Format) ->
   ?CLASS(ThisT,wxClipboard),
diff --git a/lib/wx/src/gen/wxCursor.erl b/lib/wx/src/gen/wxCursor.erl
index b9e3a8e3f7..423e444f2f 100644
--- a/lib/wx/src/gen/wxCursor.erl
+++ b/lib/wx/src/gen/wxCursor.erl
@@ -35,6 +35,8 @@
   saveFile/4,setDepth/2,setHeight/2,setMask/2,setPalette/2,setWidth/2]).
 
 -export_type([wxCursor/0]).
+-deprecated([new/3,new/4]).
+
 %% @hidden
 parent_class(wxBitmap) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxDC.erl b/lib/wx/src/gen/wxDC.erl
index 9f57978849..42d5d7b1df 100644
--- a/lib/wx/src/gen/wxDC.erl
+++ b/lib/wx/src/gen/wxDC.erl
@@ -50,6 +50,8 @@
 -export([parent_class/1]).
 
 -export_type([wxDC/0]).
+-deprecated([computeScaleAndOrigin/1]).
+
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
@@ -63,9 +65,10 @@ blit(This,DestPt={DestPtX,DestPtY},Sz={SzW,SzH},Source,SrcPt={SrcPtX,SrcPtY})
   blit(This,DestPt,Sz,Source,SrcPt, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcblit">external documentation</a>.
+%%<br /> Rop = integer
 -spec blit(This, DestPt, Sz, Source, SrcPt, [Option]) -> boolean() when
 	This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()},
-	Option :: {rop, integer()}
+	Option :: {rop, wx:wx_enum()}
 		 | {useMask, boolean()}
 		 | {srcPtMask, {X::integer(), Y::integer()}}.
 blit(#wx_ref{type=ThisT,ref=ThisRef},{DestPtX,DestPtY},{SzW,SzH},#wx_ref{type=SourceT,ref=SourceRef},{SrcPtX,SrcPtY}, Options)
@@ -310,11 +313,12 @@ drawPolygon(This,Points)
   drawPolygon(This,Points, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawpolygon">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec drawPolygon(This, Points, [Option]) -> ok when
 	This::wxDC(), Points::[{X::integer(), Y::integer()}],
 	Option :: {xoffset, integer()}
 		 | {yoffset, integer()}
-		 | {fillStyle, integer()}.
+		 | {fillStyle, wx:wx_enum()}.
 drawPolygon(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
  when is_list(Points),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -417,9 +421,10 @@ floodFill(This,Pt={PtX,PtY},Col)
   floodFill(This,Pt,Col, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcfloodfill">external documentation</a>.
+%%<br /> Style = integer
 -spec floodFill(This, Pt, Col, [Option]) -> boolean() when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:wx_colour(),
-	Option :: {style, integer()}.
+	Option :: {style, wx:wx_enum()}.
 floodFill(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Col, Options)
  when is_integer(PtX),is_integer(PtY),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4,is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -855,8 +860,9 @@ setLayoutDirection(#wx_ref{type=ThisT,ref=ThisRef},Dir)
   <<ThisRef:32/?UI,Dir:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetlogicalfunction">external documentation</a>.
+%%<br /> Function = integer
 -spec setLogicalFunction(This, Function) -> ok when
-	This::wxDC(), Function::integer().
+	This::wxDC(), Function::wx:wx_enum().
 setLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef},Function)
  when is_integer(Function) ->
   ?CLASS(ThisT,wxDC),
@@ -864,8 +870,9 @@ setLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef},Function)
   <<ThisRef:32/?UI,Function:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetmapmode">external documentation</a>.
+%%<br /> Mode = integer
 -spec setMapMode(This, Mode) -> ok when
-	This::wxDC(), Mode::integer().
+	This::wxDC(), Mode::wx:wx_enum().
 setMapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxDC),
diff --git a/lib/wx/src/gen/wxGraphicsContext.erl b/lib/wx/src/gen/wxGraphicsContext.erl
index 1dfa0dd405..575e48d7af 100644
--- a/lib/wx/src/gen/wxGraphicsContext.erl
+++ b/lib/wx/src/gen/wxGraphicsContext.erl
@@ -40,6 +40,8 @@
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
 -export_type([wxGraphicsContext/0]).
+-deprecated([createLinearGradientBrush/7,createRadialGradientBrush/8]).
+
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
@@ -225,9 +227,10 @@ drawLines(This,Points)
   drawLines(This,Points, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawlines">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec drawLines(This, Points, [Option]) -> ok when
 	This::wxGraphicsContext(), Points::[{X::float(), Y::float()}],
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 drawLines(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
  when is_list(Points),is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -247,9 +250,10 @@ drawPath(This,Path)
   drawPath(This,Path, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawpath">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec drawPath(This, Path, [Option]) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 drawPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -331,9 +335,10 @@ fillPath(This,Path)
   fillPath(This,Path, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextfillpath">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec fillPath(This, Path, [Option]) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 fillPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
diff --git a/lib/wx/src/gen/wxGraphicsPath.erl b/lib/wx/src/gen/wxGraphicsPath.erl
index 56b853899a..246ea489ec 100644
--- a/lib/wx/src/gen/wxGraphicsPath.erl
+++ b/lib/wx/src/gen/wxGraphicsPath.erl
@@ -197,13 +197,14 @@ contains(This,C={CX,CY})
 %% <br /> Also:<br />
 %% contains(This, C, [Option]) -> boolean() when<br />
 %% 	This::wxGraphicsPath(), C::{X::float(), Y::float()},<br />
-%% 	Option :: {fillStyle, integer()}.<br />
+%% 	Option :: {fillStyle, wx:wx_enum()}.<br />
 %% 
+%%<br /> FillStyle = integer
 -spec contains(This, X, Y) -> boolean() when
 	This::wxGraphicsPath(), X::number(), Y::number();
       (This, C, [Option]) -> boolean() when
 	This::wxGraphicsPath(), C::{X::float(), Y::float()},
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 
 contains(This,X,Y)
  when is_record(This, wx_ref),is_number(X),is_number(Y) ->
@@ -218,9 +219,10 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY}, Options)
   <<ThisRef:32/?UI,0:32,CX:64/?F,CY:64/?F, BinOpt/binary>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec contains(This, X, Y, [Option]) -> boolean() when
 	This::wxGraphicsPath(), X::number(), Y::number(),
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
  when is_number(X),is_number(Y),is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsPath),
diff --git a/lib/wx/src/gen/wxGraphicsRenderer.erl b/lib/wx/src/gen/wxGraphicsRenderer.erl
index 21082bde23..2b64f86182 100644
--- a/lib/wx/src/gen/wxGraphicsRenderer.erl
+++ b/lib/wx/src/gen/wxGraphicsRenderer.erl
@@ -32,6 +32,8 @@
 -export([parent_class/1]).
 
 -export_type([wxGraphicsRenderer/0]).
+-deprecated([createLinearGradientBrush/7,createRadialGradientBrush/8]).
+
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
diff --git a/lib/wx/src/gen/wxGridCellEditor.erl b/lib/wx/src/gen/wxGridCellEditor.erl
index e84cdeb49a..4f86e307b5 100644
--- a/lib/wx/src/gen/wxGridCellEditor.erl
+++ b/lib/wx/src/gen/wxGridCellEditor.erl
@@ -31,6 +31,8 @@
 -export([parent_class/1]).
 
 -export_type([wxGridCellEditor/0]).
+-deprecated([endEdit/4,paintBackground/3]).
+
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
diff --git a/lib/wx/src/gen/wxIdleEvent.erl b/lib/wx/src/gen/wxIdleEvent.erl
index 4749026446..a19fdcc48e 100644
--- a/lib/wx/src/gen/wxIdleEvent.erl
+++ b/lib/wx/src/gen/wxIdleEvent.erl
@@ -38,6 +38,8 @@
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
 -export_type([wxIdleEvent/0]).
+-deprecated([canSend/1]).
+
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxImage.erl b/lib/wx/src/gen/wxImage.erl
index c21b5d4789..0edaee2979 100644
--- a/lib/wx/src/gen/wxImage.erl
+++ b/lib/wx/src/gen/wxImage.erl
@@ -424,9 +424,10 @@ getImageCount(Name)
   getImageCount(Name, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimagecount">external documentation</a>.
+%%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
 -spec getImageCount(Name, [Option]) -> integer() when
 	Name::unicode:chardata(),
-	Option :: {type, integer()}.
+	Option :: {type, wx:wx_enum()}.
 getImageCount(Name, Options)
  when is_list(Name),is_list(Options) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
@@ -687,9 +688,10 @@ rescale(This,Width,Height)
   rescale(This,Width,Height, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerescale">external documentation</a>.
+%%<br /> Quality = integer
 -spec rescale(This, Width, Height, [Option]) -> wxImage() when
 	This::wxImage(), Width::integer(), Height::integer(),
-	Option :: {quality, integer()}.
+	Option :: {quality, wx:wx_enum()}.
 rescale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -819,9 +821,10 @@ scale(This,Width,Height)
   scale(This,Width,Height, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagescale">external documentation</a>.
+%%<br /> Quality = integer
 -spec scale(This, Width, Height, [Option]) -> wxImage() when
 	This::wxImage(), Width::integer(), Height::integer(),
-	Option :: {quality, integer()}.
+	Option :: {quality, wx:wx_enum()}.
 scale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl
index 344dcdbbaf..bfdba336f8 100644
--- a/lib/wx/src/gen/wxMDIClientWindow.erl
+++ b/lib/wx/src/gen/wxMDIClientWindow.erl
@@ -69,6 +69,8 @@
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxMDIClientWindow/0]).
+-deprecated([new/1,new/2]).
+
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
diff --git a/lib/wx/src/gen/wxMouseEvent.erl b/lib/wx/src/gen/wxMouseEvent.erl
index 97ea9e908f..29a4f13ba8 100644
--- a/lib/wx/src/gen/wxMouseEvent.erl
+++ b/lib/wx/src/gen/wxMouseEvent.erl
@@ -19,7 +19,7 @@
 
 %% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html">wxMouseEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
-%% <dd><em>left_down</em>, <em>left_up</em>, <em>middle_down</em>, <em>middle_up</em>, <em>right_down</em>, <em>right_up</em>, <em>motion</em>, <em>enter_window</em>, <em>leave_window</em>, <em>left_dclick</em>, <em>middle_dclick</em>, <em>right_dclick</em>, <em>mousewheel</em>, <em>nc_left_down</em>, <em>nc_left_up</em>, <em>nc_middle_down</em>, <em>nc_middle_up</em>, <em>nc_right_down</em>, <em>nc_right_up</em>, <em>nc_motion</em>, <em>nc_enter_window</em>, <em>nc_leave_window</em>, <em>nc_left_dclick</em>, <em>nc_middle_dclick</em>, <em>nc_right_dclick</em></dd></dl>
+%% <dd><em>left_down</em>, <em>left_up</em>, <em>middle_down</em>, <em>middle_up</em>, <em>right_down</em>, <em>right_up</em>, <em>motion</em>, <em>enter_window</em>, <em>leave_window</em>, <em>left_dclick</em>, <em>middle_dclick</em>, <em>right_dclick</em>, <em>mousewheel</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMouse(). #wxMouse{}} event record type.
 %%
 %% <p>This class is derived (and can use functions) from:
diff --git a/lib/wx/src/gen/wxPageSetupDialogData.erl b/lib/wx/src/gen/wxPageSetupDialogData.erl
index 7c453a9872..4850e62925 100644
--- a/lib/wx/src/gen/wxPageSetupDialogData.erl
+++ b/lib/wx/src/gen/wxPageSetupDialogData.erl
@@ -194,7 +194,8 @@ getMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpaperid">external documentation</a>.
--spec getPaperId(This) -> integer() when
+%%<br /> Res = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
+-spec getPaperId(This) -> wx:wx_enum() when
 	This::wxPageSetupDialogData().
 getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
@@ -280,8 +281,9 @@ setMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpaperid">external documentation</a>.
+%%<br /> Id = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperId(This, Id) -> ok when
-	This::wxPageSetupDialogData(), Id::integer().
+	This::wxPageSetupDialogData(), Id::wx:wx_enum().
 setPaperId(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
@@ -293,8 +295,9 @@ setPaperId(#wx_ref{type=ThisT,ref=ThisRef},Id)
 %% setPaperSize(This, Sz) -> ok when<br />
 %% 	This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}.<br />
 %% 
+%%<br /> Id = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperSize(This, Id) -> ok when
-	This::wxPageSetupDialogData(), Id::integer();
+	This::wxPageSetupDialogData(), Id::wx:wx_enum();
       (This, Sz) -> ok when
 	This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}.
 setPaperSize(#wx_ref{type=ThisT,ref=ThisRef},Id)
diff --git a/lib/wx/src/gen/wxPaintDC.erl b/lib/wx/src/gen/wxPaintDC.erl
index 9e81bc31af..6648f278bb 100644
--- a/lib/wx/src/gen/wxPaintDC.erl
+++ b/lib/wx/src/gen/wxPaintDC.erl
@@ -54,6 +54,8 @@
   startPage/1]).
 
 -export_type([wxPaintDC/0]).
+-deprecated([new/0]).
+
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
diff --git a/lib/wx/src/gen/wxPaintEvent.erl b/lib/wx/src/gen/wxPaintEvent.erl
index a13db607a4..80ac7d78ce 100644
--- a/lib/wx/src/gen/wxPaintEvent.erl
+++ b/lib/wx/src/gen/wxPaintEvent.erl
@@ -19,7 +19,7 @@
 
 %% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintevent.html">wxPaintEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
-%% <dd><em>paint</em>, <em>paint_icon</em></dd></dl>
+%% <dd><em>paint</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxPaint(). #wxPaint{}} event record type.
 %%
 %% <p>This class is derived (and can use functions) from:
diff --git a/lib/wx/src/gen/wxPen.erl b/lib/wx/src/gen/wxPen.erl
index 8b8aafddba..681a7edebc 100644
--- a/lib/wx/src/gen/wxPen.erl
+++ b/lib/wx/src/gen/wxPen.erl
@@ -113,8 +113,9 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcap">external documentation</a>.
+%%<br /> CapStyle = integer
 -spec setCap(This, CapStyle) -> ok when
-	This::wxPen(), CapStyle::integer().
+	This::wxPen(), CapStyle::wx:wx_enum().
 setCap(#wx_ref{type=ThisT,ref=ThisRef},CapStyle)
  when is_integer(CapStyle) ->
   ?CLASS(ThisT,wxPen),
@@ -140,8 +141,9 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
   <<ThisRef:32/?UI,Red:32/?UI,Green:32/?UI,Blue:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetjoin">external documentation</a>.
+%%<br /> JoinStyle = integer
 -spec setJoin(This, JoinStyle) -> ok when
-	This::wxPen(), JoinStyle::integer().
+	This::wxPen(), JoinStyle::wx:wx_enum().
 setJoin(#wx_ref{type=ThisT,ref=ThisRef},JoinStyle)
  when is_integer(JoinStyle) ->
   ?CLASS(ThisT,wxPen),
diff --git a/lib/wx/src/gen/wxPostScriptDC.erl b/lib/wx/src/gen/wxPostScriptDC.erl
index 2eb25b6a8e..5329d4562e 100644
--- a/lib/wx/src/gen/wxPostScriptDC.erl
+++ b/lib/wx/src/gen/wxPostScriptDC.erl
@@ -53,6 +53,8 @@
   startPage/1]).
 
 -export_type([wxPostScriptDC/0]).
+-deprecated([getResolution/0,setResolution/1]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxPrintData.erl b/lib/wx/src/gen/wxPrintData.erl
index 2cb8dd3c5f..79ba26afab 100644
--- a/lib/wx/src/gen/wxPrintData.erl
+++ b/lib/wx/src/gen/wxPrintData.erl
@@ -102,7 +102,8 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetpaperid">external documentation</a>.
--spec getPaperId(This) -> integer() when
+%%<br /> Res = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
+-spec getPaperId(This) -> wx:wx_enum() when
 	This::wxPrintData().
 getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
@@ -190,8 +191,9 @@ setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetpaperid">external documentation</a>.
+%%<br /> SizeId = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperId(This, SizeId) -> ok when
-	This::wxPrintData(), SizeId::integer().
+	This::wxPrintData(), SizeId::wx:wx_enum().
 setPaperId(#wx_ref{type=ThisT,ref=ThisRef},SizeId)
  when is_integer(SizeId) ->
   ?CLASS(ThisT,wxPrintData),
diff --git a/lib/wx/src/gen/wxPrintout.erl b/lib/wx/src/gen/wxPrintout.erl
index ab96a09c09..c75edd2b5a 100644
--- a/lib/wx/src/gen/wxPrintout.erl
+++ b/lib/wx/src/gen/wxPrintout.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +61,8 @@ new(Title, OnPrintPage) ->
 %%   <pre>OnBeginDocument(This,StartPage,EndPage) -> boolean()  </pre>
 %%   <pre>OnEndDocument(This) -> term()  </pre>
 %%   <pre>HasPage(This,Page)} -> boolean()   </pre>
-%%   <pre>GetPageInfo(This) -> {MinPage:.integer(), MaxPage::integer(), PageFrom::integer(), PageTo::integer()}  </pre>
+%%   <pre>GetPageInfo(This) -> {MinPage::integer(), MaxPage::integer(),
+%%                              PageFrom::integer(), PageTo::integer()}  </pre>
 %%  The <b>This</b> argument is the wxPrintout object reference to this object
 %%  <br /> NOTE: The callbacks may not call other processes. 
 new(Title, OnPrintPage, Opts) when is_list(Title), is_function(OnPrintPage), is_list(Opts) ->
diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl
index f6dc2176b7..55ac410407 100644
--- a/lib/wx/src/gen/wxStyledTextCtrl.erl
+++ b/lib/wx/src/gen/wxStyledTextCtrl.erl
@@ -95,18 +95,18 @@
   redo/1,registerImage/3,replaceSelection/2,replaceTarget/2,saveFile/2,
   scrollToColumn/2,scrollToLine/2,searchAnchor/1,searchInTarget/2,searchNext/3,
   searchPrev/3,selectAll/1,selectionDuplicate/1,selectionIsRectangle/1,
-  sendMsg/2,sendMsg/3,setAnchor/2,setBackSpaceUnIndents/2,setBufferedDraw/2,
-  setCaretForeground/2,setCaretLineBackAlpha/2,setCaretLineBackground/2,
-  setCaretLineVisible/2,setCaretPeriod/2,setCaretSticky/2,setCaretWidth/2,
-  setCharsDefault/1,setCodePage/2,setControlCharSymbol/2,setCurrentPos/2,
-  setEOLMode/2,setEdgeColour/2,setEdgeColumn/2,setEdgeMode/2,setFoldExpanded/3,
-  setFoldFlags/2,setFoldLevel/3,setFoldMarginColour/3,setFoldMarginHiColour/3,
-  setHScrollBar/2,setHighlightGuide/2,setHotspotActiveBackground/3,
-  setHotspotActiveForeground/3,setHotspotActiveUnderline/2,setHotspotSingleLine/2,
-  setIndent/2,setIndentationGuides/2,setKeyWords/3,setLastKeydownProcessed/2,
-  setLayoutCache/2,setLexer/2,setLexerLanguage/2,setLineIndentation/3,
-  setLineState/3,setMarginLeft/2,setMarginMask/3,setMarginRight/2,setMarginSensitive/3,
-  setMarginType/3,setMarginWidth/3,setMargins/3,setModEventMask/2,setMouseDownCaptures/2,
+  setAnchor/2,setBackSpaceUnIndents/2,setBufferedDraw/2,setCaretForeground/2,
+  setCaretLineBackAlpha/2,setCaretLineBackground/2,setCaretLineVisible/2,
+  setCaretPeriod/2,setCaretSticky/2,setCaretWidth/2,setCharsDefault/1,
+  setCodePage/2,setControlCharSymbol/2,setCurrentPos/2,setEOLMode/2,
+  setEdgeColour/2,setEdgeColumn/2,setEdgeMode/2,setFoldExpanded/3,setFoldFlags/2,
+  setFoldLevel/3,setFoldMarginColour/3,setFoldMarginHiColour/3,setHScrollBar/2,
+  setHighlightGuide/2,setHotspotActiveBackground/3,setHotspotActiveForeground/3,
+  setHotspotActiveUnderline/2,setHotspotSingleLine/2,setIndent/2,setIndentationGuides/2,
+  setKeyWords/3,setLastKeydownProcessed/2,setLayoutCache/2,setLexer/2,
+  setLexerLanguage/2,setLineIndentation/3,setLineState/3,setMarginLeft/2,
+  setMarginMask/3,setMarginRight/2,setMarginSensitive/3,setMarginType/3,
+  setMarginWidth/3,setMargins/3,setModEventMask/2,setMouseDownCaptures/2,
   setMouseDwellTime/2,setPasteConvertEndings/2,setPrintColourMode/2,
   setPrintMagnification/2,setProperty/3,setReadOnly/2,setSTCCursor/2,
   setSTCFocus/2,setSavePoint/1,setScrollWidth/2,setSearchFlags/2,setSelAlpha/2,
@@ -3897,29 +3897,6 @@ scrollToColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
   wxe_util:cast(?wxStyledTextCtrl_ScrollToColumn,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @equiv sendMsg(This,Msg, [])
--spec sendMsg(This, Msg) -> integer() when
-	This::wxStyledTextCtrl(), Msg::integer().
-
-sendMsg(This,Msg)
- when is_record(This, wx_ref),is_integer(Msg) ->
-  sendMsg(This,Msg, []).
-
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsendmsg">external documentation</a>.
--spec sendMsg(This, Msg, [Option]) -> integer() when
-	This::wxStyledTextCtrl(), Msg::integer(),
-	Option :: {wp, integer()}
-		 | {lp, integer()}.
-sendMsg(#wx_ref{type=ThisT,ref=ThisRef},Msg, Options)
- when is_integer(Msg),is_list(Options) ->
-  ?CLASS(ThisT,wxStyledTextCtrl),
-  MOpts = fun({wp, Wp}, Acc) -> [<<1:32/?UI,Wp:32/?UI>>|Acc];
-          ({lp, Lp}, Acc) -> [<<2:32/?UI,Lp:32/?UI>>|Acc];
-          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
-  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
-  wxe_util:call(?wxStyledTextCtrl_SendMsg,
-  <<ThisRef:32/?UI,Msg:32/?UI, BinOpt/binary>>).
-
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvscrollbar">external documentation</a>.
 -spec setVScrollBar(This, Bar) -> ok when
 	This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar().
diff --git a/lib/wx/src/gen/wxSystemSettings.erl b/lib/wx/src/gen/wxSystemSettings.erl
index a3bae5c85f..630162afd2 100644
--- a/lib/wx/src/gen/wxSystemSettings.erl
+++ b/lib/wx/src/gen/wxSystemSettings.erl
@@ -35,7 +35,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSystemSettings() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>.
-%%<br /> Index = ?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
+%%<br /> Index = ?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_LISTBOXHIGHLIGHTTEXT | ?wxSYS_COLOUR_MAX
 -spec getColour(Index) -> wx:wx_colour4() when
 	Index::wx:wx_enum().
 getColour(Index)
diff --git a/lib/wx/src/gen/wxWindowDC.erl b/lib/wx/src/gen/wxWindowDC.erl
index babb3c0e90..4515f0e6b9 100644
--- a/lib/wx/src/gen/wxWindowDC.erl
+++ b/lib/wx/src/gen/wxWindowDC.erl
@@ -53,6 +53,8 @@
   startPage/1]).
 
 -export_type([wxWindowDC/0]).
+-deprecated([new/0]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 297d99324a..6f4fa3fe34 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -3154,156 +3154,155 @@ wxdebug_table() ->
  {3370, {wxStyledTextCtrl, pointFromPosition, 1}},
  {3371, {wxStyledTextCtrl, scrollToLine, 1}},
  {3372, {wxStyledTextCtrl, scrollToColumn, 1}},
- {3373, {wxStyledTextCtrl, sendMsg, 2}},
- {3374, {wxStyledTextCtrl, setVScrollBar, 1}},
- {3375, {wxStyledTextCtrl, setHScrollBar, 1}},
- {3376, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
- {3377, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
- {3378, {wxStyledTextCtrl, saveFile, 1}},
- {3379, {wxStyledTextCtrl, loadFile, 1}},
- {3380, {wxStyledTextCtrl, doDragOver, 3}},
- {3381, {wxStyledTextCtrl, doDropText, 3}},
- {3382, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
- {3383, {wxStyledTextCtrl, addTextRaw, 1}},
- {3384, {wxStyledTextCtrl, insertTextRaw, 2}},
- {3385, {wxStyledTextCtrl, getCurLineRaw, 1}},
- {3386, {wxStyledTextCtrl, getLineRaw, 1}},
- {3387, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
- {3388, {wxStyledTextCtrl, getTextRangeRaw, 2}},
- {3389, {wxStyledTextCtrl, setTextRaw, 1}},
- {3390, {wxStyledTextCtrl, getTextRaw, 0}},
- {3391, {wxStyledTextCtrl, appendTextRaw, 1}},
- {3392, {wxArtProvider, getBitmap, 2}},
- {3393, {wxArtProvider, getIcon, 2}},
- {3394, {wxTreeEvent, getKeyCode, 0}},
- {3395, {wxTreeEvent, getItem, 0}},
- {3396, {wxTreeEvent, getKeyEvent, 0}},
- {3397, {wxTreeEvent, getLabel, 0}},
- {3398, {wxTreeEvent, getOldItem, 0}},
- {3399, {wxTreeEvent, getPoint, 0}},
- {3400, {wxTreeEvent, isEditCancelled, 0}},
- {3401, {wxTreeEvent, setToolTip, 1}},
- {3402, {wxNotebookEvent, getOldSelection, 0}},
- {3403, {wxNotebookEvent, getSelection, 0}},
- {3404, {wxNotebookEvent, setOldSelection, 1}},
- {3405, {wxNotebookEvent, setSelection, 1}},
- {3406, {wxFileDataObject, new, 0}},
- {3407, {wxFileDataObject, addFile, 1}},
- {3408, {wxFileDataObject, getFilenames, 0}},
- {3409, {wxFileDataObject, 'Destroy', undefined}},
- {3410, {wxTextDataObject, new, 1}},
- {3411, {wxTextDataObject, getTextLength, 0}},
- {3412, {wxTextDataObject, getText, 0}},
- {3413, {wxTextDataObject, setText, 1}},
- {3414, {wxTextDataObject, 'Destroy', undefined}},
- {3415, {wxBitmapDataObject, new_1_1, 1}},
- {3416, {wxBitmapDataObject, new_1_0, 1}},
- {3417, {wxBitmapDataObject, getBitmap, 0}},
- {3418, {wxBitmapDataObject, setBitmap, 1}},
- {3419, {wxBitmapDataObject, 'Destroy', undefined}},
- {3421, {wxClipboard, new, 0}},
- {3422, {wxClipboard, destruct, 0}},
- {3423, {wxClipboard, addData, 1}},
- {3424, {wxClipboard, clear, 0}},
- {3425, {wxClipboard, close, 0}},
- {3426, {wxClipboard, flush, 0}},
- {3427, {wxClipboard, getData, 1}},
- {3428, {wxClipboard, isOpened, 0}},
- {3429, {wxClipboard, open, 0}},
- {3430, {wxClipboard, setData, 1}},
- {3432, {wxClipboard, usePrimarySelection, 1}},
- {3433, {wxClipboard, isSupported, 1}},
- {3434, {wxClipboard, get, 0}},
- {3435, {wxSpinEvent, getPosition, 0}},
- {3436, {wxSpinEvent, setPosition, 1}},
- {3437, {wxSplitterWindow, new_0, 0}},
- {3438, {wxSplitterWindow, new_2, 2}},
- {3439, {wxSplitterWindow, destruct, 0}},
- {3440, {wxSplitterWindow, create, 2}},
- {3441, {wxSplitterWindow, getMinimumPaneSize, 0}},
- {3442, {wxSplitterWindow, getSashGravity, 0}},
- {3443, {wxSplitterWindow, getSashPosition, 0}},
- {3444, {wxSplitterWindow, getSplitMode, 0}},
- {3445, {wxSplitterWindow, getWindow1, 0}},
- {3446, {wxSplitterWindow, getWindow2, 0}},
- {3447, {wxSplitterWindow, initialize, 1}},
- {3448, {wxSplitterWindow, isSplit, 0}},
- {3449, {wxSplitterWindow, replaceWindow, 2}},
- {3450, {wxSplitterWindow, setSashGravity, 1}},
- {3451, {wxSplitterWindow, setSashPosition, 2}},
- {3452, {wxSplitterWindow, setSashSize, 1}},
- {3453, {wxSplitterWindow, setMinimumPaneSize, 1}},
- {3454, {wxSplitterWindow, setSplitMode, 1}},
- {3455, {wxSplitterWindow, splitHorizontally, 3}},
- {3456, {wxSplitterWindow, splitVertically, 3}},
- {3457, {wxSplitterWindow, unsplit, 1}},
- {3458, {wxSplitterWindow, updateSize, 0}},
- {3459, {wxSplitterEvent, getSashPosition, 0}},
- {3460, {wxSplitterEvent, getX, 0}},
- {3461, {wxSplitterEvent, getY, 0}},
- {3462, {wxSplitterEvent, getWindowBeingRemoved, 0}},
- {3463, {wxSplitterEvent, setSashPosition, 1}},
- {3464, {wxHtmlWindow, new_0, 0}},
- {3465, {wxHtmlWindow, new_2, 2}},
- {3466, {wxHtmlWindow, appendToPage, 1}},
- {3467, {wxHtmlWindow, getOpenedAnchor, 0}},
- {3468, {wxHtmlWindow, getOpenedPage, 0}},
- {3469, {wxHtmlWindow, getOpenedPageTitle, 0}},
- {3470, {wxHtmlWindow, getRelatedFrame, 0}},
- {3471, {wxHtmlWindow, historyBack, 0}},
- {3472, {wxHtmlWindow, historyCanBack, 0}},
- {3473, {wxHtmlWindow, historyCanForward, 0}},
- {3474, {wxHtmlWindow, historyClear, 0}},
- {3475, {wxHtmlWindow, historyForward, 0}},
- {3476, {wxHtmlWindow, loadFile, 1}},
- {3477, {wxHtmlWindow, loadPage, 1}},
- {3478, {wxHtmlWindow, selectAll, 0}},
- {3479, {wxHtmlWindow, selectionToText, 0}},
- {3480, {wxHtmlWindow, selectLine, 1}},
- {3481, {wxHtmlWindow, selectWord, 1}},
- {3482, {wxHtmlWindow, setBorders, 1}},
- {3483, {wxHtmlWindow, setFonts, 3}},
- {3484, {wxHtmlWindow, setPage, 1}},
- {3485, {wxHtmlWindow, setRelatedFrame, 2}},
- {3486, {wxHtmlWindow, setRelatedStatusBar, 1}},
- {3487, {wxHtmlWindow, toText, 0}},
- {3488, {wxHtmlWindow, 'Destroy', undefined}},
- {3489, {wxHtmlLinkEvent, getLinkInfo, 0}},
- {3490, {wxSystemSettings, getColour, 1}},
- {3491, {wxSystemSettings, getFont, 1}},
- {3492, {wxSystemSettings, getMetric, 2}},
- {3493, {wxSystemSettings, getScreenType, 0}},
- {3494, {wxSystemOptions, getOption, 1}},
- {3495, {wxSystemOptions, getOptionInt, 1}},
- {3496, {wxSystemOptions, hasOption, 1}},
- {3497, {wxSystemOptions, isFalse, 1}},
- {3498, {wxSystemOptions, setOption_2_1, 2}},
- {3499, {wxSystemOptions, setOption_2_0, 2}},
- {3500, {wxAuiNotebookEvent, setSelection, 1}},
- {3501, {wxAuiNotebookEvent, getSelection, 0}},
- {3502, {wxAuiNotebookEvent, setOldSelection, 1}},
- {3503, {wxAuiNotebookEvent, getOldSelection, 0}},
- {3504, {wxAuiNotebookEvent, setDragSource, 1}},
- {3505, {wxAuiNotebookEvent, getDragSource, 0}},
- {3506, {wxAuiManagerEvent, setManager, 1}},
- {3507, {wxAuiManagerEvent, getManager, 0}},
- {3508, {wxAuiManagerEvent, setPane, 1}},
- {3509, {wxAuiManagerEvent, getPane, 0}},
- {3510, {wxAuiManagerEvent, setButton, 1}},
- {3511, {wxAuiManagerEvent, getButton, 0}},
- {3512, {wxAuiManagerEvent, setDC, 1}},
- {3513, {wxAuiManagerEvent, getDC, 0}},
- {3514, {wxAuiManagerEvent, veto, 1}},
- {3515, {wxAuiManagerEvent, getVeto, 0}},
- {3516, {wxAuiManagerEvent, setCanVeto, 1}},
- {3517, {wxAuiManagerEvent, canVeto, 0}},
- {3518, {wxLogNull, new, 0}},
- {3519, {wxLogNull, 'Destroy', undefined}},
- {3520, {wxTaskBarIcon, new, 0}},
- {3521, {wxTaskBarIcon, destruct, 0}},
- {3522, {wxTaskBarIcon, popupMenu, 1}},
- {3523, {wxTaskBarIcon, removeIcon, 0}},
- {3524, {wxTaskBarIcon, setIcon, 2}},
+ {3373, {wxStyledTextCtrl, setVScrollBar, 1}},
+ {3374, {wxStyledTextCtrl, setHScrollBar, 1}},
+ {3375, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
+ {3376, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
+ {3377, {wxStyledTextCtrl, saveFile, 1}},
+ {3378, {wxStyledTextCtrl, loadFile, 1}},
+ {3379, {wxStyledTextCtrl, doDragOver, 3}},
+ {3380, {wxStyledTextCtrl, doDropText, 3}},
+ {3381, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
+ {3382, {wxStyledTextCtrl, addTextRaw, 1}},
+ {3383, {wxStyledTextCtrl, insertTextRaw, 2}},
+ {3384, {wxStyledTextCtrl, getCurLineRaw, 1}},
+ {3385, {wxStyledTextCtrl, getLineRaw, 1}},
+ {3386, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
+ {3387, {wxStyledTextCtrl, getTextRangeRaw, 2}},
+ {3388, {wxStyledTextCtrl, setTextRaw, 1}},
+ {3389, {wxStyledTextCtrl, getTextRaw, 0}},
+ {3390, {wxStyledTextCtrl, appendTextRaw, 1}},
+ {3391, {wxArtProvider, getBitmap, 2}},
+ {3392, {wxArtProvider, getIcon, 2}},
+ {3393, {wxTreeEvent, getKeyCode, 0}},
+ {3394, {wxTreeEvent, getItem, 0}},
+ {3395, {wxTreeEvent, getKeyEvent, 0}},
+ {3396, {wxTreeEvent, getLabel, 0}},
+ {3397, {wxTreeEvent, getOldItem, 0}},
+ {3398, {wxTreeEvent, getPoint, 0}},
+ {3399, {wxTreeEvent, isEditCancelled, 0}},
+ {3400, {wxTreeEvent, setToolTip, 1}},
+ {3401, {wxNotebookEvent, getOldSelection, 0}},
+ {3402, {wxNotebookEvent, getSelection, 0}},
+ {3403, {wxNotebookEvent, setOldSelection, 1}},
+ {3404, {wxNotebookEvent, setSelection, 1}},
+ {3405, {wxFileDataObject, new, 0}},
+ {3406, {wxFileDataObject, addFile, 1}},
+ {3407, {wxFileDataObject, getFilenames, 0}},
+ {3408, {wxFileDataObject, 'Destroy', undefined}},
+ {3409, {wxTextDataObject, new, 1}},
+ {3410, {wxTextDataObject, getTextLength, 0}},
+ {3411, {wxTextDataObject, getText, 0}},
+ {3412, {wxTextDataObject, setText, 1}},
+ {3413, {wxTextDataObject, 'Destroy', undefined}},
+ {3414, {wxBitmapDataObject, new_1_1, 1}},
+ {3415, {wxBitmapDataObject, new_1_0, 1}},
+ {3416, {wxBitmapDataObject, getBitmap, 0}},
+ {3417, {wxBitmapDataObject, setBitmap, 1}},
+ {3418, {wxBitmapDataObject, 'Destroy', undefined}},
+ {3420, {wxClipboard, new, 0}},
+ {3421, {wxClipboard, destruct, 0}},
+ {3422, {wxClipboard, addData, 1}},
+ {3423, {wxClipboard, clear, 0}},
+ {3424, {wxClipboard, close, 0}},
+ {3425, {wxClipboard, flush, 0}},
+ {3426, {wxClipboard, getData, 1}},
+ {3427, {wxClipboard, isOpened, 0}},
+ {3428, {wxClipboard, open, 0}},
+ {3429, {wxClipboard, setData, 1}},
+ {3431, {wxClipboard, usePrimarySelection, 1}},
+ {3432, {wxClipboard, isSupported, 1}},
+ {3433, {wxClipboard, get, 0}},
+ {3434, {wxSpinEvent, getPosition, 0}},
+ {3435, {wxSpinEvent, setPosition, 1}},
+ {3436, {wxSplitterWindow, new_0, 0}},
+ {3437, {wxSplitterWindow, new_2, 2}},
+ {3438, {wxSplitterWindow, destruct, 0}},
+ {3439, {wxSplitterWindow, create, 2}},
+ {3440, {wxSplitterWindow, getMinimumPaneSize, 0}},
+ {3441, {wxSplitterWindow, getSashGravity, 0}},
+ {3442, {wxSplitterWindow, getSashPosition, 0}},
+ {3443, {wxSplitterWindow, getSplitMode, 0}},
+ {3444, {wxSplitterWindow, getWindow1, 0}},
+ {3445, {wxSplitterWindow, getWindow2, 0}},
+ {3446, {wxSplitterWindow, initialize, 1}},
+ {3447, {wxSplitterWindow, isSplit, 0}},
+ {3448, {wxSplitterWindow, replaceWindow, 2}},
+ {3449, {wxSplitterWindow, setSashGravity, 1}},
+ {3450, {wxSplitterWindow, setSashPosition, 2}},
+ {3451, {wxSplitterWindow, setSashSize, 1}},
+ {3452, {wxSplitterWindow, setMinimumPaneSize, 1}},
+ {3453, {wxSplitterWindow, setSplitMode, 1}},
+ {3454, {wxSplitterWindow, splitHorizontally, 3}},
+ {3455, {wxSplitterWindow, splitVertically, 3}},
+ {3456, {wxSplitterWindow, unsplit, 1}},
+ {3457, {wxSplitterWindow, updateSize, 0}},
+ {3458, {wxSplitterEvent, getSashPosition, 0}},
+ {3459, {wxSplitterEvent, getX, 0}},
+ {3460, {wxSplitterEvent, getY, 0}},
+ {3461, {wxSplitterEvent, getWindowBeingRemoved, 0}},
+ {3462, {wxSplitterEvent, setSashPosition, 1}},
+ {3463, {wxHtmlWindow, new_0, 0}},
+ {3464, {wxHtmlWindow, new_2, 2}},
+ {3465, {wxHtmlWindow, appendToPage, 1}},
+ {3466, {wxHtmlWindow, getOpenedAnchor, 0}},
+ {3467, {wxHtmlWindow, getOpenedPage, 0}},
+ {3468, {wxHtmlWindow, getOpenedPageTitle, 0}},
+ {3469, {wxHtmlWindow, getRelatedFrame, 0}},
+ {3470, {wxHtmlWindow, historyBack, 0}},
+ {3471, {wxHtmlWindow, historyCanBack, 0}},
+ {3472, {wxHtmlWindow, historyCanForward, 0}},
+ {3473, {wxHtmlWindow, historyClear, 0}},
+ {3474, {wxHtmlWindow, historyForward, 0}},
+ {3475, {wxHtmlWindow, loadFile, 1}},
+ {3476, {wxHtmlWindow, loadPage, 1}},
+ {3477, {wxHtmlWindow, selectAll, 0}},
+ {3478, {wxHtmlWindow, selectionToText, 0}},
+ {3479, {wxHtmlWindow, selectLine, 1}},
+ {3480, {wxHtmlWindow, selectWord, 1}},
+ {3481, {wxHtmlWindow, setBorders, 1}},
+ {3482, {wxHtmlWindow, setFonts, 3}},
+ {3483, {wxHtmlWindow, setPage, 1}},
+ {3484, {wxHtmlWindow, setRelatedFrame, 2}},
+ {3485, {wxHtmlWindow, setRelatedStatusBar, 1}},
+ {3486, {wxHtmlWindow, toText, 0}},
+ {3487, {wxHtmlWindow, 'Destroy', undefined}},
+ {3488, {wxHtmlLinkEvent, getLinkInfo, 0}},
+ {3489, {wxSystemSettings, getColour, 1}},
+ {3490, {wxSystemSettings, getFont, 1}},
+ {3491, {wxSystemSettings, getMetric, 2}},
+ {3492, {wxSystemSettings, getScreenType, 0}},
+ {3493, {wxSystemOptions, getOption, 1}},
+ {3494, {wxSystemOptions, getOptionInt, 1}},
+ {3495, {wxSystemOptions, hasOption, 1}},
+ {3496, {wxSystemOptions, isFalse, 1}},
+ {3497, {wxSystemOptions, setOption_2_1, 2}},
+ {3498, {wxSystemOptions, setOption_2_0, 2}},
+ {3499, {wxAuiNotebookEvent, setSelection, 1}},
+ {3500, {wxAuiNotebookEvent, getSelection, 0}},
+ {3501, {wxAuiNotebookEvent, setOldSelection, 1}},
+ {3502, {wxAuiNotebookEvent, getOldSelection, 0}},
+ {3503, {wxAuiNotebookEvent, setDragSource, 1}},
+ {3504, {wxAuiNotebookEvent, getDragSource, 0}},
+ {3505, {wxAuiManagerEvent, setManager, 1}},
+ {3506, {wxAuiManagerEvent, getManager, 0}},
+ {3507, {wxAuiManagerEvent, setPane, 1}},
+ {3508, {wxAuiManagerEvent, getPane, 0}},
+ {3509, {wxAuiManagerEvent, setButton, 1}},
+ {3510, {wxAuiManagerEvent, getButton, 0}},
+ {3511, {wxAuiManagerEvent, setDC, 1}},
+ {3512, {wxAuiManagerEvent, getDC, 0}},
+ {3513, {wxAuiManagerEvent, veto, 1}},
+ {3514, {wxAuiManagerEvent, getVeto, 0}},
+ {3515, {wxAuiManagerEvent, setCanVeto, 1}},
+ {3516, {wxAuiManagerEvent, canVeto, 0}},
+ {3517, {wxLogNull, new, 0}},
+ {3518, {wxLogNull, 'Destroy', undefined}},
+ {3519, {wxTaskBarIcon, new, 0}},
+ {3520, {wxTaskBarIcon, destruct, 0}},
+ {3521, {wxTaskBarIcon, popupMenu, 1}},
+ {3522, {wxTaskBarIcon, removeIcon, 0}},
+ {3523, {wxTaskBarIcon, setIcon, 2}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index fe35cb1374..e6aced6e09 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -3151,153 +3151,152 @@
 -define(wxStyledTextCtrl_PointFromPosition, 3370).
 -define(wxStyledTextCtrl_ScrollToLine, 3371).
 -define(wxStyledTextCtrl_ScrollToColumn, 3372).
--define(wxStyledTextCtrl_SendMsg, 3373).
--define(wxStyledTextCtrl_SetVScrollBar, 3374).
--define(wxStyledTextCtrl_SetHScrollBar, 3375).
--define(wxStyledTextCtrl_GetLastKeydownProcessed, 3376).
--define(wxStyledTextCtrl_SetLastKeydownProcessed, 3377).
--define(wxStyledTextCtrl_SaveFile, 3378).
--define(wxStyledTextCtrl_LoadFile, 3379).
--define(wxStyledTextCtrl_DoDragOver, 3380).
--define(wxStyledTextCtrl_DoDropText, 3381).
--define(wxStyledTextCtrl_GetUseAntiAliasing, 3382).
--define(wxStyledTextCtrl_AddTextRaw, 3383).
--define(wxStyledTextCtrl_InsertTextRaw, 3384).
--define(wxStyledTextCtrl_GetCurLineRaw, 3385).
--define(wxStyledTextCtrl_GetLineRaw, 3386).
--define(wxStyledTextCtrl_GetSelectedTextRaw, 3387).
--define(wxStyledTextCtrl_GetTextRangeRaw, 3388).
--define(wxStyledTextCtrl_SetTextRaw, 3389).
--define(wxStyledTextCtrl_GetTextRaw, 3390).
--define(wxStyledTextCtrl_AppendTextRaw, 3391).
--define(wxArtProvider_GetBitmap, 3392).
--define(wxArtProvider_GetIcon, 3393).
--define(wxTreeEvent_GetKeyCode, 3394).
--define(wxTreeEvent_GetItem, 3395).
--define(wxTreeEvent_GetKeyEvent, 3396).
--define(wxTreeEvent_GetLabel, 3397).
--define(wxTreeEvent_GetOldItem, 3398).
--define(wxTreeEvent_GetPoint, 3399).
--define(wxTreeEvent_IsEditCancelled, 3400).
--define(wxTreeEvent_SetToolTip, 3401).
--define(wxNotebookEvent_GetOldSelection, 3402).
--define(wxNotebookEvent_GetSelection, 3403).
--define(wxNotebookEvent_SetOldSelection, 3404).
--define(wxNotebookEvent_SetSelection, 3405).
--define(wxFileDataObject_new, 3406).
--define(wxFileDataObject_AddFile, 3407).
--define(wxFileDataObject_GetFilenames, 3408).
--define(wxFileDataObject_destroy, 3409).
--define(wxTextDataObject_new, 3410).
--define(wxTextDataObject_GetTextLength, 3411).
--define(wxTextDataObject_GetText, 3412).
--define(wxTextDataObject_SetText, 3413).
--define(wxTextDataObject_destroy, 3414).
--define(wxBitmapDataObject_new_1_1, 3415).
--define(wxBitmapDataObject_new_1_0, 3416).
--define(wxBitmapDataObject_GetBitmap, 3417).
--define(wxBitmapDataObject_SetBitmap, 3418).
--define(wxBitmapDataObject_destroy, 3419).
--define(wxClipboard_new, 3421).
--define(wxClipboard_destruct, 3422).
--define(wxClipboard_AddData, 3423).
--define(wxClipboard_Clear, 3424).
--define(wxClipboard_Close, 3425).
--define(wxClipboard_Flush, 3426).
--define(wxClipboard_GetData, 3427).
--define(wxClipboard_IsOpened, 3428).
--define(wxClipboard_Open, 3429).
--define(wxClipboard_SetData, 3430).
--define(wxClipboard_UsePrimarySelection, 3432).
--define(wxClipboard_IsSupported, 3433).
--define(wxClipboard_Get, 3434).
--define(wxSpinEvent_GetPosition, 3435).
--define(wxSpinEvent_SetPosition, 3436).
--define(wxSplitterWindow_new_0, 3437).
--define(wxSplitterWindow_new_2, 3438).
--define(wxSplitterWindow_destruct, 3439).
--define(wxSplitterWindow_Create, 3440).
--define(wxSplitterWindow_GetMinimumPaneSize, 3441).
--define(wxSplitterWindow_GetSashGravity, 3442).
--define(wxSplitterWindow_GetSashPosition, 3443).
--define(wxSplitterWindow_GetSplitMode, 3444).
--define(wxSplitterWindow_GetWindow1, 3445).
--define(wxSplitterWindow_GetWindow2, 3446).
--define(wxSplitterWindow_Initialize, 3447).
--define(wxSplitterWindow_IsSplit, 3448).
--define(wxSplitterWindow_ReplaceWindow, 3449).
--define(wxSplitterWindow_SetSashGravity, 3450).
--define(wxSplitterWindow_SetSashPosition, 3451).
--define(wxSplitterWindow_SetSashSize, 3452).
--define(wxSplitterWindow_SetMinimumPaneSize, 3453).
--define(wxSplitterWindow_SetSplitMode, 3454).
--define(wxSplitterWindow_SplitHorizontally, 3455).
--define(wxSplitterWindow_SplitVertically, 3456).
--define(wxSplitterWindow_Unsplit, 3457).
--define(wxSplitterWindow_UpdateSize, 3458).
--define(wxSplitterEvent_GetSashPosition, 3459).
--define(wxSplitterEvent_GetX, 3460).
--define(wxSplitterEvent_GetY, 3461).
--define(wxSplitterEvent_GetWindowBeingRemoved, 3462).
--define(wxSplitterEvent_SetSashPosition, 3463).
--define(wxHtmlWindow_new_0, 3464).
--define(wxHtmlWindow_new_2, 3465).
--define(wxHtmlWindow_AppendToPage, 3466).
--define(wxHtmlWindow_GetOpenedAnchor, 3467).
--define(wxHtmlWindow_GetOpenedPage, 3468).
--define(wxHtmlWindow_GetOpenedPageTitle, 3469).
--define(wxHtmlWindow_GetRelatedFrame, 3470).
--define(wxHtmlWindow_HistoryBack, 3471).
--define(wxHtmlWindow_HistoryCanBack, 3472).
--define(wxHtmlWindow_HistoryCanForward, 3473).
--define(wxHtmlWindow_HistoryClear, 3474).
--define(wxHtmlWindow_HistoryForward, 3475).
--define(wxHtmlWindow_LoadFile, 3476).
--define(wxHtmlWindow_LoadPage, 3477).
--define(wxHtmlWindow_SelectAll, 3478).
--define(wxHtmlWindow_SelectionToText, 3479).
--define(wxHtmlWindow_SelectLine, 3480).
--define(wxHtmlWindow_SelectWord, 3481).
--define(wxHtmlWindow_SetBorders, 3482).
--define(wxHtmlWindow_SetFonts, 3483).
--define(wxHtmlWindow_SetPage, 3484).
--define(wxHtmlWindow_SetRelatedFrame, 3485).
--define(wxHtmlWindow_SetRelatedStatusBar, 3486).
--define(wxHtmlWindow_ToText, 3487).
--define(wxHtmlWindow_destroy, 3488).
--define(wxHtmlLinkEvent_GetLinkInfo, 3489).
--define(wxSystemSettings_GetColour, 3490).
--define(wxSystemSettings_GetFont, 3491).
--define(wxSystemSettings_GetMetric, 3492).
--define(wxSystemSettings_GetScreenType, 3493).
--define(wxSystemOptions_GetOption, 3494).
--define(wxSystemOptions_GetOptionInt, 3495).
--define(wxSystemOptions_HasOption, 3496).
--define(wxSystemOptions_IsFalse, 3497).
--define(wxSystemOptions_SetOption_2_1, 3498).
--define(wxSystemOptions_SetOption_2_0, 3499).
--define(wxAuiNotebookEvent_SetSelection, 3500).
--define(wxAuiNotebookEvent_GetSelection, 3501).
--define(wxAuiNotebookEvent_SetOldSelection, 3502).
--define(wxAuiNotebookEvent_GetOldSelection, 3503).
--define(wxAuiNotebookEvent_SetDragSource, 3504).
--define(wxAuiNotebookEvent_GetDragSource, 3505).
--define(wxAuiManagerEvent_SetManager, 3506).
--define(wxAuiManagerEvent_GetManager, 3507).
--define(wxAuiManagerEvent_SetPane, 3508).
--define(wxAuiManagerEvent_GetPane, 3509).
--define(wxAuiManagerEvent_SetButton, 3510).
--define(wxAuiManagerEvent_GetButton, 3511).
--define(wxAuiManagerEvent_SetDC, 3512).
--define(wxAuiManagerEvent_GetDC, 3513).
--define(wxAuiManagerEvent_Veto, 3514).
--define(wxAuiManagerEvent_GetVeto, 3515).
--define(wxAuiManagerEvent_SetCanVeto, 3516).
--define(wxAuiManagerEvent_CanVeto, 3517).
--define(wxLogNull_new, 3518).
--define(wxLogNull_destroy, 3519).
--define(wxTaskBarIcon_new, 3520).
--define(wxTaskBarIcon_destruct, 3521).
--define(wxTaskBarIcon_PopupMenu, 3522).
--define(wxTaskBarIcon_RemoveIcon, 3523).
--define(wxTaskBarIcon_SetIcon, 3524).
+-define(wxStyledTextCtrl_SetVScrollBar, 3373).
+-define(wxStyledTextCtrl_SetHScrollBar, 3374).
+-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3375).
+-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3376).
+-define(wxStyledTextCtrl_SaveFile, 3377).
+-define(wxStyledTextCtrl_LoadFile, 3378).
+-define(wxStyledTextCtrl_DoDragOver, 3379).
+-define(wxStyledTextCtrl_DoDropText, 3380).
+-define(wxStyledTextCtrl_GetUseAntiAliasing, 3381).
+-define(wxStyledTextCtrl_AddTextRaw, 3382).
+-define(wxStyledTextCtrl_InsertTextRaw, 3383).
+-define(wxStyledTextCtrl_GetCurLineRaw, 3384).
+-define(wxStyledTextCtrl_GetLineRaw, 3385).
+-define(wxStyledTextCtrl_GetSelectedTextRaw, 3386).
+-define(wxStyledTextCtrl_GetTextRangeRaw, 3387).
+-define(wxStyledTextCtrl_SetTextRaw, 3388).
+-define(wxStyledTextCtrl_GetTextRaw, 3389).
+-define(wxStyledTextCtrl_AppendTextRaw, 3390).
+-define(wxArtProvider_GetBitmap, 3391).
+-define(wxArtProvider_GetIcon, 3392).
+-define(wxTreeEvent_GetKeyCode, 3393).
+-define(wxTreeEvent_GetItem, 3394).
+-define(wxTreeEvent_GetKeyEvent, 3395).
+-define(wxTreeEvent_GetLabel, 3396).
+-define(wxTreeEvent_GetOldItem, 3397).
+-define(wxTreeEvent_GetPoint, 3398).
+-define(wxTreeEvent_IsEditCancelled, 3399).
+-define(wxTreeEvent_SetToolTip, 3400).
+-define(wxNotebookEvent_GetOldSelection, 3401).
+-define(wxNotebookEvent_GetSelection, 3402).
+-define(wxNotebookEvent_SetOldSelection, 3403).
+-define(wxNotebookEvent_SetSelection, 3404).
+-define(wxFileDataObject_new, 3405).
+-define(wxFileDataObject_AddFile, 3406).
+-define(wxFileDataObject_GetFilenames, 3407).
+-define(wxFileDataObject_destroy, 3408).
+-define(wxTextDataObject_new, 3409).
+-define(wxTextDataObject_GetTextLength, 3410).
+-define(wxTextDataObject_GetText, 3411).
+-define(wxTextDataObject_SetText, 3412).
+-define(wxTextDataObject_destroy, 3413).
+-define(wxBitmapDataObject_new_1_1, 3414).
+-define(wxBitmapDataObject_new_1_0, 3415).
+-define(wxBitmapDataObject_GetBitmap, 3416).
+-define(wxBitmapDataObject_SetBitmap, 3417).
+-define(wxBitmapDataObject_destroy, 3418).
+-define(wxClipboard_new, 3420).
+-define(wxClipboard_destruct, 3421).
+-define(wxClipboard_AddData, 3422).
+-define(wxClipboard_Clear, 3423).
+-define(wxClipboard_Close, 3424).
+-define(wxClipboard_Flush, 3425).
+-define(wxClipboard_GetData, 3426).
+-define(wxClipboard_IsOpened, 3427).
+-define(wxClipboard_Open, 3428).
+-define(wxClipboard_SetData, 3429).
+-define(wxClipboard_UsePrimarySelection, 3431).
+-define(wxClipboard_IsSupported, 3432).
+-define(wxClipboard_Get, 3433).
+-define(wxSpinEvent_GetPosition, 3434).
+-define(wxSpinEvent_SetPosition, 3435).
+-define(wxSplitterWindow_new_0, 3436).
+-define(wxSplitterWindow_new_2, 3437).
+-define(wxSplitterWindow_destruct, 3438).
+-define(wxSplitterWindow_Create, 3439).
+-define(wxSplitterWindow_GetMinimumPaneSize, 3440).
+-define(wxSplitterWindow_GetSashGravity, 3441).
+-define(wxSplitterWindow_GetSashPosition, 3442).
+-define(wxSplitterWindow_GetSplitMode, 3443).
+-define(wxSplitterWindow_GetWindow1, 3444).
+-define(wxSplitterWindow_GetWindow2, 3445).
+-define(wxSplitterWindow_Initialize, 3446).
+-define(wxSplitterWindow_IsSplit, 3447).
+-define(wxSplitterWindow_ReplaceWindow, 3448).
+-define(wxSplitterWindow_SetSashGravity, 3449).
+-define(wxSplitterWindow_SetSashPosition, 3450).
+-define(wxSplitterWindow_SetSashSize, 3451).
+-define(wxSplitterWindow_SetMinimumPaneSize, 3452).
+-define(wxSplitterWindow_SetSplitMode, 3453).
+-define(wxSplitterWindow_SplitHorizontally, 3454).
+-define(wxSplitterWindow_SplitVertically, 3455).
+-define(wxSplitterWindow_Unsplit, 3456).
+-define(wxSplitterWindow_UpdateSize, 3457).
+-define(wxSplitterEvent_GetSashPosition, 3458).
+-define(wxSplitterEvent_GetX, 3459).
+-define(wxSplitterEvent_GetY, 3460).
+-define(wxSplitterEvent_GetWindowBeingRemoved, 3461).
+-define(wxSplitterEvent_SetSashPosition, 3462).
+-define(wxHtmlWindow_new_0, 3463).
+-define(wxHtmlWindow_new_2, 3464).
+-define(wxHtmlWindow_AppendToPage, 3465).
+-define(wxHtmlWindow_GetOpenedAnchor, 3466).
+-define(wxHtmlWindow_GetOpenedPage, 3467).
+-define(wxHtmlWindow_GetOpenedPageTitle, 3468).
+-define(wxHtmlWindow_GetRelatedFrame, 3469).
+-define(wxHtmlWindow_HistoryBack, 3470).
+-define(wxHtmlWindow_HistoryCanBack, 3471).
+-define(wxHtmlWindow_HistoryCanForward, 3472).
+-define(wxHtmlWindow_HistoryClear, 3473).
+-define(wxHtmlWindow_HistoryForward, 3474).
+-define(wxHtmlWindow_LoadFile, 3475).
+-define(wxHtmlWindow_LoadPage, 3476).
+-define(wxHtmlWindow_SelectAll, 3477).
+-define(wxHtmlWindow_SelectionToText, 3478).
+-define(wxHtmlWindow_SelectLine, 3479).
+-define(wxHtmlWindow_SelectWord, 3480).
+-define(wxHtmlWindow_SetBorders, 3481).
+-define(wxHtmlWindow_SetFonts, 3482).
+-define(wxHtmlWindow_SetPage, 3483).
+-define(wxHtmlWindow_SetRelatedFrame, 3484).
+-define(wxHtmlWindow_SetRelatedStatusBar, 3485).
+-define(wxHtmlWindow_ToText, 3486).
+-define(wxHtmlWindow_destroy, 3487).
+-define(wxHtmlLinkEvent_GetLinkInfo, 3488).
+-define(wxSystemSettings_GetColour, 3489).
+-define(wxSystemSettings_GetFont, 3490).
+-define(wxSystemSettings_GetMetric, 3491).
+-define(wxSystemSettings_GetScreenType, 3492).
+-define(wxSystemOptions_GetOption, 3493).
+-define(wxSystemOptions_GetOptionInt, 3494).
+-define(wxSystemOptions_HasOption, 3495).
+-define(wxSystemOptions_IsFalse, 3496).
+-define(wxSystemOptions_SetOption_2_1, 3497).
+-define(wxSystemOptions_SetOption_2_0, 3498).
+-define(wxAuiNotebookEvent_SetSelection, 3499).
+-define(wxAuiNotebookEvent_GetSelection, 3500).
+-define(wxAuiNotebookEvent_SetOldSelection, 3501).
+-define(wxAuiNotebookEvent_GetOldSelection, 3502).
+-define(wxAuiNotebookEvent_SetDragSource, 3503).
+-define(wxAuiNotebookEvent_GetDragSource, 3504).
+-define(wxAuiManagerEvent_SetManager, 3505).
+-define(wxAuiManagerEvent_GetManager, 3506).
+-define(wxAuiManagerEvent_SetPane, 3507).
+-define(wxAuiManagerEvent_GetPane, 3508).
+-define(wxAuiManagerEvent_SetButton, 3509).
+-define(wxAuiManagerEvent_GetButton, 3510).
+-define(wxAuiManagerEvent_SetDC, 3511).
+-define(wxAuiManagerEvent_GetDC, 3512).
+-define(wxAuiManagerEvent_Veto, 3513).
+-define(wxAuiManagerEvent_GetVeto, 3514).
+-define(wxAuiManagerEvent_SetCanVeto, 3515).
+-define(wxAuiManagerEvent_CanVeto, 3516).
+-define(wxLogNull_new, 3517).
+-define(wxLogNull_destroy, 3518).
+-define(wxTaskBarIcon_new, 3519).
+-define(wxTaskBarIcon_destruct, 3520).
+-define(wxTaskBarIcon_PopupMenu, 3521).
+-define(wxTaskBarIcon_RemoveIcon, 3522).
+-define(wxTaskBarIcon_SetIcon, 3523).
diff --git a/lib/wx/src/wxe_util.erl b/lib/wx/src/wxe_util.erl
index 3022b7f3f2..a31c3e30b8 100644
--- a/lib/wx/src/wxe_util.erl
+++ b/lib/wx/src/wxe_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -233,10 +233,16 @@ priv_dir(Driver0, Silent) ->
 	{ok, _} ->
 	    Priv;
 	{error, _} ->
-	    opt_error_log(Silent,
-                          "ERROR: Could not find \'~s\' in: ~s~n",
-                          [Driver, Priv]),
-	    erlang:error({load_driver, "No driver found"})
+	    SrcPriv = filename:join(Priv, erlang:system_info(system_architecture)),
+	    case file:read_file_info(filename:join(SrcPriv, Driver)) of
+		{ok, _} ->
+		    SrcPriv;
+		{error, _} ->
+		    opt_error_log(Silent,
+				  "ERROR: Could not find \'~s\' in: ~s~n",
+				  [Driver, Priv]),
+		    erlang:error({load_driver, "No driver found"})
+	    end
     end.
 
 strip(Src, Src) ->
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index 20115a41fb..cf17818a9d 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -128,7 +129,7 @@ wx_api(Config) ->
     ?m(true, wx:is_null(Wx)),
     Null = ?mr(wx_ref, wx:null()),
     ?m(true, wx:is_null(Null)),
-    Frame = ?mt(wxFrame, wxFrame:new(Wx, 1, "WX API: " ++ unicode:characters_to_list("������"))),
+    Frame = ?mt(wxFrame, wxFrame:new(Wx, 1, "WX API: " ++ unicode:characters_to_list("åäöÅÄÖ"))),
     ?m(false, wx:is_null(Frame)),
     ?m(wxFrame, wx:getObjectType(Frame)),
     Env = ?mr(wx_env, wx:get_env()),
@@ -307,12 +308,12 @@ data_types(_Config) ->
     ?m({_,_}, wxWindow:getSize(Frame)),
 
     %% DateTime 
-    DateTime = calendar:now_to_datetime(erlang:now()),
+    DateTime = {Date, _Time} = calendar:now_to_datetime(erlang:now()),
     io:format("DateTime ~p ~n",[DateTime]),
     Cal = ?mt(wxCalendarCtrl, wxCalendarCtrl:new(Frame, ?wxID_ANY, [{date,DateTime}])),
-    ?m(DateTime, wxCalendarCtrl:getDate(Cal)),
+    ?m({Date,_}, wxCalendarCtrl:getDate(Cal)),
     ?m(true, is_boolean(wxCalendarCtrl:setDate(Cal,DateTime))),
-    ?m(DateTime, wxCalendarCtrl:getDate(Cal)),
+    ?m({Date,_}, wxCalendarCtrl:getDate(Cal)),
 
     wxClientDC:destroy(CDC),
     %%wx_test_lib:wx_destroy(Frame,Config).
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 6ed7243c5b..22bfa53e0a 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -82,13 +82,14 @@ calendarCtrl(Config) ->
 	true ->
 	    ?log("DateAttr is null~n",[]);
 	false ->
-	    ?log("DateAttr is useable~n",[])
+	    ?log("DateAttr is useable~n",[]),
+	    DateAttr = ?mt(wxCalendarDateAttr, wxCalendarDateAttr:new()),
+	    wxCalendarDateAttr:setBackgroundColour(DateAttr, {0,243,0}),
+	    wxCalendarCtrl:setAttr(Cal, Day, DateAttr),
+	    DateAttr1 = ?mt(wxCalendarDateAttr, wxCalendarCtrl:getAttr(Cal,Day)),
+	    io:format("DateAttr ~p~n",[DateAttr1]),
+	    ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1))
     end,
-    DateAttr = ?mt(wxCalendarDateAttr, wxCalendarDateAttr:new()),
-    wxCalendarDateAttr:setBackgroundColour(DateAttr, {0,243,0}),
-    wxCalendarCtrl:setAttr(Cal, Day, DateAttr),
-    DateAttr1 = ?mt(wxCalendarDateAttr, wxCalendarCtrl:getAttr(Cal,Day)),
-    ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1)),
 
     ?m({YMD, _},wxCalendarCtrl:getDate(Cal)),
 
@@ -476,7 +477,9 @@ taskBarIcon(Config) ->
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     TBI = wxTaskBarIcon:new(),
-    Icon = wxIcon:new(filename:join(code:priv_dir(debugger), "erlang_bug.png")),
+    Image = wxImage:new(filename:join(code:priv_dir(debugger), "erlang_bug.png")),
+    io:format("Image ~p~n",[wxImage:ok(Image)]),
+    Icon = wxIcon:new(filename:join(code:priv_dir(debugger), "erlang_bug.png"), [{type, ?wxBITMAP_TYPE_PNG}]),
     wxTaskBarIcon:setIcon(TBI, Icon, [{tooltip, "Testing wxTaskBarIcon"}]),
     wxWindow:show(Frame),
     wxTaskBarIcon:connect(TBI, taskbar_left_down, [{callback, fun(Ev,_) -> io:format("Left clicked: ~p~n",[Ev]) end}]),
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index 8f364049b4..53a2ee7d7b 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -301,35 +301,70 @@ connect_in_callback(TestInfo)
   when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 connect_in_callback(Config) ->
     Wx = ?mr(wx_ref, wx:new()),
+    %% wx:debug([driver,trace]),
+    %% io:format("gdb -p ~s~n",[os:getpid()]),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Connect in callback"),
     Panel = wxPanel:new(Frame, []),
-    
+
+    Tester = self(),
+
+    %% Connect in callbacks works different in 2.9
+    %% such that new events are not fired until the previous
+    %% callback have returned.
+
+    %% That means that a callback can not wait for other events
+    %% in receive since they will not come.
+    %% It also means that you can not attach a new callback directly from
+    %% the callback since that callback will be removed when the temporary
+    %% process that executes the outer callback (may) die(s) before the callback
+    %% is invoked
+
+    %% Thus connect in callbacks needs to done in a another process, and
+    %% not in the fun directly
+    Env = wx:get_env(),
+    TestWindow =
+	fun() ->
+		wx:set_env(Env),
+		Me = self(),
+		F1 = wxFrame:new(Frame, ?wxID_ANY, "Frame size event"),
+		wxFrame:connect(F1,size,[{callback,
+					  fun(_,_) ->
+						  io:format("CB2 got size~n",[]),
+						  Me ! {continue, F1}
+					  end}]),
+		wxWindow:show(F1),
+		receive
+		    {continue, F1} -> Tester ! {continue, F1}
+		end
+	end,
     wxFrame:connect(Frame,size,
-		    [{callback, 
-		      fun(#wx{event=#wxSize{}},_SizeEv) -> 
-			      io:format("Frame got size~n",[]),		 
-			      F1 = wxFrame:new(Frame, ?wxID_ANY, "Frame size event"),
-			      CBPid = self(),
-			      wxFrame:connect(F1,size,[{callback,
-							fun(_,_) ->
-								io:format("CB2 got size~n",[]),
-								CBPid ! continue
-							end}]),
-			      wxWindow:show(F1),
-			      receive continue -> wxFrame:destroy(F1) end
+		    [{callback,
+		      fun(#wx{event=#wxSize{}},_SizeEv) ->
+			      io:format("Frame got size~n",[]),
+			      spawn(TestWindow)
 		      end}]),
     wxPanel:connect(Panel,size,
-		    [{callback, 
-		      fun(#wx{event=#wxSize{}},_SizeEv) -> 
+		    [{callback,
+		      fun(#wx{event=#wxSize{}},_SizeEv) ->
 			      io:format("Panel got size~n",[]),
-			      F1 = wxFrame:new(Frame, ?wxID_ANY, "Panel size event"),
-			      wxFrame:connect(F1,size),
-			      wxWindow:show(F1),
-			      receive #wx{event=#wxSize{}} -> wxFrame:destroy(F1) end
-		      end}]),   
+			      spawn(fun() ->
+					    wx:set_env(Env),
+					    F1 = wxFrame:new(Frame, ?wxID_ANY,
+							     "Panel size event"),
+					    wxFrame:connect(F1,size),
+					    wxWindow:show(F1),
+					    receive
+						#wx{event=#wxSize{}} ->
+						    io:format("All Fine ~n",[]),
+						    wxFrame:destroy(F1)
+					    end
+				    end)
+		      end}]),
     wxFrame:show(Frame),
+
+    ok = receive {continue, F1} -> wxFrame:destroy(F1)
+	 after 5000 -> timeout end,
     wx_test_lib:flush(),
-    
     wx_test_lib:wx_destroy(Frame, Config).
 
 %% Test that event callback which triggers another callback works
diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl
index e8fdf603d6..f351bc93ed 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %% 
 %% The 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,10 +92,22 @@ canvas(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 canvas(Config) ->
     WX = ?mr(wx_ref, wx:new()),
     Frame = wxFrame:new(WX,1,"Hello 3D-World",[]),
-    Attrs = [{attribList, [?WX_GL_RGBA,?WX_GL_DOUBLEBUFFER,0]}],
-    Canvas = ?mt(wxGLCanvas, wxGLCanvas:new(Frame, Attrs)),
+    Attrs = [{attribList, [?WX_GL_RGBA,
+			   ?WX_GL_DOUBLEBUFFER,
+			   ?WX_GL_MIN_RED,8,
+			   ?WX_GL_MIN_GREEN,8,
+			   ?WX_GL_MIN_BLUE,8,
+			   ?WX_GL_DEPTH_SIZE,24,0]}],
+    Canvas = ?mt(wxGLCanvas, wxGLCanvas:new(Frame, [{style,?wxFULL_REPAINT_ON_RESIZE}|
+						    Attrs])),
     
+    wxFrame:connect(Frame, show),
     ?m(true, wxWindow:show(Frame)),
+
+    receive #wx{event=#wxShow{}} -> ok
+    after 1000 -> exit(show_timeout)
+    end,
+
     ?m(false, wx:is_null(wxGLCanvas:getContext(Canvas))),
     ?m({'EXIT', {{error, no_gl_context,_},_}}, gl:getString(?GL_VENDOR)),
 
@@ -111,7 +123,7 @@ canvas(Config) ->
     %%gl:frustum( -2.0, 2.0, -2.0, 2.0, 5.0, 25.0 ),
     gl:ortho( -2.0, 2.0, -2.0*H/W, 2.0*H/W, -20.0, 20.0),
     gl:matrixMode(?GL_MODELVIEW),
-    gl:loadIdentity(),    
+    gl:loadIdentity(),
     gl:enable(?GL_DEPTH_TEST),
     gl:depthFunc(?GL_LESS),
     {R,G,B,_} = wxWindow:getBackgroundColour(Frame),
@@ -122,7 +134,7 @@ canvas(Config) ->
     ?m([], flush()),
     Env = wx:get_env(),
     Tester = self(),
-    spawn_link(fun() -> 
+    spawn_link(fun() ->
 		       wx:set_env(Env),
 		       ?m(ok, wxGLCanvas:setCurrent(Canvas)),
 		       ?m(ok, drawBox(1, Data)),
@@ -131,11 +143,20 @@ canvas(Config) ->
 		       %% This may fail when window is deleted
 		       catch draw_loop(2,Data,Canvas)
 	       end),
+    %% Needed on mac with wx-2.9
+    wxGLCanvas:connect(Canvas, paint, 
+    		       [{callback, fun(_,_) ->
+    					   wxGLCanvas:setCurrent(Canvas),
+    					   DC= wxPaintDC:new(Canvas),
+    					   wxPaintDC:destroy(DC)
+    				   end}]),
+
+
     ?m_receive(works),
     ?m([], flush()),
     io:format("Undef func ~p ~n", [catch gl:uniform1d(2, 0.75)]),
     timer:sleep(500),
-    ?m([], flush()),
+    flush(),
     wx_test_lib:wx_destroy(Frame, Config).
 
 flush() ->
@@ -150,6 +171,8 @@ flush(Collected) ->
     	  
 draw_loop(Deg,Data,Canvas) ->
     timer:sleep(15),
+    {NW,NH} = wxGLCanvas:getClientSize(Canvas),
+    gl:viewport(0,0,NW,NH),
     drawBox(Deg,Data),
     ?m(ok, wxGLCanvas:swapBuffers(Canvas)),
     draw_loop(Deg+1, Data,Canvas).
@@ -181,7 +204,12 @@ glu_tesselation(Config) ->
     Frame = wxFrame:new(WX,1,"Hello 3D-World",[]),
     Attrs = [{attribList, [?WX_GL_RGBA,?WX_GL_DOUBLEBUFFER,0]}],
     Canvas = ?mt(wxGLCanvas, wxGLCanvas:new(Frame, Attrs)),
+    wxFrame:connect(Frame, show),
     ?m(true, wxWindow:show(Frame)),
+
+    receive #wx{event=#wxShow{}} -> ok
+    after 1000 -> exit(show_timeout)
+    end,
     ?m(ok, wxGLCanvas:setCurrent(Canvas)),
     
     {RL1,RB1} = ?m({_,_}, glu:tesselate({0,0,1}, [{-1,0,0},{1,0,0},{0,1,0}])),
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index 02a0672594..a2d4c26319 100644
--- a/lib/wx/test/wx_xtra_SUITE.erl
+++ b/lib/wx/test/wx_xtra_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -111,6 +111,7 @@ app_dies(_Config) ->
 		     oops(Die,?LINE),
 		     wxFrame:show(Frame),
 		     oops(Die,?LINE),
+		     timer:sleep(100), %% Let the window be shown before DC can be created
 		     DC0  = wxClientDC:new(Win),
 		     oops(Die,?LINE),
 		     DC   = wxBufferedDC:new(DC0),
@@ -134,7 +135,7 @@ app_dies2(Test, N) ->
     end.
 
 oops(Die, Line) when (Die =:= last) orelse (Die =< Line) ->
-    timer:sleep(500),
+    timer:sleep(300),
     ?log(" Exits at line ~p~n",[Line]),
     exit({oops, Die});
 oops(_,_) -> ok.
@@ -191,8 +192,12 @@ menu_item_debug(Config) ->
     wxFrame:connect(Frame, close_window),
 
     wxPanel:new(Frame),
-    create_menus(Frame),
+    MenuBar = create_menus(Frame),
     wxWindow:show(Frame),
+    N = wxMenuBar:getMenuCount(MenuBar),
+    io:format("No of menus ~p~n",[N]),
+    [io:format("Menu ~p ~p~n",[Id, wxMenuBar:getLabelTop(MenuBar, Id)]) 
+     || Id <- lists:seq(0, N-1)],
     wx_test_lib:wx_destroy(Frame,Config).
 
 
@@ -224,14 +229,15 @@ create_menus(Frame) ->
      || Id <- lists:seq(600, 620)],
 
     ?m(ok,wxFrame:connect(Frame, command_menu_selected)),
-    ?m(true, wxMenuBar:append(MenuBar, File, "&File")),
-    ?m(true, wxMenuBar:append(MenuBar, Help, "&Help")),
-    ?m(true, wxMenuBar:append(MenuBar, T1, "T1")),
-    ?m(true, wxMenuBar:append(MenuBar, T2, "T2")),
-    ?m(true, wxMenuBar:append(MenuBar, T3, "T3")),
-    ?m(true, wxMenuBar:append(MenuBar, T4, "T4")),
-    ?m(true, wxMenuBar:append(MenuBar, T5, "T5")),
-    ?m(true, wxMenuBar:append(MenuBar, T6, "T6")),
 
-
-    ?m(ok, wxFrame:setMenuBar(Frame,MenuBar)).
+    ?m(true, wxMenuBar:insert(MenuBar, 0,File, "&File")),
+    ?m(true, wxMenuBar:insert(MenuBar, 1,Help, "&Help")),
+    ?m(true, wxMenuBar:insert(MenuBar, 2,T1, "T1")),
+    ?m(true, wxMenuBar:insert(MenuBar, 3,T2, "T2")),
+    ?m(true, wxMenuBar:insert(MenuBar, 4,T3, "T3")),
+    ?m(true, wxMenuBar:insert(MenuBar, 5,T4, "T4")),
+    ?m(true, wxMenuBar:insert(MenuBar, 6,T5, "T5")),
+    ?m(true, wxMenuBar:insert(MenuBar, 7,T6, "T6")),
+
+    ?m(ok, wxFrame:setMenuBar(Frame,MenuBar)),
+    MenuBar.
diff --git a/lib/wx/wxwin.m4 b/lib/wx/wxwin-2.8.m4
index 52c55e2e6e..52c55e2e6e 100644
--- a/lib/wx/wxwin.m4
+++ b/lib/wx/wxwin-2.8.m4
diff --git a/lib/wx/wxwin-2.9.m4 b/lib/wx/wxwin-2.9.m4
new file mode 100644
index 0000000000..1c50dcc272
--- /dev/null
+++ b/lib/wx/wxwin-2.9.m4
@@ -0,0 +1,1060 @@
+dnl ---------------------------------------------------------------------------
+dnl Author:          wxWidgets development team,
+dnl                  Francesco Montorsi,
+dnl                  Bob McCown (Mac-testing)
+dnl Creation date:   24/11/2001
+dnl RCS-ID:          $Id$
+dnl ---------------------------------------------------------------------------
+
+dnl ===========================================================================
+dnl Table of Contents of this macro file:
+dnl -------------------------------------
+dnl
+dnl SECTION A: wxWidgets main macros
+dnl  - WX_CONFIG_OPTIONS
+dnl  - WX_CONFIG_CHECK
+dnl  - WXRC_CHECK
+dnl  - WX_STANDARD_OPTIONS
+dnl  - WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl  - WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl SECTION B: wxWidgets-related utilities
+dnl  - WX_LIKE_LIBNAME
+dnl  - WX_ARG_ENABLE_YESNOAUTO
+dnl  - WX_ARG_WITH_YESNOAUTO
+dnl
+dnl SECTION C: messages to the user
+dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl  - WX_BOOLOPT_SUMMARY
+dnl
+dnl The special "WX_DEBUG_CONFIGURE" variable can be set to 1 to enable extra
+dnl debug output on stdout from these macros.
+dnl ===========================================================================
+
+
+dnl ---------------------------------------------------------------------------
+dnl Macros for wxWidgets detection. Typically used in configure.in as:
+dnl
+dnl     AC_ARG_ENABLE(...)
+dnl     AC_ARG_WITH(...)
+dnl        ...
+dnl     WX_CONFIG_OPTIONS
+dnl        ...
+dnl        ...
+dnl     WX_CONFIG_CHECK([2.6.0], [wxWin=1])
+dnl     if test "$wxWin" != 1; then
+dnl        AC_MSG_ERROR([
+dnl                wxWidgets must be installed on your system
+dnl                but wx-config script couldn't be found.
+dnl
+dnl                Please check that wx-config is in path, the directory
+dnl                where wxWidgets libraries are installed (returned by
+dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl                equivalent variable and wxWidgets version is 2.3.4 or above.
+dnl        ])
+dnl     fi
+dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl     LIBS="$LIBS $WX_LIBS"
+dnl
+dnl If you want to support standard --enable-debug/unicode/shared options, you
+dnl may do the following:
+dnl
+dnl     ...
+dnl     AC_CANONICAL_SYSTEM
+dnl
+dnl     # define configure options
+dnl     WX_CONFIG_OPTIONS
+dnl     WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
+dnl
+dnl     # basic configure checks
+dnl     ...
+dnl
+dnl     # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
+dnl     WX_DEBUG=$DEBUG
+dnl     WX_UNICODE=$UNICODE
+dnl
+dnl     WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl     WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$WXCONFIG_FLAGS])
+dnl     WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl     # write the output files
+dnl     AC_CONFIG_FILES([Makefile ...])
+dnl     AC_OUTPUT
+dnl
+dnl     # optional: just to show a message to the user
+dnl     WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl ---------------------------------------------------------------------------
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONFIG_OPTIONS
+dnl
+dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
+dnl --wx-config command line options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CONFIG_OPTIONS],
+[
+    AC_ARG_WITH(wxdir,
+                [  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH],
+                [ wx_config_name="$withval/wx-config"
+                  wx_config_args="--inplace"])
+    AC_ARG_WITH(wx-config,
+                [  --with-wx-config=CONFIG wx-config script to use (optional)],
+                wx_config_name="$withval" )
+    AC_ARG_WITH(wx-prefix,
+                [  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
+                wx_config_prefix="$withval", wx_config_prefix="")
+    AC_ARG_WITH(wx-exec-prefix,
+                [  --with-wx-exec-prefix=PREFIX
+                          Exec prefix where wxWidgets is installed (optional)],
+                wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
+])
+
+dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
+dnl wx_ver_ok=yes if it is:
+AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
+[
+    wx_ver_ok=""
+    if test "x$WX_VERSION" != x ; then
+      if test $wx_config_major_version -gt $1; then
+        wx_ver_ok=yes
+      else
+        if test $wx_config_major_version -eq $1; then
+           if test $wx_config_minor_version -gt $2; then
+              wx_ver_ok=yes
+           else
+              if test $wx_config_minor_version -eq $2; then
+                 if test $wx_config_micro_version -ge $3; then
+                    wx_ver_ok=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+    fi
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONFIG_CHECK(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
+dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
+dnl
+dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
+dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
+dnl environment variable to override the default name of the wx-config script
+dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
+dnl case the macro won't even waste time on tests for its existence.
+dnl
+dnl Optional WX-LIBS argument contains comma- or space-separated list of
+dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
+dnl and WX_LIBS_STATIC will contain flags to link with all of the core
+dnl wxWidgets libraries.
+dnl
+dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
+dnl invocation command in present. It can be used to fine-tune lookup of
+dnl best wxWidgets build available.
+dnl
+dnl Example use:
+dnl   WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
+dnl                    [--unicode --debug])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl Get the cflags and libraries from the wx-config script
+dnl
+AC_DEFUN([WX_CONFIG_CHECK],
+[
+  dnl do we have wx-config name: it can be wx-config or wxd-config or ...
+  if test x${WX_CONFIG_NAME+set} != xset ; then
+     WX_CONFIG_NAME=wx-config
+  fi
+
+  if test "x$wx_config_name" != x ; then
+     WX_CONFIG_NAME="$wx_config_name"
+  fi
+
+  dnl deal with optional prefixes
+  if test x$wx_config_exec_prefix != x ; then
+     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
+     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
+  fi
+  if test x$wx_config_prefix != x ; then
+     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
+     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
+  fi
+  if test "$cross_compiling" = "yes"; then
+     wx_config_args="$wx_config_args --host=$host_alias"
+  fi
+
+  dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
+  if test -x "$WX_CONFIG_NAME" ; then
+     AC_MSG_CHECKING(for wx-config)
+     WX_CONFIG_PATH="$WX_CONFIG_NAME"
+     AC_MSG_RESULT($WX_CONFIG_PATH)
+  else
+     AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
+  fi
+
+  if test "$WX_CONFIG_PATH" != "no" ; then
+    WX_VERSION=""
+
+    min_wx_version=ifelse([$1], ,2.2.1,$1)
+    if test -z "$5" ; then
+      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
+    else
+      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
+    fi
+
+    dnl don't add the libraries ($4) to this variable as this would result in
+    dnl an error when it's used with --version below
+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
+
+    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+    wx_config_major_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    wx_config_minor_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    wx_config_micro_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    wx_requested_major_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    wx_requested_minor_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    wx_requested_micro_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+                              [$wx_requested_minor_version],
+                              [$wx_requested_micro_version])
+
+    if test -n "$wx_ver_ok"; then
+      AC_MSG_RESULT(yes (version $WX_VERSION))
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
+
+      dnl is this even still appropriate?  --static is a real option now
+      dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
+      dnl what the user actually wants, making this redundant at best.
+      dnl For now keep it in case anyone actually used it in the past.
+      AC_MSG_CHECKING([for wxWidgets static library])
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
+      if test "x$WX_LIBS_STATIC" = "x"; then
+        AC_MSG_RESULT(no)
+      else
+        AC_MSG_RESULT(yes)
+      fi
+
+      dnl starting with version 2.2.6 wx-config has --cppflags argument
+      wx_has_cppflags=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_cppflags=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -gt 2; then
+              wx_has_cppflags=yes
+           else
+              if test $wx_config_minor_version -eq 2; then
+                 if test $wx_config_micro_version -ge 6; then
+                    wx_has_cppflags=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+
+      dnl starting with version 2.7.0 wx-config has --rescomp option
+      wx_has_rescomp=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_rescomp=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -ge 7; then
+              wx_has_rescomp=yes
+           fi
+        fi
+      fi
+      if test "x$wx_has_rescomp" = x ; then
+         dnl cannot give any useful info for resource compiler
+         WX_RESCOMP=
+      else
+         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+      fi
+
+      if test "x$wx_has_cppflags" = x ; then
+         dnl no choice but to define all flags like CFLAGS
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+         WX_CPPFLAGS=$WX_CFLAGS
+         WX_CXXFLAGS=$WX_CFLAGS
+
+         WX_CFLAGS_ONLY=$WX_CFLAGS
+         WX_CXXFLAGS_ONLY=$WX_CFLAGS
+      else
+         dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
+         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+
+         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+      fi
+
+      ifelse([$2], , :, [$2])
+
+    else
+
+       if test "x$WX_VERSION" = x; then
+          dnl no wx-config at all
+          AC_MSG_RESULT(no)
+       else
+          AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
+       fi
+
+       WX_CFLAGS=""
+       WX_CPPFLAGS=""
+       WX_CXXFLAGS=""
+       WX_LIBS=""
+       WX_LIBS_STATIC=""
+       WX_RESCOMP=""
+
+       if test ! -z "$5"; then
+
+          wx_error_message="
+    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+    build with the following settings:
+        $5
+    but such build is not available.
+
+    To see the wxWidgets builds available on this system, please use
+    'wx-config --list' command. To use the default build, returned by
+    'wx-config --selected-config', use the options with their 'auto'
+    default values."
+
+       fi
+
+       wx_error_message="
+    The requested wxWidgets build couldn't be found.
+    $wx_error_message
+
+    If you still get this error, then check that 'wx-config' is
+    in path, the directory where wxWidgets libraries are installed
+    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
+    or equivalent variable and wxWidgets version is $1 or above."
+
+       ifelse([$3], , AC_MSG_ERROR([$wx_error_message]), [$3])
+
+    fi
+  else
+
+    WX_CFLAGS=""
+    WX_CPPFLAGS=""
+    WX_CXXFLAGS=""
+    WX_LIBS=""
+    WX_LIBS_STATIC=""
+    WX_RESCOMP=""
+
+    ifelse([$3], , :, [$3])
+
+  fi
+
+  AC_SUBST(WX_CPPFLAGS)
+  AC_SUBST(WX_CFLAGS)
+  AC_SUBST(WX_CXXFLAGS)
+  AC_SUBST(WX_CFLAGS_ONLY)
+  AC_SUBST(WX_CXXFLAGS_ONLY)
+  AC_SUBST(WX_LIBS)
+  AC_SUBST(WX_LIBS_STATIC)
+  AC_SUBST(WX_VERSION)
+  AC_SUBST(WX_RESCOMP)
+
+  dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
+  dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
+  WX_VERSION_MAJOR="$wx_config_major_version"
+  WX_VERSION_MINOR="$wx_config_minor_version"
+  WX_VERSION_MICRO="$wx_config_micro_version"
+  AC_SUBST(WX_VERSION_MAJOR)
+  AC_SUBST(WX_VERSION_MINOR)
+  AC_SUBST(WX_VERSION_MICRO)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl Get information on the wxrc program for making C++, Python and xrs
+dnl resource files.
+dnl
+dnl     AC_ARG_ENABLE(...)
+dnl     AC_ARG_WITH(...)
+dnl        ...
+dnl     WX_CONFIG_OPTIONS
+dnl        ...
+dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
+dnl     if test "$wxWin" != 1; then
+dnl        AC_MSG_ERROR([
+dnl                wxWidgets must be installed on your system
+dnl                but wx-config script couldn't be found.
+dnl
+dnl                Please check that wx-config is in path, the directory
+dnl                where wxWidgets libraries are installed (returned by
+dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl                equivalent variable and wxWidgets version is 2.6.0 or above.
+dnl        ])
+dnl     fi
+dnl
+dnl     WXRC_CHECK([HAVE_WXRC=1], [HAVE_WXRC=0])
+dnl     if test "x$HAVE_WXRC" != x1; then
+dnl         AC_MSG_ERROR([
+dnl                The wxrc program was not installed or not found.
+dnl
+dnl                Please check the wxWidgets installation.
+dnl         ])
+dnl     fi
+dnl
+dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+dnl ---------------------------------------------------------------------------
+dnl WXRC_CHECK([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
+dnl resources.  The variable WXRC will be set and substituted in the configure
+dnl script and Makefiles.
+dnl
+dnl Example use:
+dnl   WXRC_CHECK([wxrc=1], [wxrc=0])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl wxrc program from the wx-config script
+dnl
+AC_DEFUN([WXRC_CHECK],
+[
+  AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
+
+  if test "x$WX_CONFIG_NAME" = x; then
+    AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
+  else
+
+    AC_MSG_CHECKING([for wxrc])
+
+    if test "x$WXRC" = x ; then
+      dnl wx-config --utility is a new addition to wxWidgets:
+      _WX_PRIVATE_CHECK_VERSION(2,5,3)
+      if test -n "$wx_ver_ok"; then
+        WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
+      fi
+    fi
+
+    if test "x$WXRC" = x ; then
+      AC_MSG_RESULT([not found])
+      ifelse([$2], , :, [$2])
+    else
+      AC_MSG_RESULT([$WXRC])
+      ifelse([$1], , :, [$1])
+    fi
+
+    AC_SUBST(WXRC)
+  fi
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_LIKE_LIBNAME([output-var] [prefix], [name])
+dnl
+dnl Sets the "output-var" variable to the name of a library named with same
+dnl wxWidgets rule.
+dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
+dnl      the $lib variable to:
+dnl          'mine_gtk2ud_test-2.8'
+dnl      if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_LIKE_LIBNAME],
+    [
+        wx_temp="$2""_""$WX_PORT"
+
+        dnl add the [u][d] string
+        if test "$WX_UNICODE" = "1"; then
+            wx_temp="$wx_temp""u"
+        fi
+        if test "$WX_DEBUG" = "1"; then
+            wx_temp="$wx_temp""d"
+        fi
+
+        dnl complete the name of the lib
+        wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
+
+        dnl save it in the user's variable
+        $1=$wx_temp
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO
+dnl
+dnl Two little custom macros which define the ENABLE/WITH configure arguments.
+dnl Macro arguments:
+dnl $1 = the name of the --enable / --with  feature
+dnl $2 = the name of the variable associated
+dnl $3 = the description of that feature
+dnl $4 = the default value for that feature
+dnl $5 = additional action to do in case option is given with "yes" value
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_ARG_ENABLE_YESNOAUTO],
+         [AC_ARG_ENABLE($1,
+            AC_HELP_STRING([--enable-$1], [$3 (default is $4)]),
+            [], [enableval="$4"])
+
+            dnl Show a message to the user about this option
+            AC_MSG_CHECKING([for the --enable-$1 option])
+            if test "$enableval" = "yes" ; then
+                AC_MSG_RESULT([yes])
+                $2=1
+                $5
+            elif test "$enableval" = "no" ; then
+                AC_MSG_RESULT([no])
+                $2=0
+            elif test "$enableval" = "auto" ; then
+                AC_MSG_RESULT([will be automatically detected])
+                $2="auto"
+            else
+                AC_MSG_ERROR([
+    Unrecognized option value (allowed values: yes, no, auto)
+                ])
+            fi
+         ])
+
+AC_DEFUN([WX_ARG_WITH_YESNOAUTO],
+         [AC_ARG_WITH($1,
+            AC_HELP_STRING([--with-$1], [$3 (default is $4)]),
+            [], [withval="$4"])
+
+            dnl Show a message to the user about this option
+            AC_MSG_CHECKING([for the --with-$1 option])
+            if test "$withval" = "yes" ; then
+                AC_MSG_RESULT([yes])
+                $2=1
+                $5
+            dnl NB: by default we don't allow --with-$1=no option
+            dnl     since it does not make much sense !
+            elif test "$6" = "1" -a "$withval" = "no" ; then
+                AC_MSG_RESULT([no])
+                $2=0
+            elif test "$withval" = "auto" ; then
+                AC_MSG_RESULT([will be automatically detected])
+                $2="auto"
+            else
+                AC_MSG_ERROR([
+    Unrecognized option value (allowed values: yes, auto)
+                ])
+            fi
+         ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS([options-to-add])
+dnl
+dnl Adds to the configure script one or more of the following options:
+dnl   --enable-[debug|unicode|shared|wxshared|wxdebug]
+dnl   --with-[gtk|msw|motif|x11|mac|dfb]
+dnl   --with-wxversion
+dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
+dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
+dnl
+dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
+dnl --enable-unicode option (in boolean format) while the second indicates
+dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS],
+        [
+
+        dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
+        dnl the $1 argument contains respectively the debug,unicode or shared options.
+
+        dnl be careful here not to set debug flag if only "wxdebug" was specified
+        ifelse(regexp([$1], [\bdebug]), [-1],,
+               [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])
+
+        ifelse(index([$1], [unicode]), [-1],,
+               [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])])
+
+        ifelse(regexp([$1], [\bshared]), [-1],,
+               [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
+
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
+        dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
+        ifelse(index([$1], [toolkit]), [-1],,
+               [
+                AC_ARG_WITH([toolkit],
+                            AC_HELP_STRING([--with-toolkit],
+                                           [Build against a specific wxWidgets toolkit (default is auto)]),
+                            [], [withval="auto"])
+
+                dnl Show a message to the user about this option
+                AC_MSG_CHECKING([for the --with-toolkit option])
+                if test "$withval" = "auto" ; then
+                    AC_MSG_RESULT([will be automatically detected])
+                    TOOLKIT="auto"
+                else
+                    TOOLKIT="$withval"
+
+                    dnl PORT must be one of the allowed values
+                    if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
+                            "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
+                            "$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \
+                            "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11"; then
+                        AC_MSG_ERROR([
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, osx_carbon, osx_cocoa, dfb, x11)
+                        ])
+                    fi
+
+                    AC_MSG_RESULT([$TOOLKIT])
+                fi
+               ])
+
+        dnl ****** IMPORTANT *******
+        dnl   Unlike for the UNICODE setting, you can build your program in
+        dnl   shared mode against a static build of wxWidgets. Thus we have the
+        dnl   following option which allows these mixtures. E.g.
+        dnl
+        dnl      ./configure --disable-shared --with-wxshared
+        dnl
+        dnl   will build your library in static mode against the first available
+        dnl   shared build of wxWidgets.
+        dnl
+        dnl   Note that's not possible to do the viceversa:
+        dnl
+        dnl      ./configure --enable-shared --without-wxshared
+        dnl
+        dnl   Doing so you would try to build your library in shared mode against a static
+        dnl   build of wxWidgets. This is not possible (you would mix PIC and non PIC code) !
+        dnl   A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES
+        dnl   (where we know what 'auto' should be expanded to).
+        dnl
+        dnl   If you try to build something in ANSI mode against a UNICODE build
+        dnl   of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets,
+        dnl   then at best you'll get ton of linking errors !
+        dnl ************************
+
+        ifelse(index([$1], [wxshared]), [-1],,
+               [
+                WX_ARG_WITH_YESNOAUTO(
+                    [wxshared], [WX_SHARED],
+                    [Force building against a shared build of wxWidgets, even if --disable-shared is given],
+                    [auto], [], [1])
+               ])
+
+        dnl Just like for SHARED and WX_SHARED it may happen that some adventurous
+        dnl peoples will want to mix a wxWidgets release build with a debug build of
+        dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables.
+        ifelse(index([$1], [wxdebug]), [-1],,
+               [
+                WX_ARG_WITH_YESNOAUTO(
+                    [wxdebug], [WX_DEBUG],
+                    [Force building against a debug build of wxWidgets, even if --disable-debug is given],
+                    [auto], [], [1])
+               ])
+
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
+        dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values
+        ifelse(index([$1], [wxversion]), [-1],,
+               [
+                AC_ARG_WITH([wxversion],
+                            AC_HELP_STRING([--with-wxversion],
+                                           [Build against a specific version of wxWidgets (default is auto)]),
+                            [], [withval="auto"])
+
+                dnl Show a message to the user about this option
+                AC_MSG_CHECKING([for the --with-wxversion option])
+                if test "$withval" = "auto" ; then
+                    AC_MSG_RESULT([will be automatically detected])
+                    WX_RELEASE="auto"
+                else
+
+                    wx_requested_major_version=`echo $withval | \
+                        sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+                    wx_requested_minor_version=`echo $withval | \
+                        sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+
+                    dnl both vars above must be exactly 1 digit
+                    if test "${#wx_requested_major_version}" != "1" -o \
+                            "${#wx_requested_minor_version}" != "1" ; then
+                        AC_MSG_ERROR([
+    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0)
+                        ])
+                    fi
+
+                    WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version"
+                    AC_MSG_RESULT([$WX_RELEASE])
+                fi
+               ])
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
+            echo "[[dbg]] UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE"
+            echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED"
+            echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
+            echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
+        fi
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl
+dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values
+dnl which are different from "auto".
+dnl Thus this macro needs to be called only once all options have been set.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS],
+        [
+        if test "$WX_SHARED" = "1" ; then
+            WXCONFIG_FLAGS="--static=no "
+        elif test "$WX_SHARED" = "0" ; then
+            WXCONFIG_FLAGS="--static=yes "
+        fi
+
+        if test "$WX_DEBUG" = "1" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes "
+        elif test "$WX_DEBUG" = "0" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
+        fi
+
+        dnl The user should have set WX_UNICODE=UNICODE
+        if test "$WX_UNICODE" = "1" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes "
+        elif test "$WX_UNICODE" = "0" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no "
+        fi
+
+        if test "$TOOLKIT" != "auto" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
+        fi
+
+        if test "$WX_RELEASE" != "auto" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE "
+        fi
+
+        dnl strip out the last space of the string
+        WXCONFIG_FLAGS=${WXCONFIG_FLAGS% }
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] WXCONFIG_FLAGS: $WXCONFIG_FLAGS"
+        fi
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]
+dnl                             [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets
+dnl additional CPP flags and put the result of the search in WX_$RESULTVAR
+dnl also adding the "yes" or "no" message result to MSG.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR],
+        [
+        if test "$$1" = "auto" ; then
+
+            dnl The user does not have particular preferences for this option;
+            dnl so we will detect the wxWidgets relative build setting and use it
+            AC_MSG_CHECKING([$3])
+
+            dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
+            dnl string or to 0 otherwise.
+            dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
+            dnl       doesn't work; we use 'expr STRING : REGEXP' instead
+            WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
+
+            if test "$WX_$1" != "0"; then
+                WX_$1=1
+                AC_MSG_RESULT([yes])
+                ifelse([$4], , :, [$4])
+            else
+                WX_$1=0
+                AC_MSG_RESULT([no])
+                ifelse([$5], , :, [$5])
+            fi
+        else
+
+            dnl Use the setting given by the user
+            WX_$1=$$1
+        fi
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl Detects the values of the following variables:
+dnl 1) WX_RELEASE
+dnl 2) WX_UNICODE
+dnl 3) WX_DEBUG
+dnl 4) WX_SHARED    (and also WX_STATIC)
+dnl 5) WX_PORT
+dnl from the previously selected wxWidgets build; this macro in fact must be
+dnl called *after* calling the WX_CONFIG_CHECK macro.
+dnl
+dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set
+dnl by WX_CONFIG_CHECK macro
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
+        [
+        dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits,
+        dnl            while WX_RELEASE only the major.minor ones.
+        WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
+        if test $WX_RELEASE -lt 26 ; then
+
+            AC_MSG_ERROR([
+    Cannot detect the wxWidgets configuration for the selected wxWidgets build
+    since its version is $WX_VERSION < 2.6.0; please install a newer
+    version of wxWidgets.
+                         ])
+        fi
+
+        dnl The wx-config we are using understands the "--selected_config"
+        dnl option which returns an easy-parseable string !
+        WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] Using wx-config --selected-config"
+            echo "[[dbg]] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG"
+        fi
+
+
+        dnl we could test directly for WX_SHARED with a line like:
+        dnl    _WX_SELECTEDCONFIG_CHECKFOR([SHARED], [shared],
+        dnl                                [if wxWidgets was built in SHARED mode])
+        dnl but wx-config --selected-config DOES NOT outputs the 'shared'
+        dnl word when wx was built in shared mode; it rather outputs the
+        dnl 'static' word when built in static mode.
+        if test $WX_SHARED = "1"; then
+            STATIC=0
+        elif test $WX_SHARED = "0"; then
+            STATIC=1
+        elif test $WX_SHARED = "auto"; then
+            STATIC="auto"
+        fi
+
+        dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
+        _WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode],
+                                    [if wxWidgets was built with UNICODE enabled])
+        _WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug],
+                                    [if wxWidgets was built in DEBUG mode])
+        _WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static],
+                                    [if wxWidgets was built in STATIC mode])
+
+        dnl init WX_SHARED from WX_STATIC
+        if test "$WX_STATIC" != "0"; then
+            WX_SHARED=0
+        else
+            WX_SHARED=1
+        fi
+
+        AC_SUBST(WX_UNICODE)
+        AC_SUBST(WX_DEBUG)
+        AC_SUBST(WX_SHARED)
+
+        dnl detect the WX_PORT to use
+        if test "$TOOLKIT" = "auto" ; then
+
+            dnl The user does not have particular preferences for this option;
+            dnl so we will detect the wxWidgets relative build setting and use it
+            AC_MSG_CHECKING([which wxWidgets toolkit was selected])
+
+            WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
+            WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
+            WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
+            WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
+            WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
+            WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
+            WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
+
+            WX_PORT="unknown"
+            if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
+            if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
+            if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
+            if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
+            if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
+            if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
+            if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
+
+            dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
+            dnl       ports are called 'osx_cocoa' and 'osx_carbon' (see above)
+            WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
+            if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
+
+            dnl check at least one of the WX_*PORT has been set !
+
+            if test "$WX_PORT" = "unknown" ; then
+                AC_MSG_ERROR([
+        Cannot detect the currently installed wxWidgets port !
+        Please check your 'wx-config --cxxflags'...
+                            ])
+            fi
+
+            AC_MSG_RESULT([$WX_PORT])
+        else
+
+            dnl Use the setting given by the user
+            if test -z "$TOOLKIT" ; then
+                WX_PORT=$TOOLKIT
+            else
+                dnl try with PORT
+                WX_PORT=$PORT
+            fi
+        fi
+
+        AC_SUBST(WX_PORT)
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] Values of all WX_* options after final detection:"
+            echo "[[dbg]] WX_DEBUG: $WX_DEBUG"
+            echo "[[dbg]] WX_UNICODE: $WX_UNICODE"
+            echo "[[dbg]] WX_SHARED: $WX_SHARED"
+            echo "[[dbg]] WX_RELEASE: $WX_RELEASE"
+            echo "[[dbg]] WX_PORT: $WX_PORT"
+        fi
+
+        dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when
+        dnl the user gives the options:
+        dnl      ./configure --enable-shared --without-wxshared
+        dnl or just do
+        dnl      ./configure --enable-shared
+        dnl but there is only a static build of wxWidgets available.
+        if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
+            AC_MSG_ERROR([
+    Cannot build shared library against a static build of wxWidgets !
+    This error happens because the wxWidgets build which was selected
+    has been detected as static while you asked to build $PACKAGE_NAME
+    as shared library and this is not possible.
+    Use the '--disable-shared' option to build $PACKAGE_NAME
+    as static library or '--with-wxshared' to use wxWidgets as shared library.
+                         ])
+        fi
+
+        dnl now we can finally update the DEBUG,UNICODE,SHARED options
+        dnl to their final values if they were set to 'auto'
+        if test "$DEBUG" = "auto"; then
+            DEBUG=$WX_DEBUG
+        fi
+        if test "$UNICODE" = "auto"; then
+            UNICODE=$WX_UNICODE
+        fi
+        if test "$SHARED" = "auto"; then
+            SHARED=$WX_SHARED
+        fi
+        if test "$TOOLKIT" = "auto"; then
+            TOOLKIT=$WX_PORT
+        fi
+
+        dnl in case the user needs a BUILD=debug/release var...
+        if test "$DEBUG" = "1"; then
+            BUILD="debug"
+        elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then
+            BUILD="release"
+        fi
+
+        dnl respect the DEBUG variable adding the optimize/debug flags
+        dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
+        dnl       don't need to set them, too
+        if test "$DEBUG" = "1"; then
+            CXXFLAGS="$CXXFLAGS -g -O0"
+            CFLAGS="$CFLAGS -g -O0"
+        else
+            CXXFLAGS="$CXXFLAGS -O2"
+            CFLAGS="$CFLAGS -O2"
+        fi
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_BOOLOPT_SUMMARY([name of the boolean variable to show summary for],
+dnl                   [what to print when var is 1],
+dnl                   [what to print when var is 0])
+dnl
+dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0.
+dnl This macro mainly exists just to make configure.ac scripts more readable.
+dnl
+dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments
+dnl       if you want that m4 avoid to throw away the spaces prefixed to the
+dnl       argument value.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_BOOLOPT_SUMMARY],
+        [
+        if test "x$$1" = "x1" ; then
+            echo $2
+        elif test "x$$1" = "x0" ; then
+            echo $3
+        else
+            echo "$1 is $$1"
+        fi
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl Shows a summary message to the user about the WX_* variable contents.
+dnl This macro is used typically at the end of the configure script.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG],
+        [
+        echo
+        echo "  The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
+        echo "  has the following settings:"
+        WX_BOOLOPT_SUMMARY([WX_DEBUG],   ["  - DEBUG build"],  ["  - RELEASE build"])
+        WX_BOOLOPT_SUMMARY([WX_UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
+        WX_BOOLOPT_SUMMARY([WX_SHARED],  ["  - SHARED mode"],  ["  - STATIC mode"])
+        echo "  - VERSION: $WX_VERSION"
+        echo "  - PORT: $WX_PORT"
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
+dnl about the configuration of the package which used the wxpresets.
+dnl
+dnl Typical usage:
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl    echo "   - Package setting 1: $SETTING1"
+dnl    echo "   - Package setting 2: $SETTING1"
+dnl    ...
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN],
+        [
+        echo
+        echo " ----------------------------------------------------------------"
+        echo "  Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
+        echo "  Summary of main configuration settings for $PACKAGE_NAME:"
+        WX_BOOLOPT_SUMMARY([DEBUG], ["  - DEBUG build"], ["  - RELEASE build"])
+        WX_BOOLOPT_SUMMARY([UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
+        WX_BOOLOPT_SUMMARY([SHARED], ["  - SHARED mode"], ["  - STATIC mode"])
+    ])
+
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_END],
+        [
+        WX_STANDARD_OPTIONS_SUMMARY_MSG
+        echo
+        echo "  Now, just run make."
+        echo " ----------------------------------------------------------------"
+        echo
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl Deprecated macro wrappers
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([AM_OPTIONS_WXCONFIG], [WX_CONFIG_OPTIONS])
+AC_DEFUN([AM_PATH_WXCONFIG], [
+    WX_CONFIG_CHECK([$1],[$2],[$3],[$4],[$5])
+])
+AC_DEFUN([AM_PATH_WXRC], [WXRC_CHECK([$1],[$2])])
diff --git a/lib/xmerl/doc/src/motorcycles_dtd.txt b/lib/xmerl/doc/src/motorcycles_dtd.txt
index bab0d563f0..62ad4ac5fe 100644
--- a/lib/xmerl/doc/src/motorcycles_dtd.txt
+++ b/lib/xmerl/doc/src/motorcycles_dtd.txt
@@ -15,4 +15,5 @@
 <!ELEMENT date              (#PCDATA)>
 <!ATTLIST  bike year NMTOKEN #REQUIRED
                 color NMTOKENS #REQUIRED
-                condition (useless | bad | serviceable | moderate | good | excellent | new | outstanding) "excellent" >
+                condition (useless | bad | serviceable | moderate | good |
+                           excellent | new | outstanding) "excellent" >
diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
index ce1aa11fba..d5ce3fe6ff 100644
--- a/lib/xmerl/src/Makefile
+++ b/lib/xmerl/src/Makefile
@@ -166,34 +166,34 @@ EDOC_PATHS = \
 	-pa $(EDOC_APP)/ebin -pa $(XMERL_APP)/ebin -pa $(SYNTAX_TOOLS_APP)/ebin
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
 
 xmerl_xpath_parse.erl:	xmerl_xpath_parse.yrl
-	$(ERLC)  -o  $(ESRC) $<
+	$(yecc_verbose)$(ERLC)  -o  $(ESRC) $<
 
 xmerl_b64Bin.erl: xmerl_b64Bin.yrl
-	$(ERLC)  -o  $(ESRC) $<
+	$(yecc_verbose)$(ERLC)  -o  $(ESRC) $<
 
 xmerl_sax_parser_list.erl: xmerl_sax_parser_list.erlsrc xmerl_sax_parser_base.erlsrc
-	cat xmerl_sax_parser_list.erlsrc xmerl_sax_parser_base.erlsrc >$@
+	$(gen_verbose)cat xmerl_sax_parser_list.erlsrc xmerl_sax_parser_base.erlsrc >$@
 
 xmerl_sax_parser_latin1.erl: xmerl_sax_parser_latin1.erlsrc xmerl_sax_parser_base.erlsrc
-	cat xmerl_sax_parser_latin1.erlsrc xmerl_sax_parser_base.erlsrc >$@
+	$(gen_verbose)cat xmerl_sax_parser_latin1.erlsrc xmerl_sax_parser_base.erlsrc >$@
 
 xmerl_sax_parser_utf8.erl: xmerl_sax_parser_utf8.erlsrc xmerl_sax_parser_base.erlsrc
-	cat xmerl_sax_parser_utf8.erlsrc xmerl_sax_parser_base.erlsrc >$@
+	$(gen_verbose)cat xmerl_sax_parser_utf8.erlsrc xmerl_sax_parser_base.erlsrc >$@
 
 xmerl_sax_parser_utf16be.erl: xmerl_sax_parser_utf16be.erlsrc xmerl_sax_parser_base.erlsrc
-	cat xmerl_sax_parser_utf16be.erlsrc xmerl_sax_parser_base.erlsrc >$@
+	$(gen_verbose)cat xmerl_sax_parser_utf16be.erlsrc xmerl_sax_parser_base.erlsrc >$@
 
 xmerl_sax_parser_utf16le.erl: xmerl_sax_parser_utf16le.erlsrc xmerl_sax_parser_base.erlsrc
-	cat xmerl_sax_parser_utf16le.erlsrc xmerl_sax_parser_base.erlsrc >$@
+	$(gen_verbose)cat xmerl_sax_parser_utf16le.erlsrc xmerl_sax_parser_base.erlsrc >$@
 
 $(EBIN)/%.beam:	%.erl
-	$(ERLC)  $(ERL_COMPILE_FLAGS) -o $(EBIN) $<
+	$(V_ERLC)  $(ERL_COMPILE_FLAGS) -o $(EBIN) $<
 
 $(DOCDIR)/%.html:	%.erl
 	$(ERL) -noshell $(EDOC_PATHS) \
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 05431a5fd2..883153628c 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -461,7 +462,7 @@ hook(X, State) ->
 event(_X, S) ->
     S.
 
-%% The acc/3 function can return either {Acc�, S'} or {Acc', Pos', S'},
+%% The acc/3 function can return either {Acc´, S'} or {Acc', Pos', S'},
 %% where Pos' can be derived from X#xmlElement.pos, X#xmlText.pos, or
 %% X#xmlAttribute.pos (whichever is the current object type.)
 %% The acc/3 function is not allowed to redefine the type of object
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index 78d84d23a4..ffe227c671 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -849,7 +850,7 @@ element_content({import,S=#xsd_state{schema_name=ThisSchema,
     SchemaLocation = get_attribute_value(schemaLocation,I,absent),
     %% If SchemaLocation is absent, the identification of that schema
     %% is leaved to the instance, application or user, via the
-    %% mechanisms described ��4.3 in XML Schema Part 1.
+    %% mechanisms described §4.3 in XML Schema Part 1.
     
     S2 = process_external_schema_once(SchemaLocation,Namespace,S),
     {{import,[]},S2#xsd_state{schema_name=ThisSchema,
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 55b6d1844c..e21355f877 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -531,8 +532,8 @@ ticket_7430(Config) ->
 		   {xmlElement,a,a,[],
 		    {xmlNamespace,[],[]},
 		    [],1,[],
-		    [{xmlText,[{a,1}],1,[],"�",text},
-		     {xmlText,[{a,1}],2,[],"\n�",text}],
+		    [{xmlText,[{a,1}],1,[],"é",text},
+		     {xmlText,[{a,1}],2,[],"\né",text}],
 		    [],_,undeclared} ->
 		       ok;
 		   _ ->
diff --git a/make/fakefop b/make/fakefop
index bbe81ef3b1..b64428bbd1 100755
--- a/make/fakefop
+++ b/make/fakefop
@@ -1,10 +1,9 @@
 #!/bin/sh
 #
-# Copyright Tuncer Ayaz 2010. All Rights Reserved.
-#
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010. All Rights Reserved.
+# Copyright Tuncer Ayaz 2010-2013. All Rights Reserved.
+# Copyright Ericsson AB 2010-2013. All Rights Reserved.
 #
 # The 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,92 +21,85 @@
 # Author: Tuncer Ayaz
 #
 
-if [ $# -lt 4 ]
+if [ $# -lt 6 ]
 then
-  echo "Usage: fakefop -fo IGNORED -pdf OUTFILE"
+  echo "Usage: fakefop -c IGNORED -fo IGNORED -pdf OUTFILE"
   exit 1
 fi
 
-OUTFILE=$4
-NAME=`basename $4 .pdf`
+OUTFILE=$6
+
+echo -n -e '%PDF-1.4\n%\0342\0343\0317\0323\n\n' > $OUTFILE
 
-echo Write $OUTFILE
-cat > $OUTFILE <<EndOfFile
-%PDF-1.4
+cat >> $OUTFILE <<EndOfFile
 1 0 obj
-  << /Type /Catalog
-    /Outlines 2 0 R
-    /Pages 3 0 R
-  >>
+<<
+  /Type /Catalog
+  /Pages 2 0 R
+>>
 endobj
 
 2 0 obj
-  << /Type /Outlines
-    /Count 0
-  >>
+<<
+  /Type /Pages
+  /Kids [ 3 0 R ]
+  /Count 1
+>>
 endobj
 
 3 0 obj
-  << /Type /Pages
-    /Kids [4 0 R]
-    /Count 1
+<<
+  /Type /Page
+  /Parent 2 0 R
+  /MediaBox [ 0 0 612 492 ]
+  /Contents 5 0 R
+  /Resources <<
+    /Font <<
+      /F1 4 0 R
+    >>
   >>
+>>
 endobj
 
 4 0 obj
-  << /Type /Page
-      /Parent 3 0 R
-      /MediaBox [0 0 612 492]
-      /Contents 5 0 R
-      /Resources << /ProcSet 6 0 R
-                    /Font << /F1 7 0 R >>
-                >>
-  >>
+<<
+  /Type /Font
+  /Subtype /Type1
+  /Name /F1
+  /BaseFont /Helvetica
+  /Encoding /StandardEncoding
+>>
 endobj
 
 5 0 obj
-  << /Length 73 >>
+<<
+  /Length 74
+>>
 stream
-  BT
-    /F1 24 Tf
-    10 400 Td
-    ($NAME) Tj
-  ET
-  BT
-    /F1 24 Tf
-    10 350 Td
-    (\(placeholder PDF generated without FOP\)) Tj
-  ET
+BT
+/F1 24 Tf
+10 400 Td
+(\(placeholder PDF generated with fakefop\)) Tj
+ET
 endstream
 endobj
 
-6 0 obj
-  [/PDF /Text]
-endobj
-7 0 obj
-  << /Type /Font
-    /Subtype /Type1
-    /Name /F1
-    /BaseFont /Helvetica
-    /Encoding /MacRomanEncoding
-  >>
-endobj
 xref
-0 8
-0000000000 65535 f
-0000000009 00000 n
-0000000074 00000 n
-0000000120 00000 n
-0000000179 00000 n
-0000000364 00000 n
-0000000466 00000 n
-0000000496 00000 n
+0 6
+0000000000 65536 f 
+0000000016 00000 n 
+0000000070 00000 n 
+0000000136 00000 n 
+0000000291 00000 n 
+0000000410 00000 n 
 
 trailer
-  << /Size 8
-    /Root 1 0 R
-  >>
+<<
+  /Size 6
+  /Root 1 0 R
+>>
+
 startxref
-625
+536
 %%EOF
 EndOfFile
diff --git a/make/otp.mk.in b/make/otp.mk.in
index f2c2cee767..fca9cf3cff 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
 
 # ----------------------------------------------------
+#	Output
+# ----------------------------------------------------
+include $(ERL_TOP)/make/output.mk
+
+# ----------------------------------------------------
 #	Cross Compiling
 # ----------------------------------------------------
 CROSS_COMPILING = @CROSS_COMPILING@
@@ -104,19 +109,19 @@ ESRC = .
 endif
 
 $(EBIN)/%.beam: $(EGEN)/%.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 $(EBIN)/%.beam: $(ESRC)/%.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
 # Special rule for the HIPE bootstrap w/ native libs
 ../boot_ebin/%.beam: $(ESRC)/%.erl
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o../boot_ebin $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) -o../boot_ebin $<
 endif
 
 .erl.beam:
-	$(ERLC) $(ERL_COMPILE_FLAGS) -o$(dir $@) $<
+	$(V_ERLC) $(ERL_COMPILE_FLAGS) -o$(dir $@) $<
 
 #
 # When .erl files are automatically created GNU make removes them if
@@ -131,10 +136,10 @@ endif
 ##	$(ERLC) $(IDL_FLAGS) $<
 
 $(EGEN)/%.erl: $(ESRC)/%.yrl
-	$(ERLC) $(YRL_FLAGS) -o$(EGEN) $<
+	$(yecc_verbose)$(ERLC) $(YRL_FLAGS) -o$(EGEN) $<
 
 $(EGEN)/%.erl: $(ESRC)/%.xrl
-	$(ERLC) $(XRL_FLAGS) -o$(EGEN) $<
+	$(leex_verbose)$(ERLC) $(XRL_FLAGS) -o$(EGEN) $<
 
 # ----------------------------------------------------
 #	SNMP language section
@@ -149,16 +154,16 @@ endif
 
 
 $(SNMP_BIN_TARGET_DIR)/%.bin: %.mib
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
 $(SNMP_HRL_TARGET_DIR)/%.hrl: $(SNMP_BIN_TARGET_DIR)/%.bin
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -o $(SNMP_HRL_TARGET_DIR) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -o $(SNMP_HRL_TARGET_DIR) $<
 
 .mib.bin:
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) $<
 
 .bin.hrl:
-	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin $<
+	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin $<
 
 # ----------------------------------------------------
 #	Java language section
@@ -170,11 +175,11 @@ JAVA_DEST_ROOT = ../priv/
 endif
 
 .java.class:
-	CLASSPATH=$(CLASSPATH) $(JAVA) $(JAVA_OPTIONS) $<
+	$(javac_verbose)CLASSPATH=$(CLASSPATH) $(JAVA) $(JAVA_OPTIONS) $<
 
 
 $(JAVA_DEST_ROOT)$(JAVA_CLASS_SUBDIR)%.class: %.java
-	CLASSPATH=$(CLASSPATH) $(JAVA) $(JAVA_OPTIONS) -d $(JAVA_DEST_ROOT) $<
+	$(javac_verbose)CLASSPATH=$(CLASSPATH) $(JAVA) $(JAVA_OPTIONS) -d $(JAVA_DEST_ROOT) $<
 
 # ----------------------------------------------------
 #	Emacs byte code compiling
@@ -183,7 +188,7 @@ EMACS_COMPILER=emacs-20
 EMACS_COMPILE_OPTIONS=-q --no-site-file -batch -f batch-byte-compile
 
 .el.elc:
-	$(EMACS_COMPILER) $(EMACS_COMPILE_OPTIONS) $<
+	$(emacs_verbose)$(EMACS_COMPILER) $(EMACS_COMPILE_OPTIONS) $<
 
 # ----------------------------------------------------
 #	Documentation section
@@ -250,8 +255,10 @@ DEFAULT_GIF_FILES = $(HTMLDIR)/min_head.gif
 #
 XSLTPROC = @XSLTPROC@
 FOP = @FOP@
+XMLLINT = @XMLLINT@
 
 DOCGEN=$(ERL_TOP)/lib/erl_docgen
+FOP_CONFIG = $(DOCGEN)/priv/fop.xconf
 
 ifneq (,$(findstring $(origin SPECS_ESRC),$(DUBIOUS_ORIGINS)))
 SPECS_ESRC = ../../src
@@ -308,5 +315,5 @@ $(MAN9DIR)/%.9: %.xml
 	 escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $< $@
 
 .fo.pdf:
-	$(FOP) -fo $< -pdf $@
+	$(FOP) -c $(FOP_CONFIG) -fo $< -pdf $@
 
diff --git a/make/otp_ded.mk.in b/make/otp_ded.mk.in
index e719312473..e2232acbb1 100644
--- a/make/otp_ded.mk.in
+++ b/make/otp_ded.mk.in
@@ -37,7 +37,7 @@ DED__NOWARN_CFLAGS = @DED_EMU_THR_DEFS@ @DED_CFLAGS@
 DED_THR_DEFS = @DED_THR_DEFS@
 DED_EMU_THR_DEFS = @DED_EMU_THR_DEFS@
 DED_WARN_FLAGS = @WFLAGS@
-DED_CFLAGS = @WFLAGS@ @DED_EMU_THR_DEFS@ @DED_CFLAGS@
+DED_CFLAGS = @WERRORFLAGS@ @WFLAGS@ @DED_EMU_THR_DEFS@ @DED_CFLAGS@
 DED_LIBS = @LIBS@
 DED_EXT = @DED_EXT@
 ERLANG_OSTYPE = @ERLANG_OSTYPE@
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 0be0a2de56..65a2e62979 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -106,6 +106,9 @@ $(HTMLDIR)/$(APPLICATION).eix: $(XML_FILES) $(SPECS_FILES)
 
 docs: $(HTMLDIR)/$(APPLICATION).eix
 
+xmllint: $(XML_FILES)
+	$(XMLLINT) --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities  $(XML_FILES)
+
 # ----------------------------------------------------
 # Local documentation target for testing 
 # ----------------------------------------------------
diff --git a/make/output.mk.in b/make/output.mk.in
new file mode 100644
index 0000000000..2f1a1d3a79
--- /dev/null
+++ b/make/output.mk.in
@@ -0,0 +1,112 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+# ----------------------------------------------------
+# Make include file for otp
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, 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: Anthony Ramine
+# ----------------------------------------------------
+
+ifeq ($(V),)
+V = @DEFAULT_VERBOSITY@
+endif
+
+ifeq ($(V),0)
+v_p = 0
+else
+v_p = 1
+endif
+
+V_at_0 = @
+V_at = $(V_at_$(V))
+
+V_colon_0 = @: ""
+V_colon = $(V_colon_$(V))
+
+ar_verbose_0 = @echo " AR	"$@;
+ar_verbose = $(ar_verbose_$(V))
+V_AR = $(ar_verbose)$(AR)
+
+asn_verbose_0 = @echo " ASN	"$@;
+asn_verbose = $(asn_verbose_$(V))
+
+cc_verbose_0 = @echo " CC	"$@;
+cc_verbose = $(cc_verbose_$(V))
+V_CC = $(cc_verbose)$(CC)
+
+dia_verbose_0 = @echo " DIA	"$@;
+dia_verbose = $(dia_verbose_$(V))
+
+dtrace_verbose_0 = @echo " DTRACE	"$@;
+dtrace_verbose = $(dtrace_verbose_$(V))
+
+emacs_verbose_0 = @echo " EMACS	"$@;
+emacs_verbose = $(emacs_verbose_$(V))
+
+emu_cc_verbose_0 = @echo " EMU_CC	"$@;
+emu_cc_verbose = $(emu_cc_verbose_$(V))
+V_EMU_CC = $(emu_cc_verbose)$(EMU_CC)
+
+erlc_verbose_0 = @echo " ERLC	"$@;
+erlc_verbose = $(erlc_verbose_$(V))
+V_ERLC = $(erlc_verbose)$(ERLC)
+
+gen_verbose_0 = @echo " GEN	"$@;
+gen_verbose = $(gen_verbose_$(V))
+
+javac_verbose_0 = @echo " JAVAC	"$@;
+javac_verbose = $(javac_verbose_$(V))
+V_JAVAC = $(javac_verbose)$(JAVAC)
+
+ld_verbose_0 = @echo " LD	"$@;
+ld_verbose = $(ld_verbose_$(V))
+V_LD = $(ld_verbose)$(LD)
+
+leex_verbose_0 = @echo " LEEX	"$@;
+leex_verbose = $(leex_verbose_$(V))
+
+lex_verbose_0 = @echo " LEX	"$@;
+lex_verbose = $(lex_verbose_$(V))
+V_LEX = $(lex_verbose)$(LEX)
+
+m4_verbose_0 = @echo " M4	"$@;
+m4_verbose = $(m4_verbose_$(V))
+
+make_verbose_0 = @echo " MAKE	"$@;
+make_verbose = $(make_verbose_$(V))
+
+mc_verbose_0 = @echo " MC	"$@;
+mc_verbose = $(mc_verbose_$(V))
+V_MC = $(mc_verbose)$(MC)
+
+ranlib_verbose_0 = @echo " RANLIB	"$@;
+ranlib_verbose = $(ranlib_verbose_$(V))
+V_RANLIB = $(ranlib_verbose)$(RANLIB)
+
+rc_verbose_0 = @echo " RC	"$@;
+rc_verbose = $(rc_verbose_$(V))
+V_RC = $(rc_verbose)$(RC)
+
+snmp_verbose_0 = @echo " SNMP	"$@;
+snmp_verbose = $(snmp_verbose_$(V))
+
+vsn_verbose_0 = @echo " VSN	"$@;
+vsn_verbose = $(vsn_verbose_$(V))
+
+yecc_verbose_0 = @echo " YECC	"$@;
+yecc_verbose = $(yecc_verbose_$(V))
diff --git a/make/run_make.mk b/make/run_make.mk
index b7a5a64847..1b4213107f 100644
--- a/make/run_make.mk
+++ b/make/run_make.mk
@@ -25,19 +25,20 @@
 #
 # ----------------------------------------------------
 
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 
 .PHONY: valgrind
 
 opt debug purify quantify purecov valgrind gcov gprof lcnt:
-	$(MAKE) -f $(TARGET)/Makefile TYPE=$@
+	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile TYPE=$@
 
 plain smp frag smp_frag:
-	$(MAKE) -f $(TARGET)/Makefile FLAVOR=$@
+	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile FLAVOR=$@
 
 clean generate depend docs release release_spec release_docs release_docs_spec \
   tests release_tests release_tests_spec:
-	$(MAKE) -f $(TARGET)/Makefile $@
+	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile $@
 
 
 
diff --git a/otp_build b/otp_build
index 85be25a8a1..093fde8034 100755
--- a/otp_build
+++ b/otp_build
@@ -295,7 +295,7 @@ chk_eq()
 check_config_helpers ()
 {
 
-    aclocals="./aclocal.m4 ./lib/erl_interface/aclocal.m4 ./lib/odbc/aclocal.m4 ./lib/wx/aclocal.m4"
+    aclocals="./aclocal.m4 ./lib/erl_interface/aclocal.m4 ./lib/odbc/aclocal.m4 ./lib/wx/aclocal.m4 ./lib/megaco/aclocal.m4"
     install_shs="./lib/common_test/priv/auxdir/install-sh ./lib/erl_interface/src/auxdir/install-sh ./lib/test_server/src/install-sh"
     config_guesses="./lib/common_test/priv/auxdir/config.guess ./lib/erl_interface/src/auxdir/config.guess ./lib/test_server/src/config.guess"
     config_subs="./lib/common_test/priv/auxdir/config.sub ./lib/erl_interface/src/auxdir/config.sub ./lib/test_server/src/config.sub"
diff --git a/system/doc/reference_manual/introduction.xml b/system/doc/reference_manual/introduction.xml
index 3dac5cfe13..7737c34469 100644
--- a/system/doc/reference_manual/introduction.xml
+++ b/system/doc/reference_manual/introduction.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -150,6 +150,17 @@
       </row>
       <tcaption>Character Classes.</tcaption>
     </table>
+    <p>In Erlang/OTP R16 the syntax of Erlang tokens was extended to
+       handle Unicode. To begin with the support is limited to strings,
+       but Erlang/OTP R18 is expected to handle Unicode atoms as well.
+       More about the usage of Unicode in Erlang source files can be
+       found in <seealso
+       marker="stdlib:unicode_usage#unicode_in_erlang">STDLIB's User'S
+       Guide</seealso>. The default encoding for Erlang source files
+       is still Latin-1, but in Erlang/OTP R17 the default encoding
+       will be UTF-8. The details on how to state the encoding of an
+       Erlang source file can be found in <seealso
+       marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
   </section>
 </chapter>